--- ZSQLExtend/ZSQLExtend.py 2005/11/09 10:47:09 1.72 +++ ZSQLExtend/ZSQLExtend.py 2006/01/16 17:32:40 1.78 @@ -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 ''' @@ -166,14 +171,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: @@ -202,6 +215,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="" @@ -234,22 +253,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 +285,12 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLsearchOptions(self,fieldname=""): """return HTML Fragment with search options""" - + ret=""""""%fieldname return ret @@ -313,8 +332,8 @@ class ZSQLExtendFolder(Folder,Persistent ret=""" """%(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) @@ -377,6 +397,7 @@ class ZSQLExtendFolder(Folder,Persistent qs=[] if storename: """store""" + storename=storename else: storename="foundCount" @@ -422,12 +443,24 @@ 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")): @@ -435,9 +468,9 @@ class ZSQLExtendFolder(Folder,Persistent 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 +478,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() @@ -575,11 +610,13 @@ 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) @@ -635,7 +672,7 @@ class ZSQLExtendFolder(Folder,Persistent if field[0]=="_": fieldTmp="-"+field[1:] else: - fieldTmp=field + fieldTmp=urllib.unqoute(field) qs+=",%s=%s"%(fieldTmp,argv[field]) @@ -1038,6 +1075,7 @@ class ZSQLExtendFolder(Folder,Persistent #print "IAMHERE again:", query if storename and (not NoQuery): + query2="SELECT count(*) FROM %s %s"%(table,where) #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] @@ -1076,6 +1114,7 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['searchFields']=searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + print query if not NoQuery: return self.ZSQLQuery(query) @@ -1562,7 +1601,7 @@ 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="""