version 1.29, 2004/07/28 15:13:00
|
version 1.30, 2004/08/04 11:02:39
|
Line 162 class ZSQLExtendFolder(Folder,Persistent
|
Line 162 class ZSQLExtendFolder(Folder,Persistent
|
return ret |
return ret |
|
|
|
|
def ZSQLOptionsFromCRList(self,fieldname,listField): |
def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''): |
"""generate select oprions form a cr seperated list""" |
"""generate select oprions form a cr seperated list""" |
fields=listField.split("\n") |
fields=listField.split("\n") |
ret="""<select name="%s"> |
ret="""<select name="%s" %s> |
"""%fieldname |
"""%(fieldname,multiple) |
for field in fields: |
for field in fields: |
ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8')) |
ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8')) |
ret+="""</select>""" |
ret+="""</select>""" |
return ret |
return ret |
|
|
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None): |
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple=''): |
"""generate select oprions form a cr seperated list""" |
"""generate select oprions form a cr seperated list""" |
if not valueName: |
if not valueName: |
valueName=fieldName |
valueName=fieldName |
|
|
ret="""<select name="%s"> |
ret="""<select name="%s" %s> |
"""%fieldname |
"""%(fieldname,multiple) |
if start: |
if start: |
if start==' ': |
if start==' ': |
start='' |
start='' |
Line 363 class ZSQLExtendFolder(Folder,Persistent
|
Line 363 class ZSQLExtendFolder(Folder,Persistent
|
for field in argv.keys(): |
for field in argv.keys(): |
|
|
qs+=",-%s=%s"%(field,argv[field]) |
qs+=",-%s=%s"%(field,argv[field]) |
#print qs |
|
else: |
else: |
|
|
qs=self.REQUEST.SESSION.get('query','') |
qs=self.REQUEST.SESSION.get('query','') |
Line 459 class ZSQLExtendFolder(Folder,Persistent
|
Line 459 class ZSQLExtendFolder(Folder,Persistent
|
sort="" |
sort="" |
op="bw" |
op="bw" |
opfields={} |
opfields={} |
|
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
skip="" |
skip="" |
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
Line 467 class ZSQLExtendFolder(Folder,Persistent
|
Line 468 class ZSQLExtendFolder(Folder,Persistent
|
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
#print "Q",nostore,qs |
#print "Q",nostore,qs |
#check for op in the case of inline search |
#check for op |
|
|
splitted=qs.split(",") |
splitted=qs.split(",") |
|
|
Line 485 class ZSQLExtendFolder(Folder,Persistent
|
Line 486 class ZSQLExtendFolder(Folder,Persistent
|
|
|
field=name[4:] |
field=name[4:] |
opfields[field]=op |
opfields[field]=op |
|
|
|
if name[0:4]==iCT+"lop": |
|
lop=value |
|
|
|
field=name[5:] |
|
lopfields[field]=lop |
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
#now analyse the querystring |
#now analyse the querystring |
Line 517 class ZSQLExtendFolder(Folder,Persistent
|
Line 524 class ZSQLExtendFolder(Folder,Persistent
|
elif name==iCT+"join": |
elif name==iCT+"join": |
whereList.append(value) |
whereList.append(value) |
elif name==iCT+"sort": |
elif name==iCT+"sort": |
sort="ORDER BY "+value |
sort="ORDER BY "+value.replace(' AND ',',') |
elif name==iCT+"token": |
elif name==iCT+"token": |
if not nostore=="yes": |
if not nostore=="yes": |
self.REQUEST.SESSION['token']=value |
self.REQUEST.SESSION['token']=value |
Line 531 class ZSQLExtendFolder(Folder,Persistent
|
Line 538 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#print "OP",op,name |
#print "OP",op,name |
value=value.lower() |
value=value.lower() |
|
tmp="" |
searchFields[name]=value |
|
|
|
if opfields.has_key(name): |
if opfields.has_key(name): |
op=opfields[name] |
op=opfields[name] |
else: |
else: |
op="ct" |
op="ct" |
name="LOWER("+name+")" |
name="LOWER("+name+")" |
if op=="ct": |
if op=="ct": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
elif op=="gt": |
elif op=="gt": |
whereList.append(name+">"+libpq.PgQuoteString(value)) |
tmp=(name+">"+libpq.PgQuoteString(value)) |
elif op=="lt": |
elif op=="lt": |
whereList.append(name+"<"+libpq.PgQuoteString(value)) |
tmp=(name+"<"+libpq.PgQuoteString(value)) |
elif op=="eq": |
elif op=="eq": |
whereList.append(name+"="+libpq.PgQuoteString(value)) |
tmp=(name+"="+libpq.PgQuoteString(value)) |
elif op=="bw": |
elif op=="bw": |
whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
elif op=="ew": |
elif op=="ew": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
op="ct" |
op="ct" |
|
|
#except: |
if searchFields.has_key(name): |
# print "END",value,name,Exception |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
|
else: |
|
searchFields[name]=tmp |
|
|
|
|
|
## for name in searchFields.keys(): |
|
## value=searchFields[name] |
|
|
|
## if opfields.has_key(name): |
|
## op=opfields[name] |
|
## else: |
|
## op="ct" |
|
## name="LOWER("+name+")" |
|
## if op=="ct": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
|
## elif op=="gt": |
|
## whereList.append(name+">"+libpq.PgQuoteString(value)) |
|
## elif op=="lt": |
|
## whereList.append(name+"<"+libpq.PgQuoteString(value)) |
|
## elif op=="eq": |
|
## whereList.append(name+"="+libpq.PgQuoteString(value)) |
|
## elif op=="bw": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
|
## elif op=="ew": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
|
## op="ct" |
|
|
|
## #except: |
|
## # print "END",value,name,Exception |
|
|
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
where="WHERE "+string.join(whereList," "+lop+" ") |
where="WHERE "+string.join(whereList," "+lop+" ") |
else: |
else: |
Line 617 class ZSQLExtendFolder(Folder,Persistent
|
Line 653 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
"""nothing""" |
"""nothing""" |
#print formatfile |
#print formatfile |
|
|
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") |
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") |
self.REQUEST.SESSION['come_from_search']="yes" |
self.REQUEST.SESSION['come_from_search']="yes" |
|
|