--- ZSQLExtend/ZSQLExtend.py	2006/01/16 17:32:40	1.78
+++ ZSQLExtend/ZSQLExtend.py	2006/07/27 17:31:50	1.87
@@ -171,22 +171,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:
@@ -215,10 +207,6 @@ class ZSQLExtendFolder(Folder,Persistent
     def formatAscii(self,str,url=None):
         """ersetze ascii umbrueche durch <br>"""
         #url=None
-        
-        if not str:
-            return ""
-        
         str=str.rstrip().lstrip()
         
         if url and str:
@@ -460,7 +448,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
         if not query:
             query=self.query
-	
+        
         
         if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):
             
@@ -545,7 +533,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":
@@ -579,6 +567,7 @@ class ZSQLExtendFolder(Folder,Persistent
         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])))
 
         
@@ -596,12 +585,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":
@@ -609,13 +598,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)
         
@@ -672,7 +663,7 @@ class ZSQLExtendFolder(Folder,Persistent
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
-                       fieldTmp=urllib.unqoute(field)
+                       fieldTmp=field
                        
                    qs+=",%s=%s"%(fieldTmp,argv[field])
                    
@@ -992,7 +983,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):
@@ -1114,7 +1105,6 @@ 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)
@@ -1236,7 +1226,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)
 
             
         
@@ -1480,16 +1470,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
@@ -1501,12 +1491,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]
 
@@ -1605,7 +1595,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
             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: