version 1.73, 2007/03/23 13:58:10
|
version 1.74, 2007/03/23 16:03:53
|
Line 883 class CDLIBasket(Folder,CatalogAware):
|
Line 883 class CDLIBasket(Folder,CatalogAware):
|
meta_type="CDLIBasket" |
meta_type="CDLIBasket" |
default_catalog="CDLIBasketCatalog" |
default_catalog="CDLIBasketCatalog" |
|
|
|
def searchInBasket(self,searchStr): |
|
"""search occurences of searchStr in files im basket""" |
|
ret=[] |
|
lv=self.getLastVersion() |
|
logging.info("searching") |
|
for obj in lv.content.getContent(): |
|
txt=obj[0].getData() |
|
for x in txt.split("\n"): |
|
logging.info("search %s"%x) |
|
if re.match(searchStr,x): |
|
ret.append(x) |
|
|
|
return "\n".join(ret) |
|
|
|
|
def getFile(self,obj): |
def getFile(self,obj): |
return obj[1] |
return obj[1] |
Line 1322 class CDLIBasketVersion(Implicit,Persist
|
Line 1336 class CDLIBasketVersion(Implicit,Persist
|
def __init__(self,id,user,comment="",basketContent=[]): |
def __init__(self,id,user,comment="",basketContent=[]): |
""" init a basket version""" |
""" init a basket version""" |
self.id=id |
self.id=id |
self.coment=comment |
self.comment=comment |
self._setObject('content',BasketContent(basketContent)) |
self._setObject('content',BasketContent(basketContent)) |
#self.basketContent=basketContent[0:]a |
#self.basketContent=basketContent[0:]a |
self.user=user |
self.user=user |
Line 2155 class CDLIRoot(Folder):
|
Line 2169 class CDLIRoot(Folder):
|
transaction.get().commit() |
transaction.get().commit() |
|
|
|
|
def showFile(self,fileId): |
def showFile(self,fileId,wholePage=False): |
"""show a file |
"""show a file |
@param fileId: P-Number of the document to be displayed |
@param fileId: P-Number of the document to be displayed |
""" |
""" |
Line 2163 class CDLIRoot(Folder):
|
Line 2177 class CDLIRoot(Folder):
|
if not f: |
if not f: |
return "" |
return "" |
|
|
|
if wholePage: |
|
logging.info("whole") |
|
return f[0].getObject().getLastVersion().view() |
|
else: |
return f[0].getObject().getLastVersionFormattedData() |
return f[0].getObject().getLastVersionFormattedData() |
|
|
|
|