--- cdli/cdli_files.py 2006/10/04 07:18:23 1.45 +++ cdli/cdli_files.py 2006/10/05 07:22:58 1.48 @@ -1,5 +1,5 @@ """CDLI extensions of the filearchive""" -from Products.versionedFile.versionedFile import * +from Products.versionedFile.extVersionedFile import * from Products.ZCatalog.CatalogPathAwareness import CatalogAware from tempfile import mkstemp,mkdtemp import os.path @@ -141,7 +141,7 @@ class uploadATFfinallyThread(Thread): if len(founds)>0: SESSION['author']=str(username) self.result+="

Changing : %s"%fn - founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=file(os.path.join(SESSION['tmpdir'],fn))) + founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn,from_tmp=True)) #now add the new files @@ -310,28 +310,29 @@ 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) + status=True + msg="" + 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 +524,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!""" + + 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 +554,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 +573,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 +1065,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 +1115,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 +1145,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 +1238,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 +1281,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 +1297,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: @@ -1309,11 +1310,11 @@ class CDLIFileObject(CatalogAware,versio manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', - REQUEST=None): + from_tmp=False,REQUEST=None): """Add a new File object. Creates a new File object 'id' with the contents of 'file'""" - + id=str(id) title=str(title) content_type=str(content_type) @@ -1333,8 +1334,11 @@ def manage_addCDLIFileObject(self,id,vC= # Now we "upload" the data. By doing this in two steps, we # can use a database trick to make the upload more efficient. - if file: + + if file and not from_tmp: self._getOb(id).manage_upload(file) + elif file and from_tmp: + self._getOb(id).manage_upload_from_tmp(file) if content_type: self._getOb(id).content_type=content_type @@ -1342,7 +1346,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" @@ -1409,8 +1413,10 @@ class CDLIFile(versionedFile,CatalogAwar precondition='', content_type='', changeName='no',newName='', - come_from=None,RESPONSE=None): + come_from=None, + from_tmp=False,RESPONSE=None): """add""" + try: #TODO: der ganze vC unsinn muss ueberarbeitet werden vC=self.REQUEST['vC'] except: @@ -1443,8 +1449,9 @@ class CDLIFile(versionedFile,CatalogAwar id=tmp[0]+"_V%i"%self.getVersion() - manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type) - objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) + manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type,from_tmp=from_tmp) + #objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) + objs=getattr(self,id).setVersionNumber(int(self.getVersion())) try: #FIXME: wozu ist das gut? self.REQUEST.SESSION['objID_parent']=self.getId() @@ -1495,22 +1502,22 @@ 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" + 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: + + return False,"atf checker error: %s"%value + else: + return True,"" def splitatf(fh,dir=None,ext=None): """split it""" @@ -1529,10 +1536,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 +1558,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() @@ -1691,22 +1698,22 @@ 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 +1722,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 +1822,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 +1946,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] @@ -1978,7 +1985,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 @@ -2051,14 +2058,14 @@ class CDLIRoot(Folder): else: fobj2=obj2[0][1] - file2=file(os.path.join(folderName,f)) + file2=os.path.join(folderName,f) id=f manage_addCDLIFile(fobj2,f,'','') id=f ob=fobj2._getOb(f) ob.title=id - manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='') + manage_addCDLIFileObject(ob,id,comment,author,file2,content_type='',from_tmp=True) self.CDLICatalog.catalog_object(ob) #self.CDLICatalog.manage_catalogFoundItems(obj_ids=[id],search_sub=1) #self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1])