version 1.4, 2006/02/02 19:19:24
|
version 1.8, 2006/02/28 15:17:52
|
Line 251 class CDLIBasketContainer(OrderedFolder)
|
Line 251 class CDLIBasketContainer(OrderedFolder)
|
meta_type="CDLIBasketContainer" |
meta_type="CDLIBasketContainer" |
|
|
|
|
|
def getBasketIdfromName(self,basketname): |
|
"""get id from name""" |
|
|
|
for basket in self.ZopeFind(self,obj_metatypes=["CDLIBasket"]): |
|
if basket[1].title==basketname: |
|
return basket[0] |
|
else: |
|
None |
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) |
Line 353 class CDLIBasketContainer(OrderedFolder)
|
Line 361 class CDLIBasketContainer(OrderedFolder)
|
self.last=last |
self.last=last |
return last |
return last |
|
|
def setActiveBasket(self,basketId): |
def setActiveBasket(self,basketId,REQUEST=None): |
"""store active basketId in a cookie""" |
"""store active basketId in a cookie""" |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
|
if REQUEST: |
|
REQUEST.RESPONSE.redirect(REQUEST['URL1']) |
|
|
def getActiveBasket(self): |
def getActiveBasket(self): |
"""get active basket from cookie""" |
"""get active basket from cookie""" |
|
|
id= self.REQUEST.cookies.get('CDLIActiveBasket',None) |
id= self.REQUEST.cookies.get('CDLIActiveBasket',None) |
obj=getattr(self,id,None) |
if id: |
|
obj=getattr(self,str(id),None) |
|
else: |
|
obj=None |
return obj |
return obj |
|
|
def getActualUserName(self): |
def getActualUserName(self): |
"""get name of the actualuser""" |
"""get name of the actualuser""" |
return str(self.REQUEST['AUTHENTICATED_USER']) |
return str(self.REQUEST['AUTHENTICATED_USER']) |
Line 374 class CDLIBasketContainer(OrderedFolder)
|
Line 388 class CDLIBasketContainer(OrderedFolder)
|
ob=manage_addCDLIBasket(self,newBasketName) |
ob=manage_addCDLIBasket(self,newBasketName) |
return ob |
return ob |
|
|
def storeInBasket(self,ids,submit,newBasketName=None,RESPONSE=None,REQUEST=None): |
def storeInBasket(self,submit,ids=None,newBasketName=None,fromFileList=None,RESPONSE=None,REQUEST=None): |
"""store it""" |
"""store it""" |
|
if not ids: |
|
ids=self.REQUEST.SESSION['fileIds'] |
|
|
if type(ids) is not ListType: |
if type(ids) is not ListType: |
ids=[ids] |
ids=[ids] |
|
|
if submit=="store in new basket": |
if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"): |
basketRet=self.addBasket(newBasketName) |
basketRet=self.addBasket(newBasketName) |
self.setActiveBasket(basketRet.getId()) |
self.setActiveBasket(basketRet.getId()) |
basket=getattr(self,basketRet.getId()) |
basket=getattr(self,basketRet.getId()) |
elif submit=="store in active basket": |
elif (submit.lower()=="store in active basket") or (submit.lower()=="active basket"): |
basket=self.getActiveBasket() |
basket=self.getActiveBasket() |
|
|
basket.addObjects(ids) |
added=basket.addObjects(ids) |
back=self.REQUEST['HTTP_REFERER'] |
back=self.REQUEST['HTTP_REFERER'].split("?")[0]+"?basketName="+basket.title+"&numberOfObjects="+str(added) |
|
|
|
|
|
if fromFileList: |
|
|
|
return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added) |
|
|
if RESPONSE: |
if RESPONSE: |
|
|
RESPONSE.redirect(back) |
RESPONSE.redirect(back) |
|
|
|
return True |
|
|
def manage_addCDLIBasketContainerForm(self): |
def manage_addCDLIBasketContainerForm(self): |
"""add the CDLIBasketContainer form""" |
"""add the CDLIBasketContainer form""" |
Line 408 def manage_addCDLIBasketContainer(self,i
|
Line 431 def manage_addCDLIBasketContainer(self,i
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
class CDLIBasket(Folder): |
class CDLIBasket(Folder,CatalogAware): |
"""basket""" |
"""basket""" |
|
|
meta_type="CDLIBasket" |
meta_type="CDLIBasket" |
|
default_catalog="CDLIBasketCatalog" |
|
|
def getFile(self,obj): |
def getFile(self,obj): |
return obj[1] |
return obj[1] |
Line 419 class CDLIBasket(Folder):
|
Line 443 class CDLIBasket(Folder):
|
def getFileLastVersion(self,obj): |
def getFileLastVersion(self,obj): |
return obj[0] |
return obj[0] |
|
|
|
def getFileNamesInLastVersion(self): |
|
"""get content of the last version as list""" |
|
|
|
return [x[1].getId() for x in self.getLastVersion().getContent()] |
|
|
def isActual(self,obj): |
def isActual(self,obj): |
"""teste ob im basket die aktuelle version ist""" |
"""teste ob im basket die aktuelle version ist""" |
actualNo=obj[1].getLastVersion().getVersionNumber() |
actualNo=obj[1].getLastVersion().getVersionNumber() |
Line 483 class CDLIBasket(Folder):
|
Line 512 class CDLIBasket(Folder):
|
oldContent=[] |
oldContent=[] |
|
|
newContent=[] |
newContent=[] |
|
added=0 |
for id in ids: |
for id in ids: |
founds=self.CDLICatalog.search({'title':id}) |
founds=self.CDLICatalog.search({'title':id}) |
print id,founds |
|
for found in founds: |
for found in founds: |
if found.getObject() not in oldContent: |
if found.getObject() not in oldContent: |
#TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version |
#TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version |
newContent.append((found.getObject().getLastVersion(),found.getObject())) |
newContent.append((found.getObject().getLastVersion(),found.getObject())) |
|
added+=1 |
|
|
content=oldContent+newContent |
content=oldContent+newContent |
|
|
Line 499 class CDLIBasket(Folder):
|
Line 528 class CDLIBasket(Folder):
|
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) |
|
|
|
return added |
|
|
def deleteObjects(self,ids,RESPONSE=None): |
def deleteObjects(self,ids,RESPONSE=None): |
"""delete objects""" |
"""delete objects""" |
Line 707 class CDLIFile(versionedFile,CatalogAwar
|
Line 736 class CDLIFile(versionedFile,CatalogAwar
|
meta_type="CDLI file" |
meta_type="CDLI file" |
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
|
|
|
|
|
|
|
def isContainedInBaskets(self,context=None): |
|
"""check is this file is part of any basket |
|
@param context: (optional) necessessary if CDLIBasketCatalog is not an (inherited) attribute of self, context.CDLIBasketCatalog |
|
has to exist. |
|
""" |
|
|
|
if not context: |
|
context=self |
|
|
|
return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
|
|
|
|
|
def addCDLIFileObjectForm(self): |
|
"""add a new version""" |
|
|
|
if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: |
|
return "please login first" |
|
if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): |
|
out=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject',version=self.getVersion()).__of__(self) |
|
return out() |
|
else: |
|
return "Sorry file is locked by somebody else" |
|
|
def manage_addCDLIFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None): |
def manage_addCDLIFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None): |
"""add""" |
"""add""" |
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden |
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden |
Line 785 def splitatf(fh,dir=None):
|
Line 839 def splitatf(fh,dir=None):
|
#check if basket name is in the first line |
#check if basket name is in the first line |
if line.find("#atf basket")>=0: |
if line.find("#atf basket")>=0: |
ret=line.replace('#atf basket ','') |
ret=line.replace('#atf basket ','') |
|
ret=ret.split('_')[0] |
else: |
else: |
if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile |
if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile |
if nf: |
if nf: |
Line 800 def splitatf(fh,dir=None):
|
Line 855 def splitatf(fh,dir=None):
|
|
|
nf.close() |
nf.close() |
fh.close() |
fh.close() |
return ret.split('_')[0],len(os.listdir(dir)) |
return ret,len(os.listdir(dir)) |
|
|
class CDLIFileFolder(versionedFileFolder): |
class CDLIFileFolder(versionedFileFolder): |
"""CDLI File Folder""" |
"""CDLI File Folder""" |
Line 873 class CDLIFileFolder(versionedFileFolder
|
Line 928 class CDLIFileFolder(versionedFileFolder
|
return pt(changed=changed,errors=errors,dir=dir,newPs=newPs,basketLen=basketLen,numberOfFiles=numberOfFiles, |
return pt(changed=changed,errors=errors,dir=dir,newPs=newPs,basketLen=basketLen,numberOfFiles=numberOfFiles, |
basketNameFromId=basketNameFromId,basketNameFromFile=basketNameFromFile,basketId=basketId) |
basketNameFromId=basketNameFromId,basketNameFromFile=basketNameFromFile,basketId=basketId) |
|
|
def uploadATFfinally(self,procedure,comment="",basketId='0',unlock=None,RESPONSE=None): |
def uploadATFfinally(self,procedure,comment="",basketname='',unlock=None,RESPONSE=None): |
"""upload the files""" |
"""upload the files""" |
|
|
if procedure=="uploadchanged": |
if procedure=="uploadchanged": |
Line 917 class CDLIFileFolder(versionedFileFolder
|
Line 972 class CDLIFileFolder(versionedFileFolder
|
|
|
founds[0].getObject().lockedBy="" |
founds[0].getObject().lockedBy="" |
|
|
if not (basketId =='0'): |
if not (basketname ==''): |
|
basketId=self.basketFolder.getBasketIdfromName(basketname) |
|
|
basket=getattr(self.basketFolder,basketId) |
basket=getattr(self.basketFolder,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) |
Line 926 class CDLIFileFolder(versionedFileFolder
|
Line 983 class CDLIFileFolder(versionedFileFolder
|
RESPONSE.redirect(self.aq_parent.absolute_url()) |
RESPONSE.redirect(self.aq_parent.absolute_url()) |
|
|
|
|
def findObjectsFromList(self,upload,RESPONSE): |
def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
"""findObjectsFromList (, TAB oder LINE separated)""" |
"""findObjectsFromList (, TAB oder LINE separated)""" |
|
if upload: # list from file upload |
txt=upload.read() |
txt=upload.read() |
txt=txt.replace(",","\n") |
txt=txt.replace(",","\n") |
txt=txt.replace("\t","\n") |
txt=txt.replace("\t","\n") |
Line 936 class CDLIFileFolder(versionedFileFolder
|
Line 994 class CDLIFileFolder(versionedFileFolder
|
for id in idsTmp: # make sure that no empty lines |
for id in idsTmp: # make sure that no empty lines |
idTmp=id.lstrip().rstrip() |
idTmp=id.lstrip().rstrip() |
if len(idTmp)>0: |
if len(idTmp)>0: |
|
|
ids.append(idTmp) |
ids.append(idTmp) |
|
|
#self.REQUEST.SESSION['ids']=" OR ".join(ids) |
#self.REQUEST.SESSION['ids']=" OR ".join(ids) |
|
|
RESPONSE.redirect("filelist.html?path=%s"%" OR ".join(ids)) |
pt=getattr(self,'filelist.html') |
|
self.REQUEST.SESSION['searchList']=ids |
|
return pt(search=ids) |
|
|
|
if basketName: |
|
#TODO: get rid of one of these.. |
|
|
|
pt=getattr(self,'filelist.html') |
|
return pt(basketName=basketName,numberOfObjects=numberOfObjects) |
|
|
|
if list: # got already a list |
|
ret=[] |
|
for fileId in list: |
|
if len(fileId.split("."))==1: |
|
fileId=fileId+".atf" |
|
|
|
ret+=self.CDLICatalog({'title':fileId}) |
|
#TODO: get rid of one of these.. |
|
self.REQUEST.SESSION['fileIds']=[x.getObject().getId() for x in ret]#store fieldIds in session for further usage |
|
self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] |
|
return ret |
|
|
|
if start: |
|
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
|
|
def createAllFilesAsSingleFile(self,RESPONSE=None): |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
"""download all files""" |
"""download all files""" |