--- ZSQLExtend/ZSQLExtend.py	2005/11/08 13:37:32	1.71
+++ ZSQLExtend/ZSQLExtend.py	2005/11/25 12:14:13	1.75
@@ -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 <br>"""
         #url=None
+        str=str.rstrip().lstrip()
+        
         if url and str:
             
             retStr=""
@@ -351,11 +358,12 @@ class ZSQLExtendFolder(Folder,Persistent
             ret="""<select name="%s" %s %s>
             """%(fieldname,multiple,additionalSelect)
         if start:
-	    if start==' ':
-		start=''
-                if not startValue:
+            if start==' ':
+		        start=''
+            
+            if not startValue:
                     startValue=start
-                    
+                            
             ret+="""<option value="%s" >%s</option>"""%(startValue,start)
         for result in results:
             field=getattr(result,fieldName)
@@ -377,6 +385,7 @@ class ZSQLExtendFolder(Folder,Persistent
         qs=[]
         if storename:
             """store"""
+            storename=storename
         else:
             storename="foundCount"
             
@@ -812,7 +821,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
         #check for op 
         splitted=qs.split(",")
-        print splitted
+
         if tableExt:
             table=tableExt
 
@@ -914,7 +923,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,9 +957,9 @@ 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):
@@ -1031,13 +1040,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']