--- ZSQLExtend/ZSQLExtend.py 2006/05/16 15:56:03 1.85 +++ ZSQLExtend/ZSQLExtend.py 2006/09/16 15:17:24 1.92 @@ -1,3 +1,4 @@ + from OFS.Folder import Folder from Acquisition import Implicit from Globals import DTMLFile,package_home,Persistent @@ -17,17 +18,10 @@ import Shared.DC.ZRDB.DA import zLOG import os.path import os -from OFS.SimpleItem import SimpleItem +import copy -def getTextFromNode(nodename): - nodelist=nodename.childNodes - rc = "" - for node in nodelist: - if node.nodeType == node.TEXT_NODE: - rc = rc + node.data - return rc +from OFS.SimpleItem import SimpleItem - def analyseIntSearch(word): #analyse integer searches @@ -125,7 +119,7 @@ class ZSQLExtendFolder(Folder,Persistent containers=db.xpath("./@container") identifiers=db.xpath("./@identify") - print containers + if not (len(containers)==1): return False else: @@ -147,6 +141,7 @@ class ZSQLExtendFolder(Folder,Persistent @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) @@ -263,7 +258,7 @@ class ZSQLExtendFolder(Folder,Persistent if col.nodeType is col.ELEMENT_NODE: data=col.nodeName dataSet[data]=getTextFromNode(col) - print dataSet.keys() + update=False if identify: @@ -311,103 +306,27 @@ class ZSQLExtendFolder(Folder,Persistent 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 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,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") + from xml.dom.pulldom import parseString - elif filename: - fh=file(filename) - doc=parse(fh) - zLOG.LOG("import xml",zLOG.INFO,"parsed file") + doc=parseString(file.read()) while 1: node=doc.getEvent() - + if node is None: break; else: - if node[1].nodeName=='ROW': + if node[1].nodeName==containerTagName: 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={} @@ -480,22 +399,14 @@ class ZSQLExtendFolder(Folder,Persistent return "" def getLabel(self): - """getLabel""" + """getLabe""" try: return self.label except: return "" - - def getTitle(self): - """getTitle""" - try: - return self.title - except: - return "" - def getDescription(self): - """getDescription""" + """getLabe""" try: return self.description except: @@ -524,10 +435,6 @@ 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: @@ -690,14 +597,16 @@ class ZSQLExtendFolder(Folder,Persistent field=getattr(result,fieldName) fieldValue=getattr(result,valueName) if fieldValue: - print "XXX",field,repr(type(field)),repr(type(selected)) + if not linelen: + if field == selected: - print "huhu" + ret+=""""""%(field,fieldValue) else: ret+=""""""%(field,fieldValue) + else: mist = """%s"""%(fieldValue) if len(mist) > string.atoi(linelen): @@ -707,7 +616,7 @@ class ZSQLExtendFolder(Folder,Persistent return ret - def ZSQLInlineSearchU(self,storename=None,**argv): + def ZSQLInlineSearchU(self,storename=None,args=None,**argv): """one element if exists""" qs=[] if storename: @@ -716,11 +625,15 @@ class ZSQLExtendFolder(Folder,Persistent else: storename="foundCount" - + if args: + argTmp=args + else: + argTmp=argv + #print "INLINE:",argv - for a in argv.keys(): - qs.append(a+"="+urllib.quote(str(argv[a]))) + for a in argTmp.keys(): + qs.append(a+"="+urllib.quote(str(argTmp[a]))) #return [] ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -728,7 +641,27 @@ class ZSQLExtendFolder(Folder,Persistent return ret[0] except: return None + + + def ZSQLSequentialSearch(self,_fieldlist,_searchTerm,storename=None,args=None,**argv): + """get a list of tuples (fields,searchoptions,table) to search the searchTerm in, returns dictionary. """ + #print "do search with:",_fieldlist,_searchTerm,storename,args,argv + ret={} + if args: + argTmp=args + else: + argTmp=argv + + for field in _fieldlist: + + argTmp2=copy.deepcopy(argTmp) + argTmp2[field[0]]=_searchTerm + argTmp2['_op_'+field[0]]=field[1] + argTmp2['_table']=field[2] + + ret[field[0]]=(self.ZSQLInlineSearch(storename=storename,args=argTmp2),field[3],field[4]) + return ret def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" @@ -739,11 +672,13 @@ class ZSQLExtendFolder(Folder,Persistent storename="foundCount" + if args: argTmp=args else: argTmp=argv - + + #print "INLINE:",argv for a in argTmp.keys(): try: @@ -753,6 +688,7 @@ class ZSQLExtendFolder(Folder,Persistent qs.append(a+"="+urllib.quote(str(argTmp[a]))) #return [] + return self.parseQueryString(string.join(qs,","),"_",storename=storename) def ZSQLInlineSearch2(self,query): @@ -774,15 +710,14 @@ class ZSQLExtendFolder(Folder,Persistent except: zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) - def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None): + def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """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.getConnectionObj().getId(),"var","") @@ -845,6 +780,11 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): """Neuer Eintrag""" + if args: + argTmp=args + else: + argTmp=argv + qs_temp=[] for a in self.REQUEST.form.keys(): @@ -852,11 +792,6 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(qs_temp,",") - if args: - argTmp=args - else: - argTmp=argv - for field in argTmp.keys(): if field[0]=="_": fieldTmp="-"+field[1:] @@ -897,41 +832,38 @@ class ZSQLExtendFolder(Folder,Persistent else: return True - def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv): + def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv): """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack - print args + qs_temp=[] if USE_FORM or RESPONSE: for a in self.REQUEST.form.keys(): + qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - if args: - argTmp=args - else: - argTmp=argv - - for field in argTmp.keys(): + + for field in argv.keys(): if field[0]=="_": fieldTmp="-"+field[1:] else: fieldTmp=field - qs_temp.append("%s=%s"%(fieldTmp,argTmp[field])) + qs_temp.append("%s=%s"%(fieldTmp,argv[field])) changeList=[] for q in qs_temp: - + name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) value="=".join(q.split("=")[1:]) value=re.sub(r'\+'," ",value) value=urllib.unquote(value) - + if name=="-table": table=urllib.unquote(value) elif name=="-identify": @@ -939,13 +871,15 @@ class ZSQLExtendFolder(Folder,Persistent identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) elif name=="-format": 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))) changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) + zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString) self.ZSQLSimpleSearch(queryString) @@ -971,7 +905,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): """find2""" - + 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) @@ -1002,7 +936,7 @@ class ZSQLExtendFolder(Folder,Persistent if field[0]=="_": fieldTmp="-"+field[1:] else: - fieldTmp=urllib.unquote(field) + fieldTmp=field qs+=",%s=%s"%(fieldTmp,argv[field]) @@ -1031,21 +965,19 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(delEmpty(qs.split(",")),",") - if not storename: + if storename: + """store""" + else: 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 @@ -1100,7 +1032,7 @@ class ZSQLExtendFolder(Folder,Persistent else: storename="foundCount" - return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd'])+1,int(self.REQUEST.SESSION[storename]['count']))) + return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) def ZSQLNewQuery(self,linkText,storename=None,**argv): """suche neu""" @@ -1300,7 +1232,7 @@ class ZSQLExtendFolder(Folder,Persistent tmps=[] for word in value.split(" "): tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) - + tmp=string.join(tmps,' AND ') elif op=="numerical": @@ -1314,14 +1246,12 @@ class ZSQLExtendFolder(Folder,Persistent 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): @@ -1379,7 +1309,7 @@ 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 @@ -1446,10 +1376,9 @@ 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) @@ -2002,4 +1931,4 @@ def manage_addZSQLBibliography(self, id, - + \ No newline at end of file