--- ZSQLExtend/ZSQLExtend.py	2005/11/23 17:41:28	1.74
+++ ZSQLExtend/ZSQLExtend.py	2006/08/29 17:09:49	1.88
@@ -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
         '''
@@ -236,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"""
@@ -268,12 +273,12 @@ class ZSQLExtendFolder(Folder,Persistent
 
     def ZSQLsearchOptions(self,fieldname=""):
         """return HTML Fragment with search options"""
-	
+        
         ret="""<select name="-op_%s">
-	<option value="bw">begins with</option>          	<!-- begins with / beginnt mit, "Wort*" -->
-	<option value="ew">ends with</option>
-   	<option value="ct" selected>contains</option>          		<!-- contains / enthaellt, "Wort" -->
-    <option value="eq">equals</option>          		<!-- equals / ist, =Wort -->
+        <option value="bw">begins with</option>                 <!-- begins with / beginnt mit, "Wort*" -->
+        <option value="ew">ends with</option>
+        <option value="ct" selected>contains</option>                   <!-- contains / enthaellt, "Wort" -->
+    <option value="eq">equals</option>                          <!-- equals / ist, =Wort -->
 </select>"""%fieldname
         return ret
 
@@ -315,8 +320,8 @@ class ZSQLExtendFolder(Folder,Persistent
             ret="""<select name="%s" %s >
             """%(fieldname,multiple)
         if start:
-	    if start==' ':
-		start=''
+            if start==' ':
+                start=''
                 if not startValue:
                     startValue=start
                     
@@ -354,7 +359,7 @@ class ZSQLExtendFolder(Folder,Persistent
             """%(fieldname,multiple,additionalSelect)
         if start:
             if start==' ':
-		        start=''
+                        start=''
             
             if not startValue:
                     startValue=start
@@ -364,8 +369,16 @@ class ZSQLExtendFolder(Folder,Persistent
             field=getattr(result,fieldName)
             fieldValue=getattr(result,valueName)
             if fieldValue:
+
                 if not linelen:
-                    ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+
+                    
+                    if field == selected:
+
+                        ret+="""<option value="%s" selected>%s</option>"""%(field,fieldValue)
+                    else:
+                        ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+
                 else:
                     mist = """%s"""%(fieldValue)
                     if len(mist) > string.atoi(linelen):
@@ -375,7 +388,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:
@@ -384,11 +397,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)
 
@@ -408,6 +425,12 @@ class ZSQLExtendFolder(Folder,Persistent
             
     
 
+        if args:
+            argTmp=args
+        else:
+            argTmp=argv
+
+
         #print "INLINE:",argv
         for a in argv.keys():
             try:
@@ -417,6 +440,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 qs.append(a+"="+urllib.quote(str(argv[a])))
                 
         #return []  
+
         return self.parseQueryString(string.join(qs,","),"_",storename=storename)
 
     def ZSQLInlineSearch2(self,query):
@@ -426,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","<dtml-var 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()
@@ -449,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()
@@ -514,7 +553,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":
@@ -544,10 +583,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])))
 
         
@@ -565,12 +605,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":
@@ -578,12 +618,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)
         
         
@@ -959,7 +1003,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 
             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):
@@ -1079,6 +1123,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:
@@ -1202,7 +1247,7 @@ class ZSQLExtendFolder(Folder,Persistent
             newquery.append(query)
                 
         newquerystring=string.join(newquery,"&")
-	return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)
+        return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)
 
             
         
@@ -1446,16 +1491,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
@@ -1467,12 +1512,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]
 
@@ -1567,11 +1612,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="""<?xml version="1.0" ?>
-	             <index>"""
+                     <index>"""
         for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):
             base_url = self.absolute_url()
             if fix_host: