version 1.29, 2004/07/28 15:13:00
|
version 1.42, 2004/10/21 15:36:53
|
Line 5 from Globals import DTMLFile
|
Line 5 from Globals import DTMLFile
|
import urllib |
import urllib |
import re |
import re |
import string |
import string |
from pyPgSQL import libpq |
#from pyPgSQL import libpq |
from AccessControl import getSecurityManager |
from AccessControl import getSecurityManager |
import os.path |
import os.path |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
Line 13 from Products.PageTemplates.PageTemplate
|
Line 13 from Products.PageTemplates.PageTemplate
|
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
import Shared.DC.ZRDB.DA |
import Shared.DC.ZRDB.DA |
|
|
|
def analyseIntSearch(word): |
|
#analyse integer searches |
|
|
|
splitted=word.split("-") |
|
print splitted |
|
if splitted[0]=="": |
|
return "< "+splitted[1] |
|
|
|
if splitted[1]=='': |
|
return "> "+splitted[0] |
|
else: |
|
return "BETWEEN "+splitted[0]+" AND "+splitted[1] |
|
|
|
|
|
|
|
def sql_quote(v): |
|
# quote dictionary |
|
quote_dict = {"\'": "''", "\\": "\\\\"} |
|
for dkey in quote_dict.keys(): |
|
if string.find(v, dkey) >= 0: |
|
v=join(split(v,dkey),quote_dict[dkey]) |
|
return "'%s'" % v |
|
|
def showSQLConnectionIDs(self): |
def showSQLConnectionIDs(self): |
return SQLConnectionIDs(self) |
return SQLConnectionIDs(self) |
|
|
Line 20 class ZSQLExtendFolder(Folder,Persistent
|
Line 43 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 162 class ZSQLExtendFolder(Folder,Persistent
|
Line 203 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='',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 |
|
|
ret="""<select name="%s"> |
ret="""<select name="%s" %s> |
"""%fieldname |
"""%(fieldname,multiple) |
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 214 class ZSQLExtendFolder(Folder,Persistent
|
Line 258 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def ZSQLInlineSearch(self,storename=None,**argv): |
def ZSQLInlineSearch(self,storename=None,**argv): |
"""inlinesearch""" |
"""inlinesearch""" |
|
|
qs=[] |
qs=[] |
if storename: |
if storename: |
"""store""" |
"""store""" |
Line 224 class ZSQLExtendFolder(Folder,Persistent
|
Line 269 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argv.keys(): |
for a in argv.keys(): |
|
try: |
qs.append(a+"="+urllib.quote(str(argv[a]))) |
qs.append(a+"="+urllib.quote(str(argv[a]))) |
|
except: |
|
import urllib |
|
qs.append(a+"="+urllib.quote(str(argv[a]))) |
|
|
#return [] |
#return [] |
return self.parseQueryString(string.join(qs,","),"_",storename=storename) |
return self.parseQueryString(string.join(qs,","),"_",storename=storename) |
|
|
Line 240 class ZSQLExtendFolder(Folder,Persistent
|
Line 290 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def ZSQLSimpleSearch(self,query=None): |
def ZSQLSimpleSearch(self,query=None): |
""" returrn SQLSearch""" |
""" returrn SQLSearch""" |
|
#print query |
if not query: |
if not query: |
query=self.query |
query=self.query |
|
if getattr(self,'_v_search',None): |
|
|
if self.search.meta_type=="Z SQL Method": |
return self._v_search(var=query) |
|
|
|
if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"): |
|
self._v_search=self.search |
return self.search(var=query) |
return self.search(var=query) |
else: |
else: |
if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method": |
if hasattr(self.aq_parent.aq_parent,'search') and (self.aq_parent.aq_parent.search.meta_type=="Z SQL Method"): |
|
self._v_search=self.aq_parent.aq_parent.search |
return self.aq_parent.aq_parent.search(var=query) |
return self.aq_parent.aq_parent.search(var=query) |
else: |
else: |
|
search=self.ZopeFind(self,obj_metatypes=["Z SQL Method"],search_sub=1) |
|
if search: |
|
self._v_search=search[0][1] |
|
return search[0][1](var=query) |
|
else: |
return [] |
return [] |
|
|
|
|
Line 273 class ZSQLExtendFolder(Folder,Persistent
|
Line 334 class ZSQLExtendFolder(Folder,Persistent
|
valueList=[] |
valueList=[] |
for x in addList.keys(): |
for x in addList.keys(): |
keyList.append("\""+x+"\"") |
keyList.append("\""+x+"\"") |
valueList.append(libpq.PgQuoteString(addList[x])) |
valueList.append(sql_quote(addList[x])) |
|
|
keyString=string.join(keyList,",") |
keyString=string.join(keyList,",") |
valueString=string.join(valueList,",") |
valueString=string.join(valueList,",") |
Line 283 class ZSQLExtendFolder(Folder,Persistent
|
Line 344 class ZSQLExtendFolder(Folder,Persistent
|
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange(self,**argv): |
def ZSQLChange(self,**argv): |
"""Ändern von Einträgen""" |
"""change entries""" |
#qs=self.REQUEST['QUERY_STRING'] |
#qs=self.REQUEST['QUERY_STRING'] |
# very bad hack |
# very bad hack |
qs_temp=[] |
qs_temp=[] |
Line 306 class ZSQLExtendFolder(Folder,Persistent
|
Line 367 class ZSQLExtendFolder(Folder,Persistent
|
table=urllib.unquote(value) |
table=urllib.unquote(value) |
elif name=="-identify": |
elif name=="-identify": |
identify=urllib.unquote(value) |
identify=urllib.unquote(value) |
identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1]) |
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) |
elif name=="-format": |
elif name=="-format": |
format=urllib.unquote(value) |
format=urllib.unquote(value) |
elif (not name[0]=="-") and (not len(value)==0): |
elif (not name[0]=="-") and (not len(value)==0): |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) |
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) |
changeString=string.join(changeList,",") |
changeString=string.join(changeList,",") |
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange_old(self): |
def ZSQLChange_old(self): |
"""Ändern von Einträgen""" |
"""change entries""" |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
#print "CHANGE QS",self.REQUEST |
#print "CHANGE QS",self.REQUEST |
#return self.REQUEST |
#return self.REQUEST |
Line 331 class ZSQLExtendFolder(Folder,Persistent
|
Line 392 class ZSQLExtendFolder(Folder,Persistent
|
table=urllib.unquote(value) |
table=urllib.unquote(value) |
elif name=="-identify": |
elif name=="-identify": |
identify=urllib.unquote(value) |
identify=urllib.unquote(value) |
identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1]) |
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) |
elif name=="-format": |
elif name=="-format": |
format=urllib.unquote(value) |
format=urllib.unquote(value) |
elif (not name[0]=="-") and (not len(value)==0): |
elif (not name[0]=="-") and (not len(value)==0): |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) |
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) |
changeString=string.join(changeList,",") |
changeString=string.join(changeList,",") |
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
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,filter=None,**argv): |
"""Find""" |
"""Find""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
Line 429 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" # zuruecksetzen |
if qs=="": |
if qs=="": |
|
|
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
|
|
Line 363 class ZSQLExtendFolder(Folder,Persistent
|
Line 441 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 389 class ZSQLExtendFolder(Folder,Persistent
|
Line 467 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,filter=filter) |
#print self.REQUEST.SESSION["foundCount"] |
#print self.REQUEST.SESSION["foundCount"] |
|
|
|
|
Line 449 class ZSQLExtendFolder(Folder,Persistent
|
Line 527 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,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 459 class ZSQLExtendFolder(Folder,Persistent
|
Line 537 class ZSQLExtendFolder(Folder,Persistent
|
sort="" |
sort="" |
op="bw" |
op="bw" |
opfields={} |
opfields={} |
|
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
|
sortfields={} #order of sortfields |
|
sortAllFields=None |
skip="" |
skip="" |
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 in the case of inline search |
#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 485 class ZSQLExtendFolder(Folder,Persistent
|
Line 570 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 |
|
|
|
if name[0:10]==iCT+"sortorder": |
|
#sort=value |
|
|
|
field=name[11:] |
|
sortAllFields=None |
|
#no field selected |
|
if field=="": |
|
sortAllFields=value |
|
else: |
|
sortfields[field]=value |
|
|
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
#now analyse the querystring |
#now analyse the querystring |
Line 499 class ZSQLExtendFolder(Folder,Persistent
|
Line 602 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
value="" |
value="" |
|
|
#value=libpq.PgQuoteString(value) |
#value=sql_quote(value) |
|
|
|
|
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 517 class ZSQLExtendFolder(Folder,Persistent
|
Line 623 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 |
sortstrs=[] |
|
for word in value.split(','): |
|
wordstr=word.lstrip().rstrip() |
|
if sortAllFields: |
|
order=sortAllFields |
|
else: |
|
order=sortfields.get(wordstr,'ASC') |
|
|
|
if not (wordstr == ""): |
|
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 531 class ZSQLExtendFolder(Folder,Persistent
|
Line 650 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" |
|
namealt=name |
name="LOWER("+name+")" |
name="LOWER("+name+")" |
if op=="ct": |
if op=="ct": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
tmp=(name+" LIKE "+sql_quote("%"+value+"%")) |
elif op=="gt": |
elif op=="gt": |
whereList.append(name+">"+libpq.PgQuoteString(value)) |
tmp=(name+">"+sql_quote(value)) |
elif op=="lt": |
elif op=="lt": |
whereList.append(name+"<"+libpq.PgQuoteString(value)) |
tmp=(name+"<"+sql_quote(value)) |
elif op=="eq": |
elif op=="eq": |
whereList.append(name+"="+libpq.PgQuoteString(value)) |
tmp=(name+"="+sql_quote(value)) |
elif op=="bw": |
elif op=="bw": |
whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
tmp=(name+" LIKE "+sql_quote(value+"%")) |
elif op=="ew": |
elif op=="ew": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+sql_quote("%"+value)) |
|
elif op=="all": |
|
tmps=[] |
|
for word in value.split(" "): |
|
tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) |
|
|
|
tmp=string.join(tmps,' AND ') |
|
|
|
elif op=="numerical": |
|
term=analyseIntSearch(value) |
|
tmp=(name+" "+term) |
|
elif op=="one": |
|
tmps=[] |
|
for word in value.split(" "): |
|
tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) |
|
|
|
tmp=string.join(tmps,' OR ') |
|
|
op="ct" |
op="ct" |
|
|
#except: |
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
# print "END",value,name,Exception |
if searchFields.has_key(name): |
|
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
|
searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value |
|
else: |
|
searchFields[name]=tmp |
|
searchFieldsOnly[name]=value |
|
|
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
where="WHERE "+string.join(whereList," "+lop+" ") |
if filter: |
|
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="" |
#print "QE",table |
|
|
|
|
if restrictConnect: |
|
|
|
if len(where)==0: |
|
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
|
else: |
|
where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
|
|
|
#print "QE",table |
|
#print (select,table,where,sort,maxstr,skip) |
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) |
|
|
if not nostore=="yes": |
if not nostore=="yes": |
Line 568 class ZSQLExtendFolder(Folder,Persistent
|
Line 726 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 "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 |
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: |
|
|
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 595 class ZSQLExtendFolder(Folder,Persistent
|
Line 755 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: |
|
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
|
else: |
|
|
|
return query |
|
|
def ZSQLQuery(self,query): |
def ZSQLQuery(self,query): |
"""query""" |
"""query""" |
|
#print "hi",query |
return self.ZSQLSimpleSearch(query) |
return self.ZSQLSimpleSearch(query) |
|
|
def ZSQLSearch(self): |
def ZSQLSearch(self): |
Line 617 class ZSQLExtendFolder(Folder,Persistent
|
Line 783 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" |
|
|
Line 633 class ZSQLExtendFolder(Folder,Persistent
|
Line 800 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"): |
"""nextLink""" |
"""nextLink""" |
|
print self.REQUEST.SESSION[storename]['rangeSize'] |
try: |
try: |
limit=self.REQUEST.SESSION[storename]['rangeSize'] |
limit=self.REQUEST.SESSION[storename]['rangeSize'] |
if int(limit)==0 : |
if int(limit)==0 : |
Line 661 class ZSQLExtendFolder(Folder,Persistent
|
Line 830 class ZSQLExtendFolder(Folder,Persistent
|
if self.REQUEST['QUERY_STRING']=="": |
if self.REQUEST['QUERY_STRING']=="": |
qs=self.REQUEST.SESSION['query'] |
qs=self.REQUEST.SESSION['query'] |
|
|
queries=string.split(qs,",") |
queries=string.split(qs,",")[0:] |
|
|
|
|
else: |
else: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
queries=string.split(qs,"&") |
queries=string.split(qs,"&")[0:] |
|
|
|
|
|
|
Line 676 class ZSQLExtendFolder(Folder,Persistent
|
Line 845 class ZSQLExtendFolder(Folder,Persistent
|
|
|
for query in queries: |
for query in queries: |
|
|
#print query.split("=")[0] |
if query[0]=="_" : query="-"+query[1:] |
if query[0]=="_" : query[0]="-" |
|
|
|
if query.split("=")[0].lower()=="-skip": |
if query.split("=")[0].lower()=="-skip": |
|
|
Line 696 class ZSQLExtendFolder(Folder,Persistent
|
Line 864 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def prevLink(self,html,storename="foundCount"): |
def prevLink(self,html,storename="foundCount"): |
"""prev link""" |
"""prev link""" |
|
|
try: |
try: |
limit=self.REQUEST.SESSION[storename]['rangeSize'] |
limit=self.REQUEST.SESSION[storename]['rangeSize'] |
if int(limit)==0 : |
if int(limit)==0 : |
Line 988 class ZSQLBibliography(Folder,ZSQLExtend
|
Line 1157 class ZSQLBibliography(Folder,ZSQLExtend
|
|
|
def getMetaDatasXML(self): |
def getMetaDatasXML(self): |
"""index""" |
"""index""" |
|
# check if the request's host part was OK |
|
http_host = self.REQUEST['HTTP_HOST'] |
|
host_port = self.REQUEST['SERVER_PORT'] |
|
fix_host = None |
|
if http_host and http_host.rfind(host_port) == -1: |
|
print "HTTP_HOST needs fixing!" |
|
fix_host = http_host + ":" + host_port |
|
|
ret="""<?xml version="1.0" ?> |
ret="""<?xml version="1.0" ?> |
<index>""" |
<index>""" |
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): |
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): |
link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid |
base_url = self.absolute_url() |
metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid |
if fix_host: |
|
#print "replacing ", http_host, " by ", fix_host |
|
base_url = string.replace(base_url, http_host, fix_host, 1) |
|
|
|
link=base_url+"/"+"record.html?oid=%i"%found.oid |
|
metalink=base_url+"/"+"getMetaDataXML?oid=%i"%found.oid |
|
|
ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink) |
ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink) |
|
|