--- ZSQLExtend/ZSQLExtend.py	2004/11/28 21:56:31	1.51
+++ ZSQLExtend/ZSQLExtend.py	2004/12/04 21:33:12	1.52
@@ -399,19 +399,15 @@ class ZSQLExtendFolder(Folder,Persistent
 
    
 
-    def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],**argv):
+    def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv):
         """find2"""
-        #search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_translit',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv)
 
-        
-        #search2 = self.ZSQLFind(tableExt='cdli_cat',qs="",select="oid,*",storename=None,restrictConnect=('cdli_cat.id_text',search1),**argv)
-
-        search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_cat',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv)
-
-        search2 = self.ZSQLFind(tableExt='cdli_translit',qs="",select="oid,*",storename=None,restrictConnect=('cdli_translit.id_text',search1),**argv)
+        search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv)
+     
+        search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv)
         return search2
     
-        #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,filter=None,**argv):
         """Find"""
@@ -444,7 +440,7 @@ class ZSQLExtendFolder(Folder,Persistent
                    qs+=",%s=%s"%(fieldTmp,argv[field])
                    
            else:
-               
+
                qs=self.REQUEST.SESSION.get('query','')
                
                for field in argv.keys():
@@ -455,6 +451,8 @@ class ZSQLExtendFolder(Folder,Persistent
                    
                    qs+=",%s=%s"%(fieldTmp,argv[field])
 
+         
+
         else:
             self.REQUEST['QUERY_STRING']=qs
 
@@ -479,7 +477,7 @@ class ZSQLExtendFolder(Folder,Persistent
         #print self.REQUEST.SESSION["foundCount"]
         
         
-        
+
         return ret
 
     def ZSQLFoundCountLen(self,var):
@@ -588,8 +586,8 @@ class ZSQLExtendFolder(Folder,Persistent
     
     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"""
-
-                
+        
+        
         lop="AND" # standardsuche mit and
         max="ALL" #standard alle auswaehlen
         maxstr=""
@@ -654,8 +652,9 @@ class ZSQLExtendFolder(Folder,Persistent
                     #print "HI",op,field
 	#print opfieldsa
         #now analyse the querystring
+       
         for q in qs.split(","):
-            
+       
             
             #try:
 
@@ -664,10 +663,10 @@ class ZSQLExtendFolder(Folder,Persistent
                 value=urllib.unquote(q.split("=",1)[1])
             except:
                 value=""
-                
-            #value=sql_quote(value)
             
+            #value=sql_quote(value)
             
+
             if name==iCT+"lop":
                 lop=value
             elif name==iCT+"table":
@@ -710,7 +709,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
 
             elif (not name[0]==iCT) and (not len(value)==0):
-                
+
 		#print "OP",op,name
                 value=value.lower()
                 tmp=""
@@ -754,15 +753,16 @@ class ZSQLExtendFolder(Folder,Persistent
                 op="all"
 
                 if (not tableExt) or (namealt.split('.')[0]==tableExt):
-                    if searchFields.has_key(name):
-                        searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
-                        searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value
+                    if searchFields.has_key(namealt):
+                        searchFields[namealt]+=lopfields.get(name,'OR')+" "+tmp
+                        searchFieldsOnly[namealt]+=lopfields.get(name,'OR')+" "+value
                     else: 
-                        searchFields[name]=tmp
-                        searchFieldsOnly[name]=value
+                        searchFields[namealt]=tmp
+                        searchFieldsOnly[namealt]=value
 
-        whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
 
+        whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
+        
         if len(whereList)>0:
             if filter:
                 whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
@@ -776,7 +776,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 where=""
 
         if restrictConnect:
-            
+
             if len(where)==0:
                 where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")"
             else:
@@ -831,24 +831,39 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
 
             return query
-            
+
+    def ZSQLUniqueQuery(self,value,returns):
+        """unique relation"""
+        if returns:
+            statement="""select %s from %s where %s = '%s' """%(returns[1],returns[0],returns[2],value)
+            founds=self.ZSQLSimpleSearch(statement)
+            if founds:
+                return getattr(founds[0],returns[1])
+            else:
+                return value
+        else:
+            return value
+        
     def ZSQLQuery(self,query):
         """query"""
-        #print "hi",query
+
         return self.ZSQLSimpleSearch(query)
+
     
     def ZSQLSearch(self):
         """To be done"""
         rq=self.REQUEST['QUERY_STRING']
+
         querys=rq.split("&")
         
+        
         formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url
         
         for querytemp in querys:
             query=querytemp.split("=")
             
             
-            print "fmtfile",formatfile
+
             
             try:
                 if query[0].lower()=="-format":
@@ -859,6 +874,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 
         #print formatfile
         
+        
         self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")
         self.REQUEST.SESSION['come_from_search']="yes"