version 1.46, 2006/10/04 07:33:22
|
version 1.47, 2006/10/05 06:38:13
|
Line 1
|
Line 1
|
"""CDLI extensions of the filearchive""" |
"""CDLI extensions of the filearchive""" |
from Products.versionedFile.versionedFile import * |
from Products.versionedFile.versionedFile import * |
|
from Products.versionedFile.extVersionedFile import * |
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
from tempfile import mkstemp,mkdtemp |
from tempfile import mkstemp,mkdtemp |
import os.path |
import os.path |
Line 312 class uploadATFThread(Thread):
|
Line 313 class uploadATFThread(Thread):
|
#if not than add filename to the list of newfiles |
#if not than add filename to the list of newfiles |
|
|
data=file(os.path.join(dir,fn)).read() |
data=file(os.path.join(dir,fn)).read() |
status,msg=checkFile(fn,data,dir) |
#status,msg=checkFile(fn,data,dir) |
|
status=True |
|
msg="" |
if not status: # error |
if not status: # error |
errors.append((fn,msg)) |
errors.append((fn,msg)) |
else: |
else: |
Line 1957 class CDLIRoot(Folder):
|
Line 1959 class CDLIRoot(Folder):
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
|
|
return pt(changed=tmp['changed'],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): |