--- ZSQLExtend/ZSQLExtend.py	2004/10/21 15:36:53	1.42
+++ ZSQLExtend/ZSQLExtend.py	2004/10/25 13:13:48	1.45
@@ -17,7 +17,10 @@ def analyseIntSearch(word):
     #analyse integer searches
 
     splitted=word.split("-")
-    print splitted
+
+    if len(splitted)==1:
+        return "="+splitted[0]
+    
     if splitted[0]=="":
         return "< "+splitted[1]
 
@@ -55,10 +58,10 @@ class ZSQLExtendFolder(Folder,Persistent
         """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):
@@ -283,14 +286,14 @@ class ZSQLExtendFolder(Folder,Persistent
         qs=[]
         
     
-
+        
         #print "INLINE:",query
         return self.ZSQLSimpleSearch(query)
         
 
     def ZSQLSimpleSearch(self,query=None):
         """ returrn SQLSearch"""
-        #print query
+        #print "hi",query
         if not query:
             query=self.query
         if getattr(self,'_v_search',None):
@@ -679,6 +682,8 @@ class ZSQLExtendFolder(Folder,Persistent
                 elif op=="numerical":
                     term=analyseIntSearch(value)
                     tmp=(name+" "+term)
+                elif op=="grep":
+                    tmp=(name+" ~* "+sql_quote(value))
                 elif op=="one":
                     tmps=[]
                     for word in value.split(" "):
@@ -811,7 +816,7 @@ class ZSQLExtendFolder(Folder,Persistent
                                                 
     def nextLink(self,html,storename="foundCount"):
         """nextLink"""
-        print self.REQUEST.SESSION[storename]['rangeSize']
+
         try:
             limit=self.REQUEST.SESSION[storename]['rangeSize']
             if int(limit)==0 :
@@ -858,8 +863,8 @@ class ZSQLExtendFolder(Folder,Persistent
             newquery.append(query)
                 
         newquerystring=string.join(newquery,"&")
-	
-        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
+	return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)
+
             
         
     def prevLink(self,html,storename="foundCount"):
@@ -916,7 +921,7 @@ class ZSQLExtendFolder(Folder,Persistent
             
         newquerystring=string.join(newquery,"&")
 
-        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
+        return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)