version 1.33, 2006/07/04 11:54:08
|
version 1.36, 2006/07/14 14:51:50
|
Line 1384 class CDLIFileFolder(versionedFileFolder
|
Line 1384 class CDLIFileFolder(versionedFileFolder
|
|
|
|
|
|
|
def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
def findObjectsFromList(self,enterList=None,display=False,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 |
if upload: # list from file upload |
txt=upload.read() |
txt=upload.read() |
|
|
|
if enterList: |
|
txt=enterList |
|
|
|
if upload or enterList: |
txt=txt.replace(",","\n") |
txt=txt.replace(",","\n") |
txt=txt.replace("\t","\n") |
txt=txt.replace("\t","\n") |
txt=txt.replace("\r","\n") |
txt=txt.replace("\r","\n") |
Line 1416 class CDLIFileFolder(versionedFileFolder
|
Line 1421 class CDLIFileFolder(versionedFileFolder
|
if list is not None: # got already a list |
if list is not None: # got already a list |
ret=[] |
ret=[] |
for fileId in list: |
for fileId in list: |
if len(fileId.split("."))==1: |
if fileId.find("*"): #check for wildcards |
|
fileId=fileId |
|
elif len(fileId.split("."))==1: |
fileId=fileId+".atf" |
fileId=fileId+".atf" |
|
|
ret+=self.CDLICatalog({'title':fileId}) |
ret+=self.CDLICatalog({'title':fileId}) |
Line 1631 class CDLIRoot(Folder):
|
Line 1638 class CDLIRoot(Folder):
|
|
|
thread=uploadATFThread() |
thread=uploadATFThread() |
threadName=thread.getName()[0:] |
threadName=thread.getName()[0:] |
if not hasattr(self,'_v_uploadATF'): |
if (not hasattr(self,'_v_uploadATF')): |
self._v_uploadATF={} |
self._v_uploadATF={} |
|
|
self._v_uploadATF[threadName]=thread |
self._v_uploadATF[threadName]=thread |
Line 1654 class CDLIRoot(Folder):
|
Line 1661 class CDLIRoot(Folder):
|
|
|
else: |
else: |
#recover thread, if lost |
#recover thread, if lost |
if not hasattr(self,'_v_uploadATF'): |
if (not hasattr(self,'_v_uploadATF')): |
self._v_uploadATF={} |
self._v_uploadATF={} |
if not self._v_uploadATF.get(threadName,None): |
if not self._v_uploadATF.get(threadName,None): |
for thread in threading.enumerate(): |
for thread in threading.enumerate(): |
Line 1716 class CDLIRoot(Folder):
|
Line 1723 class CDLIRoot(Folder):
|
if not threadName or threadName=="": |
if not threadName or threadName=="": |
thread=uploadATFfinallyThread() |
thread=uploadATFfinallyThread() |
threadName=thread.getName()[0:] |
threadName=thread.getName()[0:] |
|
|
|
if (not hasattr(self,'_v_uploadATF')): |
|
self._v_uploadATF={} |
|
|
self._v_uploadATF[threadName]=thread |
self._v_uploadATF[threadName]=thread |
|
|
|
|