--- ZSQLExtend/ZSQLExtend.py 2005/10/11 20:05:06 1.67 +++ ZSQLExtend/ZSQLExtend.py 2006/05/17 21:42:19 1.86 @@ -17,8 +17,17 @@ import Shared.DC.ZRDB.DA import zLOG import os.path import os +from OFS.SimpleItem import SimpleItem +def getTextFromNode(nodename): + nodelist=nodename.childNodes + rc = "" + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc = rc + node.data + return rc + def analyseIntSearch(word): #analyse integer searches @@ -48,11 +57,386 @@ def sql_quote(v): def showSQLConnectionIDs(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): """Folder""" meta_type="ZSQLExtendFolder" + + def ZSQLQuote(self,str): + """quote str for sql""" + return sql_quote(str) + + + def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None): + """normalize a field""" + import unicodedata + + if not newFieldName: + newFieldName=fieldname+"_normal" + + def normal(str): + if str: + return unicodedata.normalize('NFKD', str.decode('utf-8')).encode('ASCII', 'ignore') + else: + return "" + if mode=="create": # create the field + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text')) + + qstr="select oid,%s from %s"%(fieldname,table) + for result in self.ZSQLSimpleSearch(qstr): + qstr="update %s set %s = %s where oid = %s" + + self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid)) + + def importAccessModell(self,configFileName,RESPONSE=None): + """import tables from access + @param configFileName: xml-configfile + """ + from Ft.Xml import Parse + fh=file(configFileName) + + doc=Parse(fh) + + x=doc.xpath("//pathToFolder/@path") + + + if not (len(x)==1): # tag ist nich eineindeutig + return False + + pathToFolder=x[0].value + + for db in doc.xpath("//db"): + + containers=db.xpath("./@container") + identifiers=db.xpath("./@identify") + + print containers + if not (len(containers)==1): + return False + else: + container=containers[0].value + + if not (len(identifiers)==1): + identifier=None + else: + identifier=identifiers[0].value + + self.xsdToTable(container.lower(),container,modus="drop",filename=os.path.join(pathToFolder,container.lower()+".xsd")) + self.importXMLFileAccess(container.lower(),container,filename=os.path.join(pathToFolder,container.lower()+".xml"),identify=identifier) + + return "DONE" + + def xsdToTable(self,table,elementNameForTable,modus="update", filename=None,data=None,RESPONSE=None): + """reads an xsd file an creates the columns of a table out of its structure + @param table: name of the table the xml shall be imported into + @param elementNameForTable: must be a element of type complex type. the element of the sequence in the complex type + define the columns of the table >table< + @param data (optional): data to be imported + @param filename (optional) or filename + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + + """ + #from xml.dom.minidom import parseString,parse + + from Ft.Xml import Parse + zLOG.LOG("import xsd",zLOG.INFO,"called") + #fh=file("/tmp/fmpxml.xml") + import bz2 + import base64 + + + ret="" + if data: + data=bz2.decompress(base64.decodestring(data)) + + #zLOG.LOG("import xsd",zLOG.INFO,"received file") + doc=Parse(data) + #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + txt=fh.read() + + doc=Parse(txt) + #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + + + Nss={'xsd':'http://www.w3.org/2001/XMLSchema'} + definingSequence=doc.xpath("""//xsd:element[@name='%s']/xsd:complexType/xsd:sequence/xsd:element/@name"""%elementNameForTable,explicitNss=Nss) + + fieldNames=[x.value for x in definingSequence] + + + + #check if table exists + + qstr="""select relname from pg_class where relname = '%s'"""%table + if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table + columns=[] + create=True + else: + create=False + + zLOG.LOG("update xsd: fieldnames",zLOG.INFO,repr(fieldNames)) + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + + if (modus=="drop") and (not create): #table shall be deleted, therefore it should exist (not create) + print "drop" + qstr="""DROP TABLE %s """ + self.ZSQLSimpleSearch(qstr%table) + columns=[] + create=True + + for fieldName in fieldNames: + if type(fieldName) is UnicodeType: + fieldName=fieldName.encode('utf-8') + zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName)) + if fieldName.lower() not in columns: + + if create:# table does not exist therefore create with one column + qstr="""create table %s (%s %s)""" + create=False + else:# otherwise add the field + qstr="""alter table %s add %s %s""" + + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + zLOG.LOG("update xsd: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text')) + + + def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None): + ''' + Import XML file in access format into the table + @param table: name of the table the xml shall be imported into + @param containerTagName: XML-Tag which describes a dataset + @param data: data to be imported + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + ''' + from xml.dom.pulldom import parseString,parse + + zLOG.LOG("import xml",zLOG.INFO,"called") + #fh=file("/tmp/fmpxml.xml") + import bz2 + import base64 + + ret="" + if data: + data=bz2.decompress(base64.decodestring(data)) + + zLOG.LOG("import xml",zLOG.INFO,"received file") + doc=parseString(data) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + doc=parse(fh) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + while 1: + node=doc.getEvent() + + if node is None: + break; + else: + if node[1].nodeName.lower()==container.lower(): # make everything case insensitive + doc.expandNode(node[1]) + + dataSet={} + for col in node[1].childNodes: + if col.nodeType is col.ELEMENT_NODE: + data=col.nodeName + dataSet[data]=getTextFromNode(col) + print dataSet.keys() + update=False + + if identify: + + field=dataSet[identify] + + searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) + zLOG.LOG("import xml",zLOG.INFO,searchStr) + search=self.ZSQLSimpleSearch(searchStr) + if search: + update=True + + if update: + tmp=[] + for fieldName in dataSet.keys(): + tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldName]))) + setStr=",".join(tmp) + + field=dataSet[identify] + + queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + self.ZSQLSimpleSearch(queryStr) + ret+="ud: %s \n"%field + else: + + + fields=",".join(dataSet.keys()) + values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()]) + + + queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(queryStr) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + + + + + return ret + + + def importXMLFile(self,table,data=None,identify=None,filename=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 data: data to be imported + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + ''' + from xml.dom.pulldom import parseString,parse + + zLOG.LOG("import xml",zLOG.INFO,"called") + #fh=file("/tmp/fmpxml.xml") + import bz2 + import base64 + + ret="" + if data: + data=bz2.decompress(base64.decodestring(data)) + + zLOG.LOG("import xml",zLOG.INFO,"received file") + doc=parseString(data) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + doc=parse(fh) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + while 1: + node=doc.getEvent() + + if node is None: + break; + else: + if node[1].nodeName=='ROW': + doc.expandNode(node[1]) + cols=node[1].getElementsByTagName('COL') + dataSet=[] + for col in cols: + data=col.getElementsByTagName('DATA') + dataSet.append(getTextFromNode(data[0])) + update=False + if identify: + + nr=fieldNames.index(identify) + field=dataSet[nr] + + searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) + zLOG.LOG("import xml",zLOG.INFO,searchStr) + search=self.ZSQLSimpleSearch(searchStr) + if search: + update=True + + if update: + tmp=[] + for fieldName in fieldNames: + tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)]))) + setStr=",".join(tmp) + nr=fieldNames.index(identify) + field=dataSet[nr] + + queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + self.ZSQLSimpleSearch(queryStr) + ret+="ud: %s \n"%field + else: + + fields=",".join(fieldNames) + values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet]) + + + queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(queryStr) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + ret+="ad: %s \n"%field + + elif node[1].nodeName=="METADATA": + fieldNames=[] + doc.expandNode(node[1]) + + names=node[1].getElementsByTagName('FIELD') + for name in names: + fieldNames.append(name.getAttribute('NAME')) + + zLOG.LOG("update xml: fieldnames",zLOG.INFO,repr(fieldNames)) + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + for fieldName in fieldNames: + zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName)) + if fieldName not in columns: + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + zLOG.LOG("update xml: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text')) + #fn=node[1].getAttribute("xml:id") + #nf=file("xtf/"+fn+".xtf",'w') + #nf.write(""""""+node[1].toxml()+"") + #print "wrote: %s"%fn + return ret + + 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): """test""" relStatement="""period like '%s%%'""" @@ -64,6 +448,7 @@ class ZSQLExtendFolder(Folder,Persistent def URLquote(self,txt): """urlquote""" return urllib.quote(txt) + def searchRel(self,relStatement,statement,wherePart,classes): """suche relative haufigkeiten""" ret={} @@ -95,14 +480,22 @@ class ZSQLExtendFolder(Folder,Persistent return "" def getLabel(self): - """getLabe""" + """getLabel""" try: return self.label except: return "" + + def getTitle(self): + """getTitle""" + try: + return self.title + except: + return "" + def getDescription(self): - """getLabe""" + """getDescription""" try: return self.description except: @@ -131,6 +524,12 @@ class ZSQLExtendFolder(Folder,Persistent def formatAscii(self,str,url=None): """ersetze ascii umbrueche durch
""" #url=None + + if not str: + return "" + + str=str.rstrip().lstrip() + if url and str: retStr="" @@ -163,22 +562,22 @@ class ZSQLExtendFolder(Folder,Persistent return "" def actualPath(self,url=None): - """path""" + """path""" if self.REQUEST['HTTP_X_FORWARDED_SERVER']=='': host=self.REQUEST['HTTP_HOST'] else: host=self.REQUEST['HTTP_X_FORWARDED_SERVER'] - if not url: - return "http://"+host+self.REQUEST['PATH_TRANSLATED'] - else: - temp=self.REQUEST[url].split("/") - temp[2]=host - return string.join(temp,"/") + if not url: + return "http://"+host+self.REQUEST['PATH_TRANSLATED'] + else: + temp=self.REQUEST[url].split("/") + temp[2]=host + return string.join(temp,"/") def getRequest(self): - """request""" - return self.REQUEST + """request""" + return self.REQUEST def lowerEnd(self,path): """oinly for demo""" @@ -195,12 +594,12 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLsearchOptions(self,fieldname=""): """return HTML Fragment with search options""" - + ret=""""""%fieldname return ret @@ -231,7 +630,7 @@ class ZSQLExtendFolder(Folder,Persistent return ret - def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None): + def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None,selected=None): """generate select oprions form a cr seperated list""" fields=listField.split("\n") if size: @@ -242,18 +641,21 @@ class ZSQLExtendFolder(Folder,Persistent ret="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None): + def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None,selected=None): """generate select options form a search list es wird """%(fieldname,multiple,additionalSelect) if start: - if start==' ': - start='' - if not startValue: + if start==' ': + start='' + + if not startValue: startValue=start - + ret+=""""""%(startValue,start) for result in results: field=getattr(result,fieldName) fieldValue=getattr(result,valueName) if fieldValue: + print "XXX",field,repr(type(field)),repr(type(selected)) if not linelen: - ret+=""""""%(field,fieldValue) + + if field == selected: + print "huhu" + ret+=""""""%(field,fieldValue) + else: + ret+=""""""%(field,fieldValue) else: mist = """%s"""%(fieldValue) if len(mist) > string.atoi(linelen): @@ -303,6 +712,7 @@ class ZSQLExtendFolder(Folder,Persistent qs=[] if storename: """store""" + storename=storename else: storename="foundCount" @@ -319,7 +729,7 @@ class ZSQLExtendFolder(Folder,Persistent except: return None - def ZSQLInlineSearch(self,storename=None,**argv): + def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" qs=[] @@ -329,14 +739,22 @@ class ZSQLExtendFolder(Folder,Persistent storename="foundCount" - + if args: + argTmp=args + else: + argTmp=argv + #print "INLINE:",argv - for a in argv.keys(): + for a in argTmp.keys(): + if a[0]=="-": + key="_"+a[1:] + else: + key=a try: - qs.append(a+"="+urllib.quote(str(argv[a]))) + qs.append(key+"="+urllib.quote(str(argTmp[a]))) except: import urllib - qs.append(a+"="+urllib.quote(str(argv[a]))) + qs.append(key+"="+urllib.quote(str(argTmp[a]))) #return [] return self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -348,38 +766,59 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",query return self.ZSQLSimpleSearch(query) - - def ZSQLSimpleSearch(self,query=None,max_rows=1000000): + + 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,debug=None): """simple search""" - + print query + if not query: query=self.query + if debug: + print "DEBUG: ZSQLSimpleSearch:", query 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","") + + self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","") self._v_searchSQL.max_rows_=max_rows try: - return self._v_searchSQL.__call__(var=query) except : + if sys.exc_info()[0]=="Database Error": try: - getattr(self,self.connection_id).manage_open_connection() + self.getConnectionObj().manage_open_connection() except: zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) else: try: + self._v_searchSQL.max_rows_=max_rows return self._v_searchSQL.__call__(var=query) except : + if sys.exc_info()[0]=="Database Error": try: - getattr(self,self.connection_id).manage_open_connection() + self.getConnectionObj().manage_open_connection() except: 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): """ returrn SQLSearch""" @@ -407,7 +846,7 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLAdd(self,format=None,RESPONSE=None,**argv): + def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): """Neuer Eintrag""" qs_temp=[] @@ -417,13 +856,18 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(qs_temp,",") - for field in argv.keys(): + if args: + argTmp=args + else: + argTmp=argv + + for field in argTmp.keys(): if field[0]=="_": fieldTmp="-"+field[1:] else: fieldTmp=field - qs+=",%s=%s"%(fieldTmp,argv[field]) + qs+=",%s=%s"%(fieldTmp,argTmp[field]) addList={} @@ -431,7 +875,7 @@ class ZSQLExtendFolder(Folder,Persistent name=re.sub("r'+'"," ",q.split("=")[0].lower()) value=q.split("=")[1] value=re.sub(r'\+'," ",value) - value=urllib.unquote(value) + value=urllib.unquote(value) if name=="-table": table=urllib.unquote(value) elif name=="-format": @@ -457,30 +901,35 @@ class ZSQLExtendFolder(Folder,Persistent else: return True - def ZSQLChange(self,format=None,RESPONSE=None,**argv): + def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv): """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack - + print args qs_temp=[] - -# for a in self.REQUEST.form.keys(): -# qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) + if USE_FORM or RESPONSE: + for a in self.REQUEST.form.keys(): + qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - - for field in argv.keys(): + if args: + argTmp=args + else: + argTmp=argv + + for field in argTmp.keys(): + if field[0]=="_": fieldTmp="-"+field[1:] else: fieldTmp=field - qs_temp.append("%s=%s"%(fieldTmp,argv[field])) + qs_temp.append("%s=%s"%(fieldTmp,argTmp[field])) + - qs=string.join(qs_temp,",") changeList=[] - for q in qs.split(","): + for q in qs_temp: name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) value="=".join(q.split("=")[1:]) @@ -495,9 +944,11 @@ class ZSQLExtendFolder(Folder,Persistent elif name=="-format": format=urllib.unquote(value) elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): + changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) changeString=string.join(changeList,",") + queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) self.ZSQLSimpleSearch(queryString) @@ -509,6 +960,19 @@ class ZSQLExtendFolder(Folder,Persistent 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): """find2""" @@ -520,9 +984,10 @@ 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): - """Find""" + """search in database""" def delEmpty(list): + """"loesche leere elemente aus der liste""" ret=[] for x in list: splitted=x.split("=") @@ -530,22 +995,18 @@ class ZSQLExtendFolder(Folder,Persistent ret.append(x) return ret - - - #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen if qs=="": - + #kein querystring ubergeben if self.REQUEST['QUERY_STRING']: qs=self.REQUEST['QUERY_STRING'] - qs=string.join(qs.split("&"),",") for field in argv.keys(): if field[0]=="_": fieldTmp="-"+field[1:] else: - fieldTmp=field + fieldTmp=urllib.unquote(field) qs+=",%s=%s"%(fieldTmp,argv[field]) @@ -570,23 +1031,25 @@ 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(",")),",") - if storename: - """store""" - else: + if not storename: storename="foundCount" #store query for further usage self.REQUEST.SESSION['query']=qs - + print "st",storename,qs #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,filter=filter) #print self.REQUEST.SESSION["foundCount"] - +# if not hasattr(self,'_v_results'): +# self._v_results={} +# +# +# self._v_results[urllib.quote(qs)]=ret[0:] return ret @@ -641,7 +1104,7 @@ class ZSQLExtendFolder(Folder,Persistent else: storename="foundCount" - return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) + return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd'])+1,int(self.REQUEST.SESSION[storename]['count']))) def ZSQLNewQuery(self,linkText,storename=None,**argv): """suche neu""" @@ -698,6 +1161,8 @@ class ZSQLExtendFolder(Folder,Persistent """analysieren den QueryString""" + #setzte generische werte + lop="AND" # standardsuche mit and max="ALL" #standard alle auswaehlen maxstr="" @@ -713,21 +1178,22 @@ class ZSQLExtendFolder(Folder,Persistent limit=0 searchFields={} searchFieldsOnly={} + queryTemplate=[] + if not select: select="oid,*" - #print "Q",nostore,qs - #check for op - + #check for op + splitted=qs.split(",") - - splitted=qs.split(",") if tableExt: table=tableExt if restrictField: select=restrictField - + + + #erster durchgang suche operatoren for q in splitted: name=re.sub("r'+'"," ",q.split("=")[0].lower()) @@ -758,25 +1224,21 @@ class ZSQLExtendFolder(Folder,Persistent sortAllFields=value else: sortfields[field]=value - - #print "HI",op,field - #print opfieldsa - #now analyse the querystring - + + #zweiter durchgang analysiere felder for q in qs.split(","): - #try: - + name=re.sub("r'+'"," ",q.split("=")[0].lower()) try: value=urllib.unquote(q.split("=",1)[1]) except: 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": lop=value elif name==iCT+"table": @@ -817,10 +1279,58 @@ class ZSQLExtendFolder(Folder,Persistent op=value + + 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 ') + + searchFieldsOnly[namealt]=value + 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): - #print "OP",op,name + #print "OP",op,name value=value.lower() tmp="" if opfields.has_key(name): @@ -872,7 +1382,8 @@ class ZSQLExtendFolder(Folder,Persistent whereList=["("+searchFields[x]+")" for x in searchFields.keys()] - + whereList+=queryTemplate + if len(whereList)>0: if filter: whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter @@ -895,13 +1406,14 @@ class ZSQLExtendFolder(Folder,Persistent #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) - + if not nostore=="yes": self.REQUEST.SESSION['qs']=opfields #print "IAMHERE again:", query if storename and (not NoQuery): + query2="SELECT count(*) FROM %s %s"%(table,where) #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] @@ -938,8 +1450,10 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields + print "SF",searchFieldsOnly,searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + if not NoQuery: return self.ZSQLQuery(query) @@ -959,37 +1473,34 @@ class ZSQLExtendFolder(Folder,Persistent else: return value - def ZSQLQuery(self,query): + def ZSQLQuery(self,query,debug=None): """query""" - + if debug: + zLOG.LOG("ZSQLQuery", zLOG.INFO, query) + return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): """To be done""" - rq=self.REQUEST['QUERY_STRING'] - - querys=rq.split("&") - - + formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url + + #zerlege querystring in key value paare + #TODO: check if this is really necessary, use argv** - for querytemp in querys: + rq=self.REQUEST['QUERY_STRING'] + querys=rq.split("&") + for querytemp in querys: #zerg query=querytemp.split("=") - - - try: if query[0].lower()=="-format": formatfile=query[1] except: - """nothing""" + pass - - #print formatfile - - + #sichern self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") self.REQUEST.SESSION['come_from_search']="yes" @@ -1064,7 +1575,7 @@ class ZSQLExtendFolder(Folder,Persistent newquery.append(query) newquerystring=string.join(newquery,"&") - return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) @@ -1308,16 +1819,16 @@ class ZSQLBibliography(Folder,ZSQLExtend retdata={} fieldlist=self.standardMD.fieldList - for referenceTypeF in self.referencetypes: - #print referenceType,referenceTypeF[1].title - if referenceTypeF[1].title == referenceType: - bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields - bibdata['data']=referenceTypeF[1] - self.fields=bibdata[referenceType] + for referenceTypeF in self.referencetypes: + #print referenceType,referenceTypeF[1].title + if referenceTypeF[1].title == referenceType: + bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields + bibdata['data']=referenceTypeF[1] + self.fields=bibdata[referenceType] for field in fieldlist: - if referenceTypeF[1].getValue(field)[0]==None: - retdata[field]=field - else: + if referenceTypeF[1].getValue(field)[0]==None: + retdata[field]=field + else: retdata[field]=referenceTypeF[1].getValue(field)[0] return retdata,fieldlist @@ -1329,12 +1840,12 @@ class ZSQLBibliography(Folder,ZSQLExtend retdata={} fieldlist=self.standardMD.fieldList - for referenceTypeF in self.referencetypes: - #print referenceType,referenceTypeF[1].title - if referenceTypeF[1].title == referenceType: - bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields - bibdata['data']=referenceTypeF[1] - self.fields=bibdata[referenceType] + for referenceTypeF in self.referencetypes: + #print referenceType,referenceTypeF[1].title + if referenceTypeF[1].title == referenceType: + bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields + bibdata['data']=referenceTypeF[1] + self.fields=bibdata[referenceType] for field in fieldlist: retdata[field]=referenceTypeF[1].getValue(field)[1] @@ -1429,11 +1940,11 @@ class ZSQLBibliography(Folder,ZSQLExtend host_port = self.REQUEST['SERVER_PORT'] fix_host = None 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 ret=""" - """ + """ for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): base_url = self.absolute_url() if fix_host: