version 1.8, 2006/02/28 15:17:52
|
version 1.9, 2006/03/15 14:56:48
|
Line 20 class Basket_old(Folder):
|
Line 20 class Basket_old(Folder):
|
|
|
def getObjUrl(self,objId): |
def getObjUrl(self,objId): |
"""getUrl""" |
"""getUrl""" |
founds=self.CDLICatalog.search({'path':objId}) |
founds=self.CDLICatalog.search({'title':objId}) |
if len(founds)>0: |
if len(founds)>0: |
return founds[0].getObject().absolute_url() |
return founds[0].getObject().absolute_url() |
|
|
else: #assume version number |
else: #assume version number |
splitted=objId.split("_") |
splitted=objId.split("_") |
founds=self.CDLICatalog.search({'path':splitted[1]}) |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
return founds[0].getObject().absolute_url()+'/'+objId |
return founds[0].getObject().absolute_url()+'/'+objId |
|
|
def storeAllLink(self,results): |
def storeAllLink(self,results): |
Line 142 class BasketObject_old(Folder):
|
Line 142 class BasketObject_old(Folder):
|
"""addObjects""" |
"""addObjects""" |
|
|
for id in ids: |
for id in ids: |
founds=self.CDLICatalog.search({'path':id}) |
founds=self.CDLICatalog.search({'title':id}) |
for found in founds: |
for found in founds: |
if found.getObject() not in self.contents: |
if found.getObject() not in self.contents: |
tm=self.contents[0:] |
tm=self.contents[0:] |
Line 247 class CDLIBasketContainer(OrderedFolder)
|
Line 247 class CDLIBasketContainer(OrderedFolder)
|
"""contains the baskets""" |
"""contains the baskets""" |
|
|
|
|
|
security=ClassSecurityInfo() |
meta_type="CDLIBasketContainer" |
meta_type="CDLIBasketContainer" |
|
|
|
|
Line 259 class CDLIBasketContainer(OrderedFolder)
|
Line 259 class CDLIBasketContainer(OrderedFolder)
|
return basket[0] |
return basket[0] |
else: |
else: |
None |
None |
|
|
|
security.declareProtected('manage','uploadBasket_html') |
|
|
def uploadBasket_html(self,basketId='0'): |
def uploadBasket_html(self,basketId='0'): |
"""upload an atf file, html form""" |
"""upload an atf file, html form""" |
|
|
|
|
basketId=str(basketId) |
basketId=str(basketId) |
if not basketId=='0': |
if not basketId=='0': |
basketName=getattr(self.basketContainer,basketId).title |
basketName=getattr(self.basketContainer,basketId).title |
Line 274 class CDLIBasketContainer(OrderedFolder)
|
Line 279 class CDLIBasketContainer(OrderedFolder)
|
|
|
def index_html(self): |
def index_html(self): |
"""stanadard ansicht""" |
"""stanadard ansicht""" |
|
|
|
|
|
|
ext=self.ZopeFind(self,obj_ids=["index.html"]) |
ext=self.ZopeFind(self,obj_ids=["index.html"]) |
if ext: |
if ext: |
return ext[0][1]() |
return ext[0][1]() |
Line 662 class CDLIBasketVersion(SimpleItem):
|
Line 670 class CDLIBasketVersion(SimpleItem):
|
|
|
else: #assume version number |
else: #assume version number |
splitted=objId.split("_") |
splitted=objId.split("_") |
founds=self.CDLICatalog.search({'path':splitted[1]}) |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
return founds[0].getObject().absolute_url()+'/'+objId |
return founds[0].getObject().absolute_url()+'/'+objId |
|
|
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
Line 768 class CDLIFile(versionedFile,CatalogAwar
|
Line 776 class CDLIFile(versionedFile,CatalogAwar
|
except: |
except: |
pass |
pass |
|
|
author=self.REQUEST['author'] |
author=self.REQUEST.SESSION['author'] |
|
|
if changeName=="yes": |
if changeName=="yes": |
filename=file.filename |
filename=file.filename |
Line 871 class CDLIFileFolder(versionedFileFolder
|
Line 879 class CDLIFileFolder(versionedFileFolder
|
ret=[] |
ret=[] |
searchStr=" OR ".join(ids) |
searchStr=" OR ".join(ids) |
|
|
founds=self.CDLICatalog.search({'path':searchStr}) |
founds=self.CDLICatalog.search({'title':searchStr}) |
|
|
for found in founds: |
for found in founds: |
lastVersion=found.getObject().getLastVersion() |
lastVersion=found.getObject().getLastVersion() |
Line 893 class CDLIFileFolder(versionedFileFolder
|
Line 901 class CDLIFileFolder(versionedFileFolder
|
errors=[] |
errors=[] |
newPs=[] |
newPs=[] |
basketNameFromFile, numberOfFiles=splitatf(upload,dir) |
basketNameFromFile, numberOfFiles=splitatf(upload,dir) |
|
|
|
if basketId == '0': |
|
basketObj=self.basketContainer.getActiveBasket() |
|
if basketObj: |
|
basketId=basketObj.getId() |
|
|
if basketId == '0': |
if basketId == '0': |
basketNameFromId="" |
basketNameFromId="" |
basketLen=0 |
basketLen=0 |
Line 943 class CDLIFileFolder(versionedFileFolder
|
Line 957 class CDLIFileFolder(versionedFileFolder
|
uploadFns=[] |
uploadFns=[] |
|
|
for fn in uploadFns: |
for fn in uploadFns: |
founds=self.CDLICatalog.search({'path':fn}) |
print "UP:",fn |
|
founds=self.CDLICatalog.search({'title':fn}) |
|
print " -----",founds |
if len(founds)>0: |
if len(founds)>0: |
self.REQUEST['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) |
print "-------- author:",self.REQUEST.SESSION['author'] |
|
founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) |
|
|
|
|
|
|
Line 966 class CDLIFileFolder(versionedFileFolder
|
Line 983 class CDLIFileFolder(versionedFileFolder
|
unlockFns.append(x) |
unlockFns.append(x) |
|
|
for fn in unlockFns: |
for fn in unlockFns: |
founds=self.CDLICatalog.search({'path':fn}) |
founds=self.CDLICatalog.search({'title':fn}) |
if len(founds)>0: |
if len(founds)>0: |
self.REQUEST['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
|
|
founds[0].getObject().lockedBy="" |
founds[0].getObject().lockedBy="" |
|
|
if not (basketname ==''): |
if not (basketname ==''): |
basketId=self.basketFolder.getBasketIdfromName(basketname) |
basketId=self.basketFolder.getBasketIdfromName(basketname) |
|
|
basket=getattr(self.basketFolder,basketId) |
if not basketId: # create new basket |
|
ob=self.basketContainer.addBasket(basketname) |
|
basketId=ob.getId() |
|
basket=getattr(self.basketFolder,str(basketId)) |
ids=os.listdir(self.REQUEST.SESSION['tmpdir']) |
ids=os.listdir(self.REQUEST.SESSION['tmpdir']) |
basket.addObjects(ids,deleteOld=True) |
basket.addObjects(ids,deleteOld=True) |
|
|