--- ZSQLExtend/ZSQLExtend.py	2005/01/23 15:16:12	1.55
+++ ZSQLExtend/ZSQLExtend.py	2005/02/08 16:12:54	1.58
@@ -4,6 +4,7 @@ from Globals import DTMLFile,package_hom
 import urllib
 import re
 import string
+import sys
 #from pyPgSQL import libpq
 from AccessControl import getSecurityManager
 
@@ -309,8 +310,33 @@ class ZSQLExtendFolder(Folder,Persistent
         #print "INLINE:",query
         return self.ZSQLSimpleSearch(query)
         
+    def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
+        """simple search"""
 
-    def ZSQLSimpleSearch(self,query=None):
+        if not query:
+            query=self.query
+        
+        if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):
+            self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.connection_id,"var","<dtml-var var>")
+            self._v_searchSQL.max_rows_=max_rows
+            try:
+                return self._v_searchSQL.__call__(var=query)
+            except :
+                if sys.exc_info()[0]=="Database Error":
+                    try:
+                        getattr(self,self.connection_id).manage_open_connection()
+                    except: pass
+        else:
+            try:
+                self._v_searchSQL.max_rows_=max_rows
+                return self._v_searchSQL.__call__(var=query)
+            except :
+                if sys.exc_info()[0]=="Database Error":
+                    try:
+                        getattr(self,self.connection_id).manage_open_connection()
+                    except: pass
+                    
+    def ZSQLSimpleSearch2(self,query=None):
         """ returrn SQLSearch"""
         #print "hi",query
         if not query:
@@ -1285,12 +1311,12 @@ class ZSQLBibliography(Folder,ZSQLExtend
 
             #found2=self.ZSQLInlineSearchU(_table="cdli_imglist",id_text=found.id_text)
             #create collectionobject info
-            subject="http://xserve02.mpiwg-berlin.mpg.de:8880/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text
-            object="http://xserve02:8880/cdlidata/images/getMetaDataRDF?id_text=%s"%found.id_text
+            subject="http://141.14.237.222:8080/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text
+            object="http://141.14.237.222:8080/cdlidata/images/getMetaDataRDF?id_text=%s"%found.id_text
             predicate="metadata"
             ret+="%s\t%s\t%s\n"%(subject,object,predicate)
             #create image
-            subject="http://xserve02.mpiwg-berlin.mpg.de:8880/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text
+            subject="http://141.14.237.222:8080/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text
             object="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn=/experimental/cdli/dl/photo/%s&mo=rawfile"%found.id_text
             predicate="image"