version 1.32, 2004/08/27 23:03:48
|
version 1.34, 2004/09/27 18:51:57
|
Line 20 class ZSQLExtendFolder(Folder,Persistent
|
Line 20 class ZSQLExtendFolder(Folder,Persistent
|
"""Folder""" |
"""Folder""" |
meta_type="ZSQLExtendFolder" |
meta_type="ZSQLExtendFolder" |
|
|
|
def testneu(self): |
|
"""test""" |
|
relStatement="""period like '%s%%'""" |
|
statement="select * from cdli_cat" |
|
wherePart="museum_no like 'VAT%'" |
|
classes=['Uruk III','Uruk IV'] |
|
return self.searchRel(relStatement,statement,wherePart,classes) |
|
|
|
def searchRel(self,relStatement,statement,wherePart,classes): |
|
"""suche relative haufigkeiten""" |
|
ret={} |
|
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart)) |
|
print statement + " where "+wherePart |
|
for oneclass in classes: |
|
ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass)) |
|
print statement + " where ("+wherePart+") and "+ relStatement%oneclass |
|
return (ret,allRecords) |
|
|
def content_html(self): |
def content_html(self): |
"""template fuer content""" |
"""template fuer content""" |
|
|
Line 360 class ZSQLExtendFolder(Folder,Persistent
|
Line 378 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv) |
#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): |
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): |
"""Find""" |
"""Find""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
Line 373 class ZSQLExtendFolder(Folder,Persistent
|
Line 391 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#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 387 class ZSQLExtendFolder(Folder,Persistent
|
Line 405 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 409 class ZSQLExtendFolder(Folder,Persistent
|
Line 427 class ZSQLExtendFolder(Folder,Persistent
|
storename="foundCount" |
storename="foundCount" |
|
|
|
|
print "calling Query with",repr(NoQuery) |
#print "calling Query with",repr(NoQuery) |
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect) |
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter) |
#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 469 class ZSQLExtendFolder(Folder,Persistent
|
Line 487 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,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None): |
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None): |
"""analysieren den QueryString""" |
"""analysieren den QueryString""" |
#print "NO",nostore |
#print "NO",nostore |
lop="AND" # standardsuche mit and |
lop="AND" # standardsuche mit and |
Line 480 class ZSQLExtendFolder(Folder,Persistent
|
Line 498 class ZSQLExtendFolder(Folder,Persistent
|
op="bw" |
op="bw" |
opfields={} |
opfields={} |
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
|
sortfields={} #order of sortfields |
skip="" |
skip="" |
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
Line 516 class ZSQLExtendFolder(Folder,Persistent
|
Line 535 class ZSQLExtendFolder(Folder,Persistent
|
|
|
field=name[5:] |
field=name[5:] |
lopfields[field]=lop |
lopfields[field]=lop |
|
|
|
if name[0:10]==iCT+"sortorder": |
|
sort=value |
|
|
|
field=name[11:] |
|
sortfields[field]=sort |
|
|
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
#now analyse the querystring |
#now analyse the querystring |
Line 551 class ZSQLExtendFolder(Folder,Persistent
|
Line 577 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.replace(' AND ',',') |
sortstrs=[] |
|
for word in value.split(','): |
|
wordstr=word.lstrip().rstrip() |
|
order=sortfields.get(wordstr,'ASC') |
|
sortstrs.append(wordstr+" "+order) |
|
if len(sortstrs)>0: |
|
sort="ORDER BY "+string.join(sortstrs,',') |
|
|
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 584 class ZSQLExtendFolder(Folder,Persistent
|
Line 617 class ZSQLExtendFolder(Folder,Persistent
|
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
elif op=="ew": |
elif op=="ew": |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
|
elif op=="all": |
|
tmps=[] |
|
for word in value.split(" "): |
|
tmps.append(name+" LIKE "+libpq.PgQuoteString("%"+word+"%")) |
|
|
|
tmp=string.join(tmps,' AND ') |
|
|
op="ct" |
op="ct" |
print "TTT",tableExt |
|
if (not tableExt) or (namealt.split('.')[0]==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 |
Line 623 class ZSQLExtendFolder(Folder,Persistent
|
Line 663 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: |
|
if filter: |
where="WHERE "+string.join(whereList," "+lop+" ") |
whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter |
|
else: |
|
whereStr=string.join(whereList," "+lop+" ") |
|
where="WHERE "+whereStr |
|
else: |
|
if filter: |
|
where="WHERE "+filter |
else: |
else: |
where="" |
where="" |
|
|
if restrictConnect: |
if restrictConnect: |
print "resticted" |
|
if len(where)==0: |
if len(where)==0: |
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
else: |
else: |
Line 646 class ZSQLExtendFolder(Folder,Persistent
|
Line 692 class ZSQLExtendFolder(Folder,Persistent
|
|
|
if storename and (not NoQuery): |
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 "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 |
|
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 |
Line 660 class ZSQLExtendFolder(Folder,Persistent
|
Line 706 class ZSQLExtendFolder(Folder,Persistent
|
#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 676 class ZSQLExtendFolder(Folder,Persistent
|
Line 722 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
if not NoQuery: |
if not NoQuery: |
print "noquery",query |
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
else: |
else: |
print "query" |
|
return query |
return query |
|
|
def ZSQLQuery(self,query): |
def ZSQLQuery(self,query): |