--- ZSQLExtend/ZSQLExtend.py	2004/08/27 23:03:48	1.32
+++ ZSQLExtend/ZSQLExtend.py	2004/09/12 11:05:43	1.33
@@ -20,6 +20,24 @@ class ZSQLExtendFolder(Folder,Persistent
     """Folder"""
     meta_type="ZSQLExtendFolder"
 
+    def testneu(self):
+        """test"""
+        relStatement="""period like '%s%%'"""
+        statement="select * from cdli_cat"
+        wherePart="museum_no like 'VAT%'"
+        classes=['Uruk III','Uruk IV']
+        return self.searchRel(relStatement,statement,wherePart,classes)
+    
+    def searchRel(self,relStatement,statement,wherePart,classes):
+        """suche relative haufigkeiten"""
+        ret={}
+        allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
+        print statement + " where "+wherePart
+        for oneclass in classes:
+            ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass))
+            print statement + " where ("+wherePart+") and "+ relStatement%oneclass
+        return (ret,allRecords)
+                  
     def content_html(self):
         """template fuer content"""
         
@@ -360,7 +378,7 @@ class ZSQLExtendFolder(Folder,Persistent
     
         #return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv)
     
-    def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,**argv):
+    def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv):
         """Find"""
 
         def delEmpty(list):
@@ -373,7 +391,7 @@ class ZSQLExtendFolder(Folder,Persistent
         
         #self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen
         if qs=="":
-           print "HI"
+           
            if self.REQUEST['QUERY_STRING']:
                qs=self.REQUEST['QUERY_STRING']
 
@@ -387,7 +405,7 @@ class ZSQLExtendFolder(Folder,Persistent
            else:
                
                qs=self.REQUEST.SESSION.get('query','')
-               print "QS:",qs
+               
                for field in argv.keys():
                    #print field
                    qs+=",-%s=%s"%(field,argv[field])
@@ -409,11 +427,11 @@ class ZSQLExtendFolder(Folder,Persistent
             storename="foundCount"
 
 
-        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)
+        #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"]
         
-        print "called query"
+
         return ret
 
     def ZSQLFoundCountLen(self,var):
@@ -469,7 +487,7 @@ class ZSQLExtendFolder(Folder,Persistent
         
         return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
     
-    def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None):
+    def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
         """analysieren den QueryString"""
         #print "NO",nostore
         lop="AND" # standardsuche mit and
@@ -585,7 +603,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 elif op=="ew":
                     tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value))
                 op="ct"
-                print "TTT",tableExt
+
                 if (not tableExt) or (namealt.split('.')[0]==tableExt):
                     if searchFields.has_key(name):
                         searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
@@ -623,13 +641,19 @@ class ZSQLExtendFolder(Folder,Persistent
         whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
 
         if len(whereList)>0:
-            
-            where="WHERE "+string.join(whereList," "+lop+" ")
+            if filter:
+                whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
+            else:
+                whereStr=string.join(whereList," "+lop+" ")
+            where="WHERE "+whereStr
         else:
-            where=""
+            if filter:
+                where="WHERE "+filter
+            else:
+                where=""
 
         if restrictConnect:
-            print "resticted"
+            
             if len(where)==0:
                 where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")"
             else:
@@ -646,12 +670,12 @@ class ZSQLExtendFolder(Folder,Persistent
 
         if storename and (not NoQuery):
             query2="SELECT count(*) FROM %s %s"%(table,where)
-            print "storing",query2
+
             #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2']
             if not self.REQUEST.SESSION.has_key(storename):
                 self.REQUEST.SESSION[storename]={}
             if self.REQUEST.SESSION[storename].has_key('queryString2'):
-                print "HI",storename
+
                 if not self.REQUEST.SESSION[storename]['queryString2']==query2:
                     #print "HOOOOO",storename
                     self.REQUEST.SESSION[storename]['queryString2']=query2
@@ -660,7 +684,7 @@ class ZSQLExtendFolder(Folder,Persistent
                     #print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']
                 
             else:
-                print "go"
+
                 self.REQUEST.SESSION[storename]['queryString2']=query2
                 self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
                 #print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']
@@ -676,10 +700,10 @@ class ZSQLExtendFolder(Folder,Persistent
             self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
             
         if not NoQuery:
-            print "noquery",query
+
             return self.ZSQLQuery(query)
         else:
-            print "query"
+
             return query
             
     def ZSQLQuery(self,query):