--- a/alcatel/dataparser/ClientSearchAttributes.py Mon Jul 22 14:56:35 2013 +0200
+++ b/alcatel/dataparser/ClientSearchAttributes.py Wed Aug 14 16:36:41 2013 +0200
@@ -11,7 +11,6 @@
class ClientSearchAttributes(object):
def __init__(self, request):
- print request
self.request = request
def get_text(self):
@@ -23,7 +22,11 @@
return text
def get_filtre(self):
- filtre = self.request.POST['filtre']
+ filtre=''
+ try:
+ filtre = self.request.POST['filtre']
+ except Exception, err:
+ logger.info('No recherche attribute in the http post request.'+str(err))
return filtre
def get_picture_url(self):
@@ -48,11 +51,11 @@
def get_from_date(self):
date = ''
try:
- from_date = self.request.POST['from_date']
+ date = self.request.POST['from_date']
'''time_object = time.strptime(from_date, '%Y-%m-%dT%H:%M:%S.0Z')'''
- time_object = time.strptime(from_date, '%m/%d/%Y')
- date = str(int(time.mktime(time_object)))
+ '''time_object = time.strptime(from_date, '%m/%d/%Y')
+ date = str(int(time.mktime(time_object)))'''
except Exception, err:
logger.info('Info: ' + str(err))
return date
@@ -60,27 +63,52 @@
def get_to_date(self):
date = ''
try:
- to_date = self.request.POST['to_date']
+ date = self.request.POST['to_date']
'''time_object = time.strptime(to_date, '%Y-%m-%dT%H:%M:%S.0Z')'''
- time_object = time.strptime(to_date, '%m/%d/%Y')
- date = str(int(time.mktime(time_object)))
+ '''time_object = time.strptime(to_date, '%m/%d/%Y')
+ date = str(int(time.mktime(time_object)))'''
except Exception, err:
logger.info('Info: ' + str(err))
return date
def get_categories(self):
categories = []
+ #try:
+ #categories = self.request.POST.getlist('categories')
+ logger.info('get_categories ENTER')
+
try:
- print 'get_categories'
- print self.request.POST.getlist('categories')
- categories = self.request.POST.getlist('categories')
- '''categories = self.request.POST['categories']'''
- '''categories = eval(categories)'''
-
+ c = self.request.POST['categories1']
+ categories.append(c)
+ except Exception, err:
+ logger.info('get_categories categories1'+ str(err))
+ categories.append('')
+
+
+ try:
+ c = self.request.POST['categories2']
+ categories.append(c)
except Exception, err:
- '''logger.info('Info: ' + str(err))'''
+ logger.info('get_categories categories2'+ str(err))
+ categories.append('')
+ try:
+ c = self.request.POST['categories3']
+ categories.append(c)
+ except Exception, err:
+ logger.info('get_categories categories3'+ str(err))
+ categories.append('')
+
+
+ try:
+ c = self.request.POST['categories4']
+ categories.append(c)
+ except Exception, err:
+ logger.info('get_categories categories4'+ str(err))
+ categories.append('')
+
+ logger.info('categories = $$$$$$$$$$$'+str(categories))
return categories
def get_documentary_file(self):
@@ -99,19 +127,15 @@
return filtering_params
def get_hash_value(self):
- print 'get_hash_value'
value = 'text' + self.get_text()
value += 'image' + self.get_picture_url()
'''value += 'from_date' + self.get_from_date()
value += 'get_to_date' + self.get_to_date()'''
value += 'categories' + str(self.get_categories())
- print str(hash(repr(value)))
return str(hash(repr(value)))
def get_hash_value_from_text_image(self):
- print 'get_hash_value_from_text_image'
value = 'text' + self.get_text()
value += 'image' + self.get_picture_url()
value += 'imageuploaded' + self.get_uploaded_picture_name()
- print str(hash(repr(value)))
return str(hash(repr(value)))
\ No newline at end of file