[BACK]Return to ZSQLExtend.py CVS log [TXT] [DIR] Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.56 and 1.58

version 1.56, 2005/01/25 19:30:11 version 1.58, 2005/02/08 16:12:54
Line 310  class ZSQLExtendFolder(Folder,Persistent Line 310  class ZSQLExtendFolder(Folder,Persistent
         #print "INLINE:",query          #print "INLINE:",query
         return self.ZSQLSimpleSearch(query)          return self.ZSQLSimpleSearch(query)
                   
     def ZSQLSimpleSearch(self,query=None):      def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
         """simple search"""          """simple search"""
   
         if not query:          if not query:
             query=self.query              query=self.query
                   
         if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):          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=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.connection_id,"var","<dtml-var var>")
               self._v_searchSQL.max_rows_=max_rows
             try:              try:
                 return self._v_searchSQL.__call__(var=query)                  return self._v_searchSQL.__call__(var=query)
             except :              except :
Line 327  class ZSQLExtendFolder(Folder,Persistent Line 328  class ZSQLExtendFolder(Folder,Persistent
                     except: pass                      except: pass
         else:          else:
             try:              try:
                   self._v_searchSQL.max_rows_=max_rows
                 return self._v_searchSQL.__call__(var=query)                  return self._v_searchSQL.__call__(var=query)
             except :              except :
                 if sys.exc_info()[0]=="Database Error":                  if sys.exc_info()[0]=="Database Error":
Line 1309  class ZSQLBibliography(Folder,ZSQLExtend Line 1311  class ZSQLBibliography(Folder,ZSQLExtend
   
             #found2=self.ZSQLInlineSearchU(_table="cdli_imglist",id_text=found.id_text)              #found2=self.ZSQLInlineSearchU(_table="cdli_imglist",id_text=found.id_text)
             #create collectionobject info              #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              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://xserve02:8880/cdlidata/images/getMetaDataRDF?id_text=%s"%found.id_text              object="http://141.14.237.222:8080/cdlidata/images/getMetaDataRDF?id_text=%s"%found.id_text
             predicate="metadata"              predicate="metadata"
             ret+="%s\t%s\t%s\n"%(subject,object,predicate)              ret+="%s\t%s\t%s\n"%(subject,object,predicate)
             #create image              #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              object="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn=/experimental/cdli/dl/photo/%s&mo=rawfile"%found.id_text
             predicate="image"              predicate="image"
                           
Removed from v.1.56  
changed lines
  Added in v.1.58

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>