--- ZSQLExtend/ZSQLExtend.py	2006/04/20 17:40:11	1.81
+++ ZSQLExtend/ZSQLExtend.py	2006/05/16 15:56:03	1.85
@@ -80,6 +80,29 @@ class ZSQLExtendFolder(Folder,Persistent
         """quote str for sql"""
         return sql_quote(str)
     
+    
+    def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
+        """normalize a field"""
+        import unicodedata
+        
+        if not newFieldName:
+            newFieldName=fieldname+"_normal"
+            
+        def normal(str):
+            if str:
+                return unicodedata.normalize('NFKD', str.decode('utf-8')).encode('ASCII', 'ignore')
+            else:
+                return ""
+        if mode=="create": # create the field
+            qstr="""alter table %s add %s %s"""
+            self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text'))
+        
+        qstr="select oid,%s from %s"%(fieldname,table)
+        for result in self.ZSQLSimpleSearch(qstr):
+            qstr="update %s set %s = %s where oid = %s"
+
+            self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid))
+        
     def importAccessModell(self,configFileName,RESPONSE=None):
         """import tables from access
         @param configFileName: xml-configfile
@@ -164,7 +187,7 @@ class ZSQLExtendFolder(Folder,Persistent
         #check if table exists
         
         qstr="""select relname from pg_class where relname = '%s'"""%table
-        if len (self.ZSQLSimpleSearch(qstr))<1: # if not the create the table
+        if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table
             columns=[]
             create=True    
         else:
@@ -269,7 +292,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
                        
                         fields=",".join(dataSet.keys())
-                        values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet.keys()])
+                        values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
                   
                         
                         queryStr="""INSERT INTO %s  (%s) VALUES (%s)"""%(table,fields,values)
@@ -632,7 +655,7 @@ class ZSQLExtendFolder(Folder,Persistent
         ret+="""</select>"""
         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
         <select name=fieldname mutiple>
@@ -667,8 +690,14 @@ class ZSQLExtendFolder(Folder,Persistent
             field=getattr(result,fieldName)
             fieldValue=getattr(result,valueName)
             if fieldValue:
+                print "XXX",field,repr(type(field)),repr(type(selected))
                 if not linelen:
-                    ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+                    
+                    if field == selected:
+                        print "huhu"
+                        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):
@@ -700,7 +729,7 @@ class ZSQLExtendFolder(Folder,Persistent
         except:
             return None
         
-    def ZSQLInlineSearch(self,storename=None,**argv):
+    def ZSQLInlineSearch(self,storename=None,args=None,**argv):
         """inlinesearch"""
         
         qs=[]
@@ -710,14 +739,18 @@ class ZSQLExtendFolder(Folder,Persistent
             storename="foundCount"
             
     
-
+        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)
@@ -743,7 +776,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
     def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None):
         """simple search"""
-
+        print query 
 
         if not query:
             query=self.query
@@ -809,7 +842,7 @@ class ZSQLExtendFolder(Folder,Persistent
     
         
         
-    def ZSQLAdd(self,format=None,RESPONSE=None,**argv):
+    def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv):
         """Neuer Eintrag"""
             
         qs_temp=[]
@@ -819,13 +852,18 @@ class ZSQLExtendFolder(Folder,Persistent
 
         qs=string.join(qs_temp,",")
         
-        for field in argv.keys():
+        if args:
+            argTmp=args
+        else:
+            argTmp=argv
+            
+        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={}
@@ -859,26 +897,30 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             return True
         
-    def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
+    def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv):
         """change entries"""
         #qs=self.REQUEST['QUERY_STRING']
         # very bad hack
-        
+        print args
         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])))
 
         
-        
-        for field in argv.keys():
+        if args:
+            argTmp=args
+        else:    
+            argTmp=argv
+            
+        for field in argTmp.keys():
                 
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
                        fieldTmp=field
                        
-                   qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
+                   qs_temp.append("%s=%s"%(fieldTmp,argTmp[field]))
         
         
         changeList=[]
@@ -960,7 +1002,7 @@ class ZSQLExtendFolder(Folder,Persistent
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
-                       fieldTmp=urllib.unqoute(field)
+                       fieldTmp=urllib.unquote(field)
                        
                    qs+=",%s=%s"%(fieldTmp,argv[field])
                    
@@ -989,19 +1031,21 @@ class ZSQLExtendFolder(Folder,Persistent
 
         qs=string.join(delEmpty(qs.split(",")),",")
 
-        if storename:
-            """store"""
-        else:
+        if not storename:
             storename="foundCount"
 
         #store query for further usage
         self.REQUEST.SESSION['query']=qs
-
+        print "st",storename,qs                          
         #print "calling Query with",repr(NoQuery)
         ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)
         #print self.REQUEST.SESSION["foundCount"]
         
-        
+#        if not hasattr(self,'_v_results'):
+#                                  self._v_results={}
+#  
+#                                  
+#        self._v_results[urllib.quote(qs)]=ret[0:]
 
         return ret
 
@@ -1056,7 +1100,7 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             storename="foundCount"
         
-        return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
+        return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd'])+1,int(self.REQUEST.SESSION[storename]['count'])))
 
     def ZSQLNewQuery(self,linkText,storename=None,**argv):
         """suche neu"""
@@ -1256,7 +1300,7 @@ class ZSQLExtendFolder(Folder,Persistent
                     tmps=[]
                     for word in value.split(" "):
                         tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
-                        
+
                     tmp=string.join(tmps,' AND ')
 
                 elif op=="numerical":
@@ -1270,12 +1314,14 @@ class ZSQLExtendFolder(Folder,Persistent
                         tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
                         
                     tmp=string.join(tmps,' OR ')
-
+                                  
+                searchFieldsOnly[namealt]=value                
                 op="all"
 
 
                 searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
-
+               
+                
                 queryTemplate.append(searchTmp)
                 
             elif (not name[0]==iCT) and (not len(value)==0):
@@ -1333,7 +1379,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
         whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
         whereList+=queryTemplate
-        
+
         if len(whereList)>0:
             if filter:
                 whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
@@ -1400,6 +1446,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
+            print "SF",searchFieldsOnly,searchFields
             self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly