version 1.66, 2007/02/08 12:00:23
|
version 1.69, 2007/03/20 10:49:15
|
Line 425 class uploadATFThread(Thread):
|
Line 425 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 |
#status=True |
msg="" |
|
|
|
if not status: # error |
if not status: # error |
errors.append((fn,msg)) |
errors.append((fn,msg)) |
|
|
else: |
else: |
if len(founds)==0: |
if len(founds)==0: |
newPs.append(fn) |
newPs.append(fn) |
Line 1420 def manage_addCDLIFile(self,id,title,loc
|
Line 1422 def manage_addCDLIFile(self,id,title,loc
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
|
def checkUTF8(data): |
|
"""check utf 8""" |
|
try: |
|
data.encode('utf-8') |
|
return True |
|
except: |
|
return False |
|
|
|
|
def checkFile(filename,data,folder): |
def checkFile(filename,data,folder): |
Line 1431 def checkFile(filename,data,folder):
|
Line 1440 def checkFile(filename,data,folder):
|
return False,"P missing in the filename" |
return False,"P missing in the filename" |
elif len(fn[0])!=7: |
elif len(fn[0])!=7: |
return False,"P number has not the right length 6" |
return False,"P number has not the right length 6" |
else: |
elif not checkUTF8(data): |
fn=os.path.join(folder,filename) |
return False,"not utf-8" |
stin,out=os.popen4("/usr/bin/atfcheck.plx %s"%fn) |
|
value=out.read() |
|
ret= out.close() |
|
|
|
if value: |
|
|
|
return False,"atf checker error: %s"%value |
|
else: |
else: |
return True,"" |
return True,"" |
|
|
|
# else: |
|
# fn=os.path.join(folder,filename) |
|
# stin,out=os.popen4("/usr/bin/atfcheck.plx %s"%fn) |
|
# value=out.read() |
|
# ret= out.close() |
|
# |
|
# if value: |
|
# |
|
# return False,"atf checker error: %s"%value |
|
# else: |
|
# return True,"" |
|
|
def splitatf(fh,dir=None,ext=None): |
def splitatf(fh,dir=None,ext=None): |
"""split it""" |
"""split it""" |
ret=None |
ret=None |
Line 1537 class CDLIFileFolder(extVersionedFileFol
|
Line 1551 class CDLIFileFolder(extVersionedFileFol
|
|
|
return ret |
return ret |
|
|
|
def getFile(self,fn): |
|
"""get the content of the file fn""" |
|
founds=self.CDLICatalog.search({'title':fn}) |
|
if not founds: |
|
return [] |
|
else: |
|
obj=founds[0].getObject().getLastVersion() |
|
|
|
return obj.getData()[0:] |
|
|
def checkCatalog(self,fn): |
def checkCatalog(self,fn): |
"""check if fn is in the catalog""" |
"""check if fn is in the catalog""" |
#TODO add checkCatalog |
#TODO add checkCatalog |
Line 1559 class CDLIFileFolder(extVersionedFileFol
|
Line 1583 class CDLIFileFolder(extVersionedFileFol
|
return pt(search=list,author=author) |
return pt(search=list,author=author) |
|
|
|
|
|
def getAllPNumbers(self): |
|
"""get a list of all files (resp their p-numbers) stored""" |
|
|
|
ret=[x.getId for x in self.CDLICatalog()] |
|
|
|
return ret |
|
|
def findObjectsFromList(self,enterList=None,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)""" |
Line 2008 class CDLIRoot(Folder):
|
Line 2038 class CDLIRoot(Folder):
|
|
|
|
|
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): |
"""standard ausgabe""" |
"""upload an atf file / basket file""" |
#self._v_uploadATF.returnValue=None |
#self._v_uploadATF.returnValue=None |
from random import randint |
from random import randint |
if (not self.REQUEST.SESSION.get('idTmp',None)): |
if (not self.REQUEST.SESSION.get('idTmp',None)): |