--- ZSQLExtend/ZSQLExtend.py 2005/11/08 13:37:32 1.71 +++ ZSQLExtend/ZSQLExtend.py 2006/09/16 12:34:50 1.91 @@ -67,6 +67,11 @@ class ZSQLExtendFolder(Folder,Persistent """Folder""" 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 ''' @@ -98,7 +103,7 @@ class ZSQLExtendFolder(Folder,Persistent """erzeuge index aus feld""" index={} founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table)) - print len(founds) + for found in founds: tmp=getattr(found,field,None) if tmp: @@ -202,6 +207,8 @@ class ZSQLExtendFolder(Folder,Persistent def formatAscii(self,str,url=None): """ersetze ascii umbrueche durch
""" #url=None + str=str.rstrip().lstrip() + if url and str: retStr="" @@ -234,22 +241,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""" @@ -266,12 +273,12 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLsearchOptions(self,fieldname=""): """return HTML Fragment with search options""" - + ret=""""""%fieldname return ret @@ -313,8 +320,8 @@ 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: + if not linelen: - ret+=""""""%(field,fieldValue) + + + if field == selected: + + ret+=""""""%(field,fieldValue) + else: + ret+=""""""%(field,fieldValue) + else: mist = """%s"""%(fieldValue) if len(mist) > string.atoi(linelen): @@ -372,19 +388,24 @@ 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: """store""" + storename=storename 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) @@ -393,7 +414,7 @@ class ZSQLExtendFolder(Folder,Persistent except: return None - def ZSQLInlineSearch(self,storename=None,**argv): + def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" qs=[] @@ -404,15 +425,22 @@ class ZSQLExtendFolder(Folder,Persistent + if args: + argTmp=args + else: + argTmp=argv + + #print "INLINE:",argv - for a in argv.keys(): + for a in argTmp.keys(): try: - qs.append(a+"="+urllib.quote(str(argv[a]))) + qs.append(a+"="+urllib.quote(str(argTmp[a]))) except: import urllib - qs.append(a+"="+urllib.quote(str(argv[a]))) + qs.append(a+"="+urllib.quote(str(argTmp[a]))) #return [] + return self.parseQueryString(string.join(qs,","),"_",storename=storename) def ZSQLInlineSearch2(self,query): @@ -422,22 +450,35 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",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): """simple search""" - + + if not query: query=self.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","") self._v_searchSQL.max_rows_=max_rows try: - return self._v_searchSQL.__call__(var=query) except : + if sys.exc_info()[0]=="Database Error": try: self.getConnectionObj().manage_open_connection() @@ -445,10 +486,12 @@ class ZSQLExtendFolder(Folder,Persistent 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: self.getConnectionObj().manage_open_connection() @@ -486,9 +529,14 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLAdd(self,format=None,RESPONSE=None,**argv): + 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(): @@ -496,13 +544,13 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(qs_temp,",") - for field in argv.keys(): + 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={} @@ -510,7 +558,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": @@ -540,10 +588,11 @@ class ZSQLExtendFolder(Folder,Persistent """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack - + 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]))) @@ -561,12 +610,12 @@ class ZSQLExtendFolder(Folder,Persistent 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": @@ -574,12 +623,16 @@ 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) @@ -812,7 +865,7 @@ class ZSQLExtendFolder(Folder,Persistent #check for op splitted=qs.split(",") - print splitted + if tableExt: table=tableExt @@ -914,7 +967,7 @@ class ZSQLExtendFolder(Folder,Persistent op="ct" namealt=name name="LOWER("+punktsplit[1]+")" - print "XX",op + if op=="ct": tmp=(name+" LIKE "+sql_quote("%"+value+"%")) elif op=="gt": @@ -948,14 +1001,14 @@ class ZSQLExtendFolder(Folder,Persistent op="all" - print punktsplit + searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp) - print "got",searchTmp + 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): @@ -1031,13 +1084,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) - print query + 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'] @@ -1074,6 +1128,7 @@ 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 + self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly if not NoQuery: @@ -1197,7 +1252,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) @@ -1441,16 +1496,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 @@ -1462,12 +1517,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] @@ -1562,11 +1617,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: