cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

-version 1.74, 2007/03/23 16:03:53
+version 1.75, 2007/03/23 17:15:36
  Line 883  class CDLIBasket(Folder,CatalogAware):
      meta_type="CDLIBasket"
      default_catalog="CDLIBasketCatalog"
-     def searchInBasket(self,searchStr):
+     def searchInBasket(self,indexName,searchStr,regExp=False):
+         """searchInBasket"""
+         lst=self.searchInLineIndexDocs(indexName,searchStr,uniq=True,regExp=False)
+         ret={}
+         lv=self.getLastVersion()
+         logging.info("searching")
+         for obj in lv.content.getContent():
+             id=obj[1].getId().split(".")[0]
+             if id in lst:
+                 ret[id]=self.showWordInFile(id,searchStr,lineList=self.getLinesFromIndex(indexName,searchStr,id,regExp=regExp),regExp=regExp,indexName=indexName)
+         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','searchResultsInBasket')).__of__(self)
+         return pt(result=ret,indexName=indexName,regExp=regExp,word=searchStr)
+     def searchInBasket_v1(self,searchStr):
          """search occurences of searchStr in files im basket"""
          ret=[]
          lv=self.getLastVersion()