version 1.68, 2005/10/12 19:36:56
|
version 1.89, 2006/08/29 17:37:17
|
Line 17 import Shared.DC.ZRDB.DA
|
Line 17 import Shared.DC.ZRDB.DA
|
import zLOG |
import zLOG |
import os.path |
import os.path |
import os |
import os |
|
from OFS.SimpleItem import SimpleItem |
|
|
def analyseIntSearch(word): |
def analyseIntSearch(word): |
#analyse integer searches |
#analyse integer searches |
Line 48 def sql_quote(v):
|
Line 48 def sql_quote(v):
|
def showSQLConnectionIDs(self): |
def showSQLConnectionIDs(self): |
return SQLConnectionIDs(self) |
return SQLConnectionIDs(self) |
|
|
|
class ZSQLIndex(SimpleItem): |
|
"""index""" |
|
meta_type="ZSQLIndex" |
|
|
|
def __init__(self,index,id,table=''): |
|
self.index=[x for x in index] |
|
self.id=id |
|
self.table=table |
|
|
|
def setIndex(self,index): |
|
self.index=[x for x in index] |
|
|
|
def getIndex(self): |
|
return self.index |
|
|
class ZSQLExtendFolder(Folder,Persistent, Implicit): |
class ZSQLExtendFolder(Folder,Persistent, Implicit): |
"""Folder""" |
"""Folder""" |
meta_type="ZSQLExtendFolder" |
meta_type="ZSQLExtendFolder" |
|
|
|
def ZSQLQuote(self,str): |
|
"""quote str for sql""" |
|
return sql_quote(str) |
|
|
|
|
|
def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None): |
|
#TODO: finish importXMLFile |
|
''' |
|
Import XML file into the table |
|
@param table: name of the table the xml shall be imported into |
|
@param containerTagName: XML-Tag which describes a dataset |
|
@param file: xmlfile handle |
|
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. |
|
@param RESPONSE: (optional) |
|
''' |
|
from xml.dom.pulldom import parseString |
|
|
|
doc=parseString(file.read()) |
|
while 1: |
|
node=doc.getEvent() |
|
|
|
if node is None: |
|
break; |
|
else: |
|
if node[1].nodeName==containerTagName: |
|
doc.expandNode(node[1]) |
|
#fn=node[1].getAttribute("xml:id") |
|
#nf=file("xtf/"+fn+".xtf",'w') |
|
#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>") |
|
#print "wrote: %s"%fn |
|
|
|
|
|
def generateIndex(self,field,index_name,table,RESPONSE=None): |
|
"""erzeuge index aus feld""" |
|
index={} |
|
founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table)) |
|
|
|
for found in founds: |
|
tmp=getattr(found,field,None) |
|
if tmp: |
|
strings=tmp.split(" ") |
|
for string in strings: |
|
if index.get(string): |
|
index[string].append(found.oid) |
|
else: |
|
index[string]=[found.oid] |
|
RESPONSE.write(string+"\n") |
|
|
|
if not hasattr(self,index_name): |
|
obj=ZSQLIndex(index,index_name,table) |
|
self._setObject(index_name,obj) |
|
|
|
self._getOb(index_name).setIndex(index) |
|
|
|
def getIndex(self,index_name): |
|
"""getIndex""" |
|
founds=self.ZopeFind(self,obj_ids=[index_name]) |
|
|
|
return founds[0][1].getIndex() |
|
|
|
|
def testneu(self): |
def testneu(self): |
"""test""" |
"""test""" |
Line 64 class ZSQLExtendFolder(Folder,Persistent
|
Line 139 class ZSQLExtendFolder(Folder,Persistent
|
def URLquote(self,txt): |
def URLquote(self,txt): |
"""urlquote""" |
"""urlquote""" |
return urllib.quote(txt) |
return urllib.quote(txt) |
|
|
def searchRel(self,relStatement,statement,wherePart,classes): |
def searchRel(self,relStatement,statement,wherePart,classes): |
"""suche relative haufigkeiten""" |
"""suche relative haufigkeiten""" |
ret={} |
ret={} |
Line 131 class ZSQLExtendFolder(Folder,Persistent
|
Line 207 class ZSQLExtendFolder(Folder,Persistent
|
def formatAscii(self,str,url=None): |
def formatAscii(self,str,url=None): |
"""ersetze ascii umbrueche durch <br>""" |
"""ersetze ascii umbrueche durch <br>""" |
#url=None |
#url=None |
|
str=str.rstrip().lstrip() |
|
|
if url and str: |
if url and str: |
|
|
retStr="" |
retStr="" |
Line 282 class ZSQLExtendFolder(Folder,Persistent
|
Line 360 class ZSQLExtendFolder(Folder,Persistent
|
if start: |
if start: |
if start==' ': |
if start==' ': |
start='' |
start='' |
|
|
if not startValue: |
if not startValue: |
startValue=start |
startValue=start |
|
|
Line 290 class ZSQLExtendFolder(Folder,Persistent
|
Line 369 class ZSQLExtendFolder(Folder,Persistent
|
field=getattr(result,fieldName) |
field=getattr(result,fieldName) |
fieldValue=getattr(result,valueName) |
fieldValue=getattr(result,valueName) |
if fieldValue: |
if fieldValue: |
|
|
if not linelen: |
if not linelen: |
|
|
|
|
|
if field == selected: |
|
|
|
ret+="""<option value="%s" selected>%s</option>"""%(field,fieldValue) |
|
else: |
ret+="""<option value="%s">%s</option>"""%(field,fieldValue) |
ret+="""<option value="%s">%s</option>"""%(field,fieldValue) |
|
|
else: |
else: |
mist = """%s"""%(fieldValue) |
mist = """%s"""%(fieldValue) |
if len(mist) > string.atoi(linelen): |
if len(mist) > string.atoi(linelen): |
Line 301 class ZSQLExtendFolder(Folder,Persistent
|
Line 388 class ZSQLExtendFolder(Folder,Persistent
|
return ret |
return ret |
|
|
|
|
def ZSQLInlineSearchU(self,storename=None,**argv): |
def ZSQLInlineSearchU(self,storename=None,args=None,**argv): |
"""one element if exists""" |
"""one element if exists""" |
qs=[] |
qs=[] |
if storename: |
if storename: |
"""store""" |
"""store""" |
|
storename=storename |
else: |
else: |
storename="foundCount" |
storename="foundCount" |
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
|
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argv.keys(): |
for a in argTmp.keys(): |
qs.append(a+"="+urllib.quote(str(argv[a]))) |
qs.append(a+"="+urllib.quote(str(argTmp[a]))) |
#return [] |
#return [] |
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) |
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) |
|
|
Line 322 class ZSQLExtendFolder(Folder,Persistent
|
Line 414 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
return None |
return None |
|
|
def ZSQLInlineSearch(self,storename=None,**argv): |
def ZSQLInlineSearch(self,storename=None,args=None,**argv): |
"""inlinesearch""" |
"""inlinesearch""" |
|
|
qs=[] |
qs=[] |
Line 333 class ZSQLExtendFolder(Folder,Persistent
|
Line 425 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
|
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argv.keys(): |
for a in argv.keys(): |
try: |
try: |
Line 342 class ZSQLExtendFolder(Folder,Persistent
|
Line 440 class ZSQLExtendFolder(Folder,Persistent
|
qs.append(a+"="+urllib.quote(str(argv[a]))) |
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) |
|
|
def ZSQLInlineSearch2(self,query): |
def ZSQLInlineSearch2(self,query): |
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
Line 451 class ZSQLExtendFolder(Folder,Persistent
|
return self.ZSQLSimpleSearch(query) |
return self.ZSQLSimpleSearch(query) |
|
|
|
|
|
def ZSQLResetConnection(self): |
|
"""reset the connectione""" |
|
try: |
|
self.getConnectionObj().manage_close_connection() |
|
except: |
|
zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
|
try: |
|
self.getConnectionObj().manage_open_connection() |
|
except: |
|
zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
|
|
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
"""simple search""" |
"""simple search""" |
|
|
|
|
if not query: |
if not query: |
query=self.query |
query=self.query |
|
|
|
|
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): |
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): |
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.connection_id,"var","<dtml-var var>") |
|
|
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","<dtml-var var>") |
|
|
self._v_searchSQL.max_rows_=max_rows |
self._v_searchSQL.max_rows_=max_rows |
try: |
try: |
|
|
return self._v_searchSQL.__call__(var=query) |
return self._v_searchSQL.__call__(var=query) |
except : |
except : |
|
|
if sys.exc_info()[0]=="Database Error": |
if sys.exc_info()[0]=="Database Error": |
try: |
try: |
getattr(self,self.connection_id).manage_open_connection() |
self.getConnectionObj().manage_open_connection() |
except: |
except: |
zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
else: |
else: |
try: |
try: |
|
|
self._v_searchSQL.max_rows_=max_rows |
self._v_searchSQL.max_rows_=max_rows |
|
|
return self._v_searchSQL.__call__(var=query) |
return self._v_searchSQL.__call__(var=query) |
except : |
except : |
|
|
if sys.exc_info()[0]=="Database Error": |
if sys.exc_info()[0]=="Database Error": |
try: |
try: |
getattr(self,self.connection_id).manage_open_connection() |
self.getConnectionObj().manage_open_connection() |
except: |
except: |
zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
|
|
|
def getConnectionObj(self): |
|
if hasattr(self,'connection_id'): |
|
return getattr(self,self.connection_id) |
|
|
|
|
def ZSQLSimpleSearch2(self,query=None): |
def ZSQLSimpleSearch2(self,query=None): |
""" returrn SQLSearch""" |
""" returrn SQLSearch""" |
Line 410 class ZSQLExtendFolder(Folder,Persistent
|
Line 529 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
def ZSQLAdd(self,format=None,RESPONSE=None,**argv): |
def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): |
"""Neuer Eintrag""" |
"""Neuer Eintrag""" |
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
qs_temp=[] |
qs_temp=[] |
|
|
for a in self.REQUEST.form.keys(): |
for a in self.REQUEST.form.keys(): |
Line 420 class ZSQLExtendFolder(Folder,Persistent
|
Line 544 class ZSQLExtendFolder(Folder,Persistent
|
|
|
qs=string.join(qs_temp,",") |
qs=string.join(qs_temp,",") |
|
|
for field in argv.keys(): |
for field in argTmp.keys(): |
if field[0]=="_": |
if field[0]=="_": |
fieldTmp="-"+field[1:] |
fieldTmp="-"+field[1:] |
else: |
else: |
fieldTmp=field |
fieldTmp=field |
|
|
qs+=",%s=%s"%(fieldTmp,argv[field]) |
qs+=",%s=%s"%(fieldTmp,argTmp[field]) |
|
|
|
|
addList={} |
addList={} |
Line 468 class ZSQLExtendFolder(Folder,Persistent
|
Line 592 class ZSQLExtendFolder(Folder,Persistent
|
qs_temp=[] |
qs_temp=[] |
if USE_FORM or RESPONSE: |
if USE_FORM or RESPONSE: |
for a in self.REQUEST.form.keys(): |
for a in self.REQUEST.form.keys(): |
|
|
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) |
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) |
|
|
|
|
Line 481 class ZSQLExtendFolder(Folder,Persistent
|
Line 606 class ZSQLExtendFolder(Folder,Persistent
|
|
|
qs_temp.append("%s=%s"%(fieldTmp,argv[field])) |
qs_temp.append("%s=%s"%(fieldTmp,argv[field])) |
|
|
qs=string.join(qs_temp,",") |
|
changeList=[] |
changeList=[] |
|
|
for q in qs.split(","): |
for q in qs_temp: |
|
|
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) |
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) |
value="=".join(q.split("=")[1:]) |
value="=".join(q.split("=")[1:]) |
Line 498 class ZSQLExtendFolder(Folder,Persistent
|
Line 623 class ZSQLExtendFolder(Folder,Persistent
|
identify=identify.split("=")[0]+"="+sql_quote(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]=="-" or name[0]=="_")) and (not len(value)==0): |
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): |
|
elif (not (name[0]=="-" or name[0]=="_")): |
|
|
changeList.append("\""+name+"\"="+sql_quote(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) |
|
zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString) |
|
|
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
|
|
Line 513 class ZSQLExtendFolder(Folder,Persistent
|
Line 642 class ZSQLExtendFolder(Folder,Persistent
|
return True |
return True |
|
|
|
|
|
def ZSQLFindIndexed(self,qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv): |
|
"""find2""" |
|
|
|
for index in self.ZopeFind(self,obj_ids=indexedFields): |
|
txt=argv.get(index[0],None) |
|
if txt: |
|
oids=index[1].getIndex()[txt] |
|
|
|
search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv) |
|
|
|
search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv) |
|
return search2 |
|
|
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): |
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): |
"""find2""" |
"""find2""" |
|
|
Line 524 class ZSQLExtendFolder(Folder,Persistent
|
Line 666 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): |
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): |
"""Find""" |
"""search in database""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
|
""""loesche leere elemente aus der liste""" |
ret=[] |
ret=[] |
for x in list: |
for x in list: |
splitted=x.split("=") |
splitted=x.split("=") |
Line 534 class ZSQLExtendFolder(Folder,Persistent
|
Line 677 class ZSQLExtendFolder(Folder,Persistent
|
ret.append(x) |
ret.append(x) |
return ret |
return ret |
|
|
|
|
|
|
#self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen |
|
if qs=="": |
if qs=="": |
|
#kein querystring ubergeben |
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
|
|
|
|
qs=string.join(qs.split("&"),",") |
qs=string.join(qs.split("&"),",") |
|
|
for field in argv.keys(): |
for field in argv.keys(): |
Line 574 class ZSQLExtendFolder(Folder,Persistent
|
Line 713 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular. |
qs=re.sub("\\+"," ",qs)#TODO: Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular. |
|
|
qs=string.join(delEmpty(qs.split(",")),",") |
qs=string.join(delEmpty(qs.split(",")),",") |
|
|
Line 702 class ZSQLExtendFolder(Folder,Persistent
|
Line 841 class ZSQLExtendFolder(Folder,Persistent
|
"""analysieren den QueryString""" |
"""analysieren den QueryString""" |
|
|
|
|
|
#setzte generische werte |
|
|
lop="AND" # standardsuche mit and |
lop="AND" # standardsuche mit and |
max="ALL" #standard alle auswaehlen |
max="ALL" #standard alle auswaehlen |
maxstr="" |
maxstr="" |
Line 717 class ZSQLExtendFolder(Folder,Persistent
|
Line 858 class ZSQLExtendFolder(Folder,Persistent
|
limit=0 |
limit=0 |
searchFields={} |
searchFields={} |
searchFieldsOnly={} |
searchFieldsOnly={} |
|
queryTemplate=[] |
|
|
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
#print "Q",nostore,qs |
|
#check for op |
|
|
|
|
|
|
|
|
|
|
#check for op |
splitted=qs.split(",") |
splitted=qs.split(",") |
|
|
if tableExt: |
if tableExt: |
table=tableExt |
table=tableExt |
|
|
if restrictField: |
if restrictField: |
select=restrictField |
select=restrictField |
|
|
|
|
|
#erster durchgang suche operatoren |
for q in splitted: |
for q in splitted: |
|
|
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
Line 763 class ZSQLExtendFolder(Folder,Persistent
|
Line 905 class ZSQLExtendFolder(Folder,Persistent
|
else: |
else: |
sortfields[field]=value |
sortfields[field]=value |
|
|
#print "HI",op,field |
#zweiter durchgang analysiere felder |
#print opfieldsa |
|
#now analyse the querystring |
|
|
|
for q in qs.split(","): |
for q in qs.split(","): |
|
|
|
|
#try: |
|
|
|
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
try: |
try: |
Line 778 class ZSQLExtendFolder(Folder,Persistent
|
Line 916 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
value="" |
value="" |
|
|
#value=sql_quote(value) |
punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle: |
|
|
|
|
|
#analysiere alle anderen faelle |
if name==iCT+"lop": |
if name==iCT+"lop": |
lop=value |
lop=value |
elif name==iCT+"table": |
elif name==iCT+"table": |
Line 822 class ZSQLExtendFolder(Folder,Persistent
|
Line 960 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
|
elif (not name[0]==iCT) and len(punktsplit)==4: |
|
if opfields.has_key(name): |
|
op=opfields[name] |
|
else: |
|
op="ct" |
|
namealt=name |
|
name="LOWER("+punktsplit[1]+")" |
|
|
|
if op=="ct": |
|
tmp=(name+" LIKE "+sql_quote("%"+value+"%")) |
|
elif op=="gt": |
|
tmp=(name+">"+sql_quote(value)) |
|
elif op=="lt": |
|
tmp=(name+"<"+sql_quote(value)) |
|
elif op=="eq": |
|
tmp=(name+"="+sql_quote(value)) |
|
elif op=="bw": |
|
tmp=(name+" LIKE "+sql_quote(value+"%")) |
|
elif op=="ew": |
|
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=="grep": |
|
tmp=(name+" ~* "+sql_quote(value)) |
|
elif op=="one": |
|
tmps=[] |
|
for word in value.split(" "): |
|
tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) |
|
|
|
tmp=string.join(tmps,' OR ') |
|
|
|
op="all" |
|
|
|
|
|
searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp) |
|
|
|
queryTemplate.append(searchTmp) |
|
|
elif (not name[0]==iCT) and (not len(value)==0): |
elif (not name[0]==iCT) and (not len(value)==0): |
|
|
#print "OP",op,name |
#print "OP",op,name |
Line 876 class ZSQLExtendFolder(Folder,Persistent
|
Line 1060 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
whereList+=queryTemplate |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
if filter: |
if filter: |
Line 906 class ZSQLExtendFolder(Folder,Persistent
|
Line 1091 class ZSQLExtendFolder(Folder,Persistent
|
#print "IAMHERE again:", query |
#print "IAMHERE again:", query |
|
|
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 "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
Line 942 class ZSQLExtendFolder(Folder,Persistent
|
Line 1128 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 |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
if not NoQuery: |
if not NoQuery: |
Line 973 class ZSQLExtendFolder(Folder,Persistent
|
Line 1160 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def ZSQLSearch(self): |
def ZSQLSearch(self): |
"""To be done""" |
"""To be done""" |
rq=self.REQUEST['QUERY_STRING'] |
|
|
|
querys=rq.split("&") |
|
|
|
|
|
formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url |
formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url |
|
|
for querytemp in querys: |
#zerlege querystring in key value paare |
query=querytemp.split("=") |
#TODO: check if this is really necessary, use argv** |
|
|
|
|
|
|
|
rq=self.REQUEST['QUERY_STRING'] |
|
querys=rq.split("&") |
|
for querytemp in querys: #zerg |
|
query=querytemp.split("=") |
|
|
try: |
try: |
if query[0].lower()=="-format": |
if query[0].lower()=="-format": |
formatfile=query[1] |
formatfile=query[1] |
except: |
except: |
"""nothing""" |
pass |
|
|
|
|
#print formatfile |
|
|
|
|
|
|
#sichern |
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 1435 class ZSQLBibliography(Folder,ZSQLExtend
|
Line 1617 class ZSQLBibliography(Folder,ZSQLExtend
|
host_port = self.REQUEST['SERVER_PORT'] |
host_port = self.REQUEST['SERVER_PORT'] |
fix_host = None |
fix_host = None |
if http_host and http_host.rfind(host_port) == -1: |
if http_host and http_host.rfind(host_port) == -1: |
print "HTTP_HOST needs fixing!" |
#print "HTTP_HOST needs fixing!" |
fix_host = http_host + ":" + host_port |
fix_host = http_host + ":" + host_port |
|
|
ret="""<?xml version="1.0" ?> |
ret="""<?xml version="1.0" ?> |