version 1.44, 2006/08/24 09:28:29
|
version 1.45, 2006/10/04 07:18:23
|
Line 126 class uploadATFfinallyThread(Thread):
|
Line 126 class uploadATFfinallyThread(Thread):
|
elif procedure=="uploadAll": |
elif procedure=="uploadAll": |
uploadFns=[] |
uploadFns=[] |
for x in os.listdir(SESSION['tmpdir']): |
for x in os.listdir(SESSION['tmpdir']): |
if not x in SESSION['errors']: |
if not x in SESSION['lockerrors']: |
uploadFns.append(x) |
uploadFns.append(x) |
|
|
#or maybe nothing |
#or maybe nothing |
Line 268 class uploadATFThread(Thread):
|
Line 268 class uploadATFThread(Thread):
|
|
|
changed=[] # changed files |
changed=[] # changed files |
errors=[] # files with errors |
errors=[] # files with errors |
|
lockerrors=[] # files with errors |
|
|
newPs=[] # new p filed |
newPs=[] # new p filed |
psNotInCatalog=[] # files not in the catalog |
psNotInCatalog=[] # files not in the catalog |
|
|
Line 282 class uploadATFThread(Thread):
|
Line 284 class uploadATFThread(Thread):
|
if basketObj: |
if basketObj: |
basketId=basketObj.getId() |
basketId=basketObj.getId() |
|
|
#if there is no active baske and no basketid given, id is empty, else get besketname and length |
#if there is no active basket and no basketid given, id is empty, else get besketname and length |
if basketId == '0': |
if basketId == '0': |
basketNameFromId="" |
basketNameFromId="" |
basketLen=0 |
basketLen=0 |
Line 308 class uploadATFThread(Thread):
|
Line 310 class uploadATFThread(Thread):
|
founds=ctx2.CDLICatalog.search({'title':fn}) |
founds=ctx2.CDLICatalog.search({'title':fn}) |
|
|
#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() |
|
status,msg=checkFile(fn,data,dir) |
|
|
|
if not status: # error |
|
errors.append((fn,msg)) |
|
else: |
if len(founds)==0: |
if len(founds)==0: |
newPs.append(fn) |
newPs.append(fn) |
|
|
Line 317 class uploadATFThread(Thread):
|
Line 326 class uploadATFThread(Thread):
|
obj=found.getObject() |
obj=found.getObject() |
|
|
if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): |
if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): |
errors.append(obj) |
lockerrors.append(fn) |
else: |
else: |
data=file(os.path.join(dir,fn)).read() |
|
diffs=obj.diff(data) |
diffs=obj.diff(data) |
if diffs[0]>0: |
if diffs[0]>0: |
changed.append((obj,diffs)) |
changed.append((obj,diffs)) #hochladen |
#hochladen |
|
|
|
#ready, set the returnValues |
#ready, set the returnValues |
self.result+="<h3>Done</h3></body></html>" |
self.result+="<h3>Done</h3></body></html>" |
Line 331 class uploadATFThread(Thread):
|
Line 339 class uploadATFThread(Thread):
|
self.returnValue={} |
self.returnValue={} |
self.returnValue['changed']=changed |
self.returnValue['changed']=changed |
self.returnValue['errors']=errors |
self.returnValue['errors']=errors |
|
self.returnValue['lockerrors']=lockerrors |
self.returnValue['newPs']=newPs |
self.returnValue['newPs']=newPs |
self.returnValue['tmpdir']=dir |
self.returnValue['tmpdir']=dir |
self.returnValue['basketLen']=basketLen |
self.returnValue['basketLen']=basketLen |
Line 514 class BasketObject_old(Folder):
|
Line 523 class BasketObject_old(Folder):
|
|
|
ret="" |
ret="" |
lockedObjects={} |
lockedObjects={} |
|
print "x",self.temp_folder.downloadCounter |
|
if self.temp_folder.downloadCounter > 10: |
|
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
|
|
if lock: |
if lock: |
Line 541 class BasketObject_old(Folder):
|
Line 553 class BasketObject_old(Folder):
|
elif not procedure: #keine fails gesperrt dann alle donwloaden |
elif not procedure: #keine fails gesperrt dann alle donwloaden |
procedure="downloadAll" |
procedure="downloadAll" |
|
|
|
self.temp_folder.downloadCounter+=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
|
|
for object in self.contents: |
for object in self.contents: |
|
|
Line 556 class BasketObject_old(Folder):
|
Line 572 class BasketObject_old(Folder):
|
length=len(ret) |
length=len(ret) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
|
self.temp_folder.downloadCounter-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
|
|
def manage_addBasket_oldObjectForm(self): |
def manage_addBasket_oldObjectForm(self): |
Line 1046 class CDLIBasketVersion(Implicit,Persist
|
Line 1065 class CDLIBasketVersion(Implicit,Persist
|
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): |
"""download all selected files in one file""" |
"""download all selected files in one file""" |
|
|
|
if self.temp_folder.downloadCounterBaskets > 10000: |
|
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
|
|
if (check=="yes") and self.containsNonActualFiles(): |
if (check=="yes") and self.containsNonActualFiles(): |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) |
|
|
return pt(lock=lock) |
return pt(lock=lock) |
|
|
|
else: |
|
|
|
return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no") |
|
|
|
def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no"): |
|
"""print do the download""" |
|
|
ret="" |
ret="" |
lockedObjects={} |
lockedObjects={} |
|
|
|
self.temp_folder.downloadCounterBaskets+=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
if lock: |
if lock: |
|
|
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': |
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
return "please login first" |
return "please login first" |
|
|
#check if a locked object exist in the basket. |
#check if a locked object exist in the basket. |
Line 1074 class CDLIBasketVersion(Implicit,Persist
|
Line 1113 class CDLIBasketVersion(Implicit,Persist
|
if len(keys)>0 and (not procedure): |
if len(keys)>0 and (not procedure): |
self.REQUEST.SESSION['lockedObjects']=lockedObjects |
self.REQUEST.SESSION['lockedObjects']=lockedObjects |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self) |
|
|
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
return pt() |
return pt() |
|
|
elif not procedure: #keine fails gesperrt dann alle donwloaden |
elif not procedure: #keine fails gesperrt dann alle donwloaden |
procedure="downloadAll" |
procedure="downloadAll" |
|
|
|
|
|
|
|
|
for object in self.content.getContent(): |
for object in self.content.getContent(): |
|
|
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
Line 1093 class CDLIBasketVersion(Implicit,Persist
|
Line 1139 class CDLIBasketVersion(Implicit,Persist
|
|
|
if lock and object[1].lockedBy=='': |
if lock and object[1].lockedBy=='': |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
|
|
basket_name=self.aq_parent.title+"_V"+self.getId() |
basket_name=self.aq_parent.title+"_V"+self.getId() |
|
|
#write basketname to header of atf file |
#write basketname to header of atf file |
ret="#atf basket %s\n"%basket_name+ret |
ret="#basket: %s\n"%basket_name+ret |
|
|
|
self.temp_folder.downloadCounterBaskets-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name) |
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name) |
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
length=len(ret) |
length=len(ret) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
|
return True |
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""return anzahl der elemente im basket""" |
"""return anzahl der elemente im basket""" |
Line 1281 def manage_addCDLIFileObject(self,id,vC=
|
Line 1330 def manage_addCDLIFileObject(self,id,vC=
|
|
|
setattr(self._getOb(id),'author',author) |
setattr(self._getOb(id),'author',author) |
|
|
|
|
# Now we "upload" the data. By doing this in two steps, we |
# Now we "upload" the data. By doing this in two steps, we |
# can use a database trick to make the upload more efficient. |
# can use a database trick to make the upload more efficient. |
if file: |
if file: |
Line 1288 def manage_addCDLIFileObject(self,id,vC=
|
Line 1338 def manage_addCDLIFileObject(self,id,vC=
|
if content_type: |
if content_type: |
self._getOb(id).content_type=content_type |
self._getOb(id).content_type=content_type |
|
|
|
self.reindex_object() |
if REQUEST is not None: |
if REQUEST is not None: |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
|
|
Line 1433 def manage_addCDLIFile(self,id,title,loc
|
Line 1484 def manage_addCDLIFile(self,id,title,loc
|
|
|
|
|
self._setObject(id,newObj) |
self._setObject(id,newObj) |
|
getattr(self,id).reindex_object() |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
|
|
|
|
|
def checkFile(filename,data,folder): |
|
"""check the files""" |
|
# first check the file name |
|
fn=filename.split(".") # no extension |
|
print "_____",fn |
|
if not fn[0][0]=="P": |
|
return False,"P missing in the filename" |
|
elif len(fn[0])!=7: |
|
return False,"P number has not the right length 6" |
|
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: |
|
print "ERRR" |
|
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""" |
Line 1455 def splitatf(fh,dir=None,ext=None):
|
Line 1526 def splitatf(fh,dir=None,ext=None):
|
i=0 |
i=0 |
ext.result+="<br>" |
ext.result+="<br>" |
#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: #old convention |
ret=line.replace('#atf basket ','') |
ret=line.replace('#atf basket ','') |
ret=ret.split('_')[0] |
ret=ret.split('_')[0] |
|
elif line.find("#basket:")>=0: #new convention |
|
ret=line.replace('#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 1485 class CDLIFileFolder(versionedFileFolder
|
Line 1560 class CDLIFileFolder(versionedFileFolder
|
folderMetaType=['CDLI Folder'] |
folderMetaType=['CDLI Folder'] |
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufgen einer neuen version eines files dieser catalog neuiniziert |
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufgen einer neuen version eines files dieser catalog neuiniziert |
|
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
tmpStore2={} |
tmpStore2={} |
def setTemp(self,name,value): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
Line 1529 class CDLIFileFolder(versionedFileFolder
|
Line 1604 class CDLIFileFolder(versionedFileFolder
|
|
|
|
|
|
|
def findObjectsFromListWithVersion(self,list): |
def findObjectsFromListWithVersion(self,list,author=None): |
"""find objects from a list with versions |
"""find objects from a list with versions |
@param list: list of tuples (cdliFile,version) |
@param list: list of tuples (cdliFile,version) |
""" |
""" |
Line 1542 class CDLIFileFolder(versionedFileFolder
|
Line 1617 class CDLIFileFolder(versionedFileFolder
|
|
|
pt=getattr(self,'filelistVersioned.html') |
pt=getattr(self,'filelistVersioned.html') |
|
|
return pt(search=list) |
return pt(search=list,author=author) |
|
|
|
|
|
|
Line 1607 class CDLIFileFolder(versionedFileFolder
|
Line 1682 class CDLIFileFolder(versionedFileFolder
|
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
|
|
|
|
|
|
security.declareProtected('Manage','createAllFilesAsSingleFile') |
security.declareProtected('Manage','createAllFilesAsSingleFile') |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
"""download all files""" |
"""download all files""" |
Line 1617 class CDLIFileFolder(versionedFileFolder
|
Line 1691 class CDLIFileFolder(versionedFileFolder
|
|
|
catalog=getattr(self,self.default_catalog) |
catalog=getattr(self,self.default_catalog) |
#tf,tfilename=mkstemp() |
#tf,tfilename=mkstemp() |
|
print self.temp_folder.downloadCounter |
|
if self.temp_folder.downloadCounter > 5: |
|
return """I am sorry, currently the server has to many requests for downloads, please come back later!""" |
|
|
|
self.temp_folder.downloadCounter+=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
|
|
list=[(x.getId,x) for x in catalog()] |
list=[(x.getId,x) for x in catalog()] |
list.sort(sortF) |
list.sort(sortF) |
|
|
|
|
|
|
RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf") |
RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf") |
RESPONSE.setHeader("Content-Type","application/octet-stream") |
RESPONSE.setHeader("Content-Type","application/octet-stream") |
|
tmp="" |
for l in list: |
for l in list: |
obj=l[1].getObject() |
obj=l[1].getObject() |
|
|
Line 1633 class CDLIFileFolder(versionedFileFolder
|
Line 1715 class CDLIFileFolder(versionedFileFolder
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().data[0:]) |
RESPONSE.write(obj.getLastVersion().data[0:]) |
|
self.temp_folder.downloadCounter-=1 |
|
self._p_changed=1 |
|
get_transaction().commit() |
#os.close(tf) |
#os.close(tf) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
return True |
return True |
Line 1665 class CDLIFileFolder(versionedFileFolder
|
Line 1750 class CDLIFileFolder(versionedFileFolder
|
return ret |
return ret |
|
|
|
|
def getFolders_OLD(self): |
|
"""get all subfolders""" |
|
ret=[] |
|
folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType) |
|
for folder in folders: |
|
ret.append((folder[1], |
|
len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)), |
|
len(getattr(self,self.default_catalog)({'path':folder[0]})) |
|
)) |
|
return ret |
|
security.declareProtected('View','index_html') |
security.declareProtected('View','index_html') |
def index_html(self): |
def index_html(self): |
"""main""" |
"""main""" |
Line 1722 class CDLIRoot(Folder):
|
Line 1797 class CDLIRoot(Folder):
|
"""main folder for cdli""" |
"""main folder for cdli""" |
|
|
meta_type="CDLIRoot" |
meta_type="CDLIRoot" |
|
downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible |
def URLquote(self,str): |
def URLquote(self,str): |
"""quote url""" |
"""quote url""" |
return urllib.quote(str) |
return urllib.quote(str) |
Line 1765 class CDLIRoot(Folder):
|
Line 1840 class CDLIRoot(Folder):
|
tmp[id]=(x.getObject().aq_parent,nr) |
tmp[id]=(x.getObject().aq_parent,nr) |
|
|
|
|
return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values()) |
return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values(),author=author) |
|
|
def getLastChanges(self,n=100): |
def getLastChanges(self,n=100): |
"""get the last n changes""" |
"""get the last n changes""" |
Line 1799 class CDLIRoot(Folder):
|
Line 1874 class CDLIRoot(Folder):
|
"""check threads""" |
"""check threads""" |
ret="<html><body>" |
ret="<html><body>" |
for thread in threading.enumerate(): |
for thread in threading.enumerate(): |
ret+="<p>%s : %s</p>"%(repr(thread),thread.isAlive()) |
ret+="<p>%s (%s): %s</p>"%(repr(thread),thread.getName(),thread.isAlive()) |
|
|
return ret |
return ret |
|
|
Line 1873 class CDLIRoot(Folder):
|
Line 1948 class CDLIRoot(Folder):
|
#self._v_uploadATF[threadName].continueVar=False |
#self._v_uploadATF[threadName].continueVar=False |
|
|
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']] |
self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']] |
|
self.REQUEST.SESSION['errors']=tmp['errors'] |
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
#del(self.cdli_main.tmpStore2[threadName]) |
#del(self.cdli_main.tmpStore2[threadName]) |
Line 1881 class CDLIRoot(Folder):
|
Line 1957 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): |
"""redo the upload""" |
"""redo the upload""" |
tmp=self.cdli_main.tmpStore2[threadName] |
tmp=self.cdli_main.tmpStore2[threadName] |
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 uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None): |
def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None): |