--- cdli/cdli_files.py 2006/10/04 07:18:23 1.45 +++ cdli/cdli_files.py 2006/10/04 07:33:22 1.46 @@ -310,28 +310,28 @@ class uploadATFThread(Thread): founds=ctx2.CDLICatalog.search({'title':fn}) #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: - newPs.append(fn) - - #if p file alread at the server - for found in founds: - #analyse the differences to the actual file - obj=found.getObject() - - if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): - lockerrors.append(fn) - else: - - diffs=obj.diff(data) - if diffs[0]>0: - changed.append((obj,diffs)) #hochladen + + 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: + newPs.append(fn) + + #if p file alread at the server + for found in founds: + #analyse the differences to the actual file + obj=found.getObject() + + if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): + lockerrors.append(fn) + else: + + diffs=obj.diff(data) + if diffs[0]>0: + changed.append((obj,diffs)) #hochladen #ready, set the returnValues self.result+="

Done

" @@ -523,9 +523,9 @@ class BasketObject_old(Folder): ret="" 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!""" + 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: @@ -553,15 +553,15 @@ class BasketObject_old(Folder): elif not procedure: #keine fails gesperrt dann alle donwloaden procedure="downloadAll" - self.temp_folder.downloadCounter+=1 - self._p_changed=1 - get_transaction().commit() + self.temp_folder.downloadCounter+=1 + self._p_changed=1 + get_transaction().commit() - + for object in self.contents: if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']): - ret+=object.getLastVersion().data + ret+=object.getLastVersion().getData() if lock and object.lockedBy=='': object.lockedBy=self.REQUEST['AUTHENTICATED_USER'] @@ -572,9 +572,9 @@ class BasketObject_old(Folder): length=len(ret) self.REQUEST.RESPONSE.setHeader("Content-Length",length) self.REQUEST.RESPONSE.write(ret) - self.temp_folder.downloadCounter-=1 - self._p_changed=1 - get_transaction().commit() + self.temp_folder.downloadCounter-=1 + self._p_changed=1 + get_transaction().commit() def manage_addBasket_oldObjectForm(self): @@ -1064,39 +1064,39 @@ class CDLIBasketVersion(Implicit,Persist security.declareProtected('View','downloadObjectsAsOneFile') def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): """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 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(): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) - + return pt(lock=lock) - else: - - return self.downloadObjectsAsOneFileFinally(lock=lock,procedure=procedure,REQUEST=REQUEST,current="no") - + 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""" + """print do the download""" - ret="" + ret="" lockedObjects={} - self.temp_folder.downloadCounterBaskets+=1 - self._p_changed=1 + self.temp_folder.downloadCounterBaskets+=1 + self._p_changed=1 get_transaction().commit() if lock: 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() + 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" #check if a locked object exist in the basket. @@ -1114,16 +1114,16 @@ class CDLIBasketVersion(Implicit,Persist self.REQUEST.SESSION['lockedObjects']=lockedObjects 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() + 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 procedure="downloadAll" - + for object in self.content.getContent(): @@ -1144,16 +1144,16 @@ class CDLIBasketVersion(Implicit,Persist #write basketname to header of atf file ret="#basket: %s\n"%basket_name+ret - self.temp_folder.downloadCounterBaskets-=1 - self._p_changed=1 - get_transaction().commit() + 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-Type","application/octet-stream") length=len(ret) self.REQUEST.RESPONSE.setHeader("Content-Length",length) self.REQUEST.RESPONSE.write(ret) - return True + return True def numberOfItems(self): """return anzahl der elemente im basket""" @@ -1237,7 +1237,7 @@ def manage_addCDLIBasketVersion(self,use else: return ob -class CDLIFileObject(CatalogAware,versionedFileObject): +class CDLIFileObject(CatalogAware,extVersionedFileObject): """CDLI file object""" meta_type="CDLI File Object" @@ -1280,8 +1280,8 @@ class CDLIFileObject(CatalogAware,versio security.declarePublic('getPNumber') def getPNumber(self): - """get the pnumber""" - try: + """get the pnumber""" + try: txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:]) except: txt=self.data[0:] @@ -1296,9 +1296,9 @@ class CDLIFileObject(CatalogAware,versio def getDesignation(self): """get the designation out of the file""" try: - txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:]) + txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:]) except: - txt=self.data[0:] + txt=self.getData()[0:] return "ERROR" try: @@ -1342,7 +1342,7 @@ def manage_addCDLIFileObject(self,id,vC= if REQUEST is not None: REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') -class CDLIFile(versionedFile,CatalogAware): +class CDLIFile(extVersionedFile,CatalogAware): """CDLI file""" meta_type="CDLI file" @@ -1497,20 +1497,20 @@ def checkFile(filename,data,folder): fn=filename.split(".") # no extension print "_____",fn if not fn[0][0]=="P": - return False,"P missing in the filename" + return False,"P missing in the filename" 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: - 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,"" + 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): """split it""" @@ -1529,10 +1529,10 @@ def splitatf(fh,dir=None,ext=None): if line.find("#atf basket")>=0: #old convention ret=line.replace('#atf basket ','') ret=ret.split('_')[0] - elif line.find("#basket:")>=0: #new convention + elif line.find("#basket:")>=0: #new convention ret=line.replace('#basket: ','') ret=ret.split('_')[0] - + else: if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile if nf: @@ -1551,7 +1551,7 @@ def splitatf(fh,dir=None,ext=None): return ret,len(os.listdir(dir)) -class CDLIFileFolder(versionedFileFolder): +class CDLIFileFolder(extVersionedFileFolder): """CDLI File Folder""" security=ClassSecurityInfo() @@ -1692,21 +1692,21 @@ class CDLIFileFolder(versionedFileFolder catalog=getattr(self,self.default_catalog) #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!""" + 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 + self.temp_folder.downloadCounter+=1 + self._p_changed=1 get_transaction().commit() list=[(x.getId,x) for x in catalog()] list.sort(sortF) - + RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"all.atf") RESPONSE.setHeader("Content-Type","application/octet-stream") - tmp="" + tmp="" for l in list: obj=l[1].getObject() @@ -1715,8 +1715,8 @@ class CDLIFileFolder(versionedFileFolder #os.write(tf,obj.getLastVersion().data) if RESPONSE: RESPONSE.write(obj.getLastVersion().data[0:]) - self.temp_folder.downloadCounter-=1 - self._p_changed=1 + self.temp_folder.downloadCounter-=1 + self._p_changed=1 get_transaction().commit() #os.close(tf) #RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) @@ -1815,7 +1815,7 @@ class CDLIRoot(Folder): if un and un !="": ret.append((f[0],un)) - print ret + return ret def getChangesByAuthor(self,author,n=100): @@ -1939,7 +1939,7 @@ class CDLIRoot(Folder): # tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] # else: # tmp[key]=self._v_uploadATF[threadName].returnValue[key] -# print repr(tmp[key]),repr(key) +# repr(tmp[key]),repr(key) # # # #tmp=self.cdli_main.tmpStore2[threadName] @@ -1957,7 +1957,7 @@ class CDLIRoot(Folder): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.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'], + return pt(changed=tmp['changed'],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 redoUpload(self,threadName): @@ -1978,7 +1978,7 @@ class CDLIRoot(Folder): threadName=thread.getName()[0:] if (not hasattr(self,'_v_uploadATF')): - self._v_uploadATF={} + self._v_uploadATF={} self._v_uploadATF[threadName]=thread