version 1.117, 2011/04/27 16:19:27
|
version 1.120, 2011/12/05 12:39:31
|
Line 195 class CDLIFile(extVersionedFile,CatalogA
|
Line 195 class CDLIFile(extVersionedFile,CatalogA
|
return pt() |
return pt() |
|
|
|
|
|
def historyXML(self): |
|
"""history""" |
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistoryXML')).__of__(self) |
|
return pt() |
|
|
def getBasketFromId(self,basketid, context=None): |
def getBasketFromId(self,basketid, context=None): |
"""get basket from id""" |
"""get basket from id""" |
|
|
Line 763 class CDLIRoot(Folder):
|
Line 769 class CDLIRoot(Folder):
|
RESPONSE.redirect(ob[0].absolute_url+"/history") |
RESPONSE.redirect(ob[0].absolute_url+"/history") |
return "not found" |
return "not found" |
|
|
|
def historyXML(self,id,RESPONSE): |
|
"""view an Object""" |
|
ob = self.CDLICatalog({'title':id}) |
|
if len(ob)>0: |
|
RESPONSE.redirect(ob[0].absolute_url+"/historyXML") |
|
return "not found" |
|
|
|
|
def downloadLocked(self,id,RESPONSE): |
def downloadLocked(self,id,RESPONSE): |
"""view an Object""" |
"""view an Object""" |
Line 808 class CDLIRoot(Folder):
|
Line 821 class CDLIRoot(Folder):
|
return fileId |
return fileId |
x=self.v_files.get(fileId) |
x=self.v_files.get(fileId) |
logging.debug("obj: "+repr(x)) |
logging.debug("obj: "+repr(x)) |
if x==None: |
if x is None: |
|
logging.debug("fileId"+repr(fileId)) |
folder=fileId[0:3] |
folder=fileId[0:3] |
f2=fileId[0:5] |
f2=fileId[0:5] |
fObj = getattr(self.cdliRoot.cdli_main,folder); |
fObj = getattr(self.cdliRoot.cdli_main,folder); |
Line 1244 class CDLIRoot(Folder):
|
Line 1258 class CDLIRoot(Folder):
|
|
|
return generateXMLReturn(stObj.returnValue) |
return generateXMLReturn(stObj.returnValue) |
|
|
|
def uploadATFAsync(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
|
"""upload an atf file / basket file""" |
|
#self._v_uploadATF.returnValue=None |
|
|
|
|
|
idTmp=str(randint(0,1000000000)) |
|
|
|
if upload is None: |
|
return "ERROR NO FILE!" |
|
|
|
tmpFile = File("/tmp/idTmp","w") |
|
# sicher basket in file |
|
for x in upload.read(): |
|
tmpFile.write(x) |
|
|
|
tmpFile.close(); |
|
uploadATFAsync(baskerId,idTmp,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT']) |
|
|
|
return idTMP |
|
|
|
def viewTicketAsync(self,ticketNr=1): |
|
"""viewticket""" |
|
|
|
tmp = pickle.load(file("/tmp/"+str(ticketNr)+".result")) |
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheckAsync.zpt')).__of__(self) |
|
|
|
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
|
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
|
|
|
|
|
|
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
"""upload an atf file / basket file""" |
"""upload an atf file / basket file""" |
#self._v_uploadATF.returnValue=None |
#self._v_uploadATF.returnValue=None |
Line 1315 class CDLIRoot(Folder):
|
Line 1361 class CDLIRoot(Folder):
|
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
|
|
|
|
def redoUpload(self,threadName): |
def redoUpload(self,threadName): |
"""redo the upload""" |
"""redo the upload""" |
tmp=self.cdli_main.tmpStore2[threadName] |
tmp=self.cdli_main.tmpStore2[threadName] |
Line 1407 class CDLIRoot(Folder):
|
Line 1454 class CDLIRoot(Folder):
|
obj=self.ZopeFind(root,obj_ids=[folder]) |
obj=self.ZopeFind(root,obj_ids=[folder]) |
logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj)) |
logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj)) |
if ext: |
if ext: |
|
|
|
if type(ext.result) is types.FileType: |
|
ext.result.write("<p>adding: %s </p>\n"%f) |
|
else: |
ext.result="<p>adding: %s </p>"%f+ext.result |
ext.result="<p>adding: %s </p>"%f+ext.result |
|
|
|
|