version 1.30, 2004/08/04 11:02:39
|
version 1.32, 2004/08/27 23:03:48
|
Line 172 class ZSQLExtendFolder(Folder,Persistent
|
Line 172 class ZSQLExtendFolder(Folder,Persistent
|
ret+="""</select>""" |
ret+="""</select>""" |
return ret |
return ret |
|
|
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple=''): |
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None): |
"""generate select oprions form a cr seperated list""" |
"""generate select oprions form a search list seperated list""" |
if not valueName: |
if not valueName: |
valueName=fieldName |
valueName=fieldName |
|
|
Line 182 class ZSQLExtendFolder(Folder,Persistent
|
Line 182 class ZSQLExtendFolder(Folder,Persistent
|
if start: |
if start: |
if start==' ': |
if start==' ': |
start='' |
start='' |
ret+="""<option value="%s">%s</option>"""%(start,start) |
if not startValue: |
|
startValue=start |
|
|
|
ret+="""<option value="%s">%s</option>"""%(startValue,start) |
for result in results: |
for result in results: |
field=getattr(result,fieldName) |
field=getattr(result,fieldName) |
fieldValue=getattr(result,valueName) |
fieldValue=getattr(result,valueName) |
Line 341 class ZSQLExtendFolder(Folder,Persistent
|
Line 344 class ZSQLExtendFolder(Folder,Persistent
|
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv): |
|
|
|
|
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],**argv): |
|
"""find2""" |
|
#search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_translit',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv) |
|
|
|
|
|
#search2 = self.ZSQLFind(tableExt='cdli_cat',qs="",select="oid,*",storename=None,restrictConnect=('cdli_cat.id_text',search1),**argv) |
|
|
|
search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_cat',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv) |
|
|
|
search2 = self.ZSQLFind(tableExt='cdli_translit',qs="",select="oid,*",storename=None,restrictConnect=('cdli_translit.id_text',search1),**argv) |
|
return search2 |
|
|
|
#return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv) |
|
|
|
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,**argv): |
"""Find""" |
"""Find""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
Line 371 class ZSQLExtendFolder(Folder,Persistent
|
ret.append(x) |
ret.append(x) |
return ret |
return ret |
|
|
self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
#self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
if qs=="": |
if qs=="": |
|
print "HI" |
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
|
|
Line 367 class ZSQLExtendFolder(Folder,Persistent
|
Line 387 class ZSQLExtendFolder(Folder,Persistent
|
else: |
else: |
|
|
qs=self.REQUEST.SESSION.get('query','') |
qs=self.REQUEST.SESSION.get('query','') |
|
print "QS:",qs |
for field in argv.keys(): |
for field in argv.keys(): |
#print field |
#print field |
qs+=",-%s=%s"%(field,argv[field]) |
qs+=",-%s=%s"%(field,argv[field]) |
Line 389 class ZSQLExtendFolder(Folder,Persistent
|
Line 409 class ZSQLExtendFolder(Folder,Persistent
|
storename="foundCount" |
storename="foundCount" |
|
|
|
|
|
print "calling Query with",repr(NoQuery) |
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename) |
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect) |
#print self.REQUEST.SESSION["foundCount"] |
#print self.REQUEST.SESSION["foundCount"] |
|
|
|
print "called query" |
return ret |
return ret |
|
|
def ZSQLFoundCountLen(self,var): |
def ZSQLFoundCountLen(self,var): |
Line 449 class ZSQLExtendFolder(Folder,Persistent
|
Line 469 class ZSQLExtendFolder(Folder,Persistent
|
|
|
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) |
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) |
|
|
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None): |
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None): |
"""analysieren den QueryString""" |
"""analysieren den QueryString""" |
#print "NO",nostore |
#print "NO",nostore |
lop="AND" # standardsuche mit and |
lop="AND" # standardsuche mit and |
Line 464 class ZSQLExtendFolder(Folder,Persistent
|
Line 484 class ZSQLExtendFolder(Folder,Persistent
|
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
searchFields={} |
searchFields={} |
|
searchFieldsOnly={} |
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
#print "Q",nostore,qs |
#print "Q",nostore,qs |
#check for op |
#check for op |
|
|
splitted=qs.split(",") |
splitted=qs.split(",") |
|
if tableExt: |
|
table=tableExt |
|
|
|
if restrictField: |
|
select=restrictField |
|
|
for q in splitted: |
for q in splitted: |
|
|
Line 512 class ZSQLExtendFolder(Folder,Persistent
|
Line 536 class ZSQLExtendFolder(Folder,Persistent
|
if name==iCT+"lop": |
if name==iCT+"lop": |
lop=value |
lop=value |
elif name==iCT+"table": |
elif name==iCT+"table": |
|
if not tableExt: |
table=value |
table=value |
elif name==iCT+"select": |
elif name==iCT+"select": |
|
if not restrictField: |
select=value |
select=value |
elif name==iCT+"max": |
elif name==iCT+"max": |
|
if not NoLimit: |
maxstr="LIMIT "+str(value) |
maxstr="LIMIT "+str(value) |
limit=str(value) |
limit=str(value) |
elif name==iCT+"skip": |
elif name==iCT+"skip": |
Line 543 class ZSQLExtendFolder(Folder,Persistent
|
Line 570 class ZSQLExtendFolder(Folder,Persistent
|
op=opfields[name] |
op=opfields[name] |
else: |
else: |
op="ct" |
op="ct" |
|
namealt=name |
name="LOWER("+name+")" |
name="LOWER("+name+")" |
if op=="ct": |
if op=="ct": |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
Line 557 class ZSQLExtendFolder(Folder,Persistent
|
Line 585 class ZSQLExtendFolder(Folder,Persistent
|
elif op=="ew": |
elif op=="ew": |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
op="ct" |
op="ct" |
|
print "TTT",tableExt |
|
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
if searchFields.has_key(name): |
if searchFields.has_key(name): |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
|
searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value |
else: |
else: |
searchFields[name]=tmp |
searchFields[name]=tmp |
|
searchFieldsOnly[name]=value |
|
|
|
|
## for name in searchFields.keys(): |
## for name in searchFields.keys(): |
Line 592 class ZSQLExtendFolder(Folder,Persistent
|
Line 623 class ZSQLExtendFolder(Folder,Persistent
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
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: |
where="" |
where="" |
|
|
|
if restrictConnect: |
|
print "resticted" |
|
if len(where)==0: |
|
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
|
else: |
|
where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
|
|
#print "QE",table |
#print "QE",table |
|
|
query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip) |
query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip) |
Line 604 class ZSQLExtendFolder(Folder,Persistent
|
Line 644 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION['qs']=opfields |
self.REQUEST.SESSION['qs']=opfields |
#print "IAMHERE again:", query |
#print "IAMHERE again:", query |
|
|
if storename: |
if storename and (not NoQuery): |
query2="SELECT count(*) FROM %s %s"%(table,where) |
query2="SELECT count(*) FROM %s %s"%(table,where) |
#print "storing",query2 |
print "storing",query2 |
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
if not self.REQUEST.SESSION.has_key(storename): |
if not self.REQUEST.SESSION.has_key(storename): |
self.REQUEST.SESSION[storename]={} |
self.REQUEST.SESSION[storename]={} |
if self.REQUEST.SESSION[storename].has_key('queryString2'): |
if self.REQUEST.SESSION[storename].has_key('queryString2'): |
#print "HI",storename |
print "HI",storename |
if not self.REQUEST.SESSION[storename]['queryString2']==query2: |
if not self.REQUEST.SESSION[storename]['queryString2']==query2: |
#print "HOOOOO",storename |
#print "HOOOOO",storename |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
|
|
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
|
|
else: |
else: |
|
print "go" |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] |
Line 631 class ZSQLExtendFolder(Folder,Persistent
|
Line 673 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
|
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
|
if not NoQuery: |
|
print "noquery",query |
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
|
else: |
|
print "query" |
|
return query |
|
|
def ZSQLQuery(self,query): |
def ZSQLQuery(self,query): |
"""query""" |
"""query""" |
Line 670 class ZSQLExtendFolder(Folder,Persistent
|
Line 717 class ZSQLExtendFolder(Folder,Persistent
|
def getZSQLSearchFieldsList(self,storename="foundCount"): |
def getZSQLSearchFieldsList(self,storename="foundCount"): |
"""get searchfieldList""" |
"""get searchfieldList""" |
#print self.REQUEST.SESSION[storename]['searchFields'].keys() |
#print self.REQUEST.SESSION[storename]['searchFields'].keys() |
return self.REQUEST.SESSION[storename]['searchFields'].keys() |
return self.REQUEST.SESSION[storename]['searchFieldsOnly'].keys() |
|
|
def getZSQLSearchFields(self,storename="foundCount"): |
def getZSQLSearchFields(self,field,storename="foundCount"): |
"""get searchfield""" |
"""get searchfield""" |
#print "SF",self.REQUEST.SESSION[storename]['searchFields'] |
#print "SF",self.REQUEST.SESSION[storename]['searchFields'] |
return self.REQUEST.SESSION[storename]['searchFields'] |
|
|
return self.REQUEST.SESSION[storename]['searchFieldsOnly'][field] |
|
|
|
|
def nextLink(self,html,storename="foundCount"): |
def nextLink(self,html,storename="foundCount"): |