--- ZSQLExtend/ZSQLExtend.py	2004/01/22 09:18:49	1.6
+++ ZSQLExtend/ZSQLExtend.py	2004/01/27 13:32:22	1.8
@@ -25,7 +25,7 @@ class ZSQLExtendFolder(Persistent, Impli
         
     def ZSQLisEmpty(self,field):
         """Teste ob Treffer leer"""
-        print "field",field
+        #print "field",field
         if not field:
             return 1
         if field=="":
@@ -38,7 +38,7 @@ class ZSQLExtendFolder(Persistent, Impli
         ret="""<select name="-op_%s">
 	<option value="bw">begins with</option>          	<!-- begins with / beginnt mit, "Wort*" -->
 	<option value="ew">ends with</option>
-   	<option value="ct">contains</option>          		<!-- contains / enthaellt, "Wort" -->
+   	<option value="ct" selected>contains</option>          		<!-- contains / enthaellt, "Wort" -->
     <option value="eq">equals</option>          		<!-- equals / ist, =Wort -->
 </select>"""%fieldname
         return ret
@@ -56,7 +56,8 @@ class ZSQLExtendFolder(Persistent, Impli
         #print "INLINE:",argv
         for a in argv.keys():
             qs.append(a+"="+urllib.quote(str(argv[a])))
-        #return []  
+        #return []
+        
         return self.parseQueryString(string.join(qs,","),"_",storename=storename)
 
     def ZSQLInlineSearch2(self,query):
@@ -250,6 +251,8 @@ class ZSQLExtendFolder(Persistent, Impli
         opfields={}
         skip=""
         rangeStart=0
+        limit="all"
+        max = "LIMIT all"
         
         if not select:
             select="*"
@@ -337,14 +340,15 @@ class ZSQLExtendFolder(Persistent, Impli
             where=""
         #print "QE",table
         
-        query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,max,skip)
+        query="SELECT oid,%s FROM %s %s %s %s %s"%(select,table,where,sort,max,skip)
         if not nostore=="yes":
             
             self.REQUEST.SESSION['qs']=opfields
-        print "IAMHERE again:", query
+        #print "IAMHERE again:", query
 
         if storename:
-            query2="SELECT count(%s) FROM %s %s"%(select,table,where)
+            
+            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):
@@ -370,7 +374,7 @@ class ZSQLExtendFolder(Persistent, Impli
                 self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
             self.REQUEST.SESSION[storename]['rangeSize']=limit
             
-	print query            
+	#print "HELLO",query            
         return self.search(var=query)
     
     def ZSQLSearch(self):