--- cdli/cdli_files.py 2006/08/24 09:28:29 1.44 +++ cdli/cdli_files.py 2006/10/04 07:33:22 1.46 @@ -126,7 +126,7 @@ class uploadATFfinallyThread(Thread): elif procedure=="uploadAll": uploadFns=[] for x in os.listdir(SESSION['tmpdir']): - if not x in SESSION['errors']: + if not x in SESSION['lockerrors']: uploadFns.append(x) #or maybe nothing @@ -268,6 +268,8 @@ class uploadATFThread(Thread): changed=[] # changed files errors=[] # files with errors + lockerrors=[] # files with errors + newPs=[] # new p filed psNotInCatalog=[] # files not in the catalog @@ -282,7 +284,7 @@ class uploadATFThread(Thread): if basketObj: 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': basketNameFromId="" basketLen=0 @@ -308,29 +310,36 @@ class uploadATFThread(Thread): founds=ctx2.CDLICatalog.search({'title':fn}) #if not than add filename to the list of newfiles - 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() + 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 - if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): - errors.append(obj) - else: - data=file(os.path.join(dir,fn)).read() - diffs=obj.diff(data) - if diffs[0]>0: - changed.append((obj,diffs)) - #hochladen - #ready, set the returnValues self.result+="

Done

" self.returnValue={} self.returnValue['changed']=changed self.returnValue['errors']=errors + self.returnValue['lockerrors']=lockerrors self.returnValue['newPs']=newPs self.returnValue['tmpdir']=dir self.returnValue['basketLen']=basketLen @@ -514,7 +523,10 @@ 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 lock: @@ -541,11 +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() + 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'] @@ -556,6 +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() def manage_addBasket_oldObjectForm(self): @@ -1045,19 +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 (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") + + def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no"): + """print do the download""" + ret="" lockedObjects={} - + 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() return "please login first" #check if a locked object exist in the basket. @@ -1074,14 +1113,21 @@ class CDLIBasketVersion(Implicit,Persist if len(keys)>0 and (not procedure): 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() + return pt() elif not procedure: #keine fails gesperrt dann alle donwloaden procedure="downloadAll" + + for object in self.content.getContent(): - + if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): if current=="no": #version as they are in the basket ret+=str(object[0].data)+"\n" @@ -1093,19 +1139,22 @@ class CDLIBasketVersion(Implicit,Persist if lock and object[1].lockedBy=='': object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] - basket_name=self.aq_parent.title+"_V"+self.getId() #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-Type","application/octet-stream") length=len(ret) self.REQUEST.RESPONSE.setHeader("Content-Length",length) self.REQUEST.RESPONSE.write(ret) + return True - def numberOfItems(self): """return anzahl der elemente im basket""" return self.content.numberOfItems() @@ -1188,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" @@ -1231,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:] @@ -1247,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: @@ -1281,6 +1330,7 @@ def manage_addCDLIFileObject(self,id,vC= setattr(self._getOb(id),'author',author) + # 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: @@ -1288,10 +1338,11 @@ def manage_addCDLIFileObject(self,id,vC= if content_type: self._getOb(id).content_type=content_type + self.reindex_object() 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" @@ -1433,14 +1484,34 @@ def manage_addCDLIFile(self,id,title,loc self._setObject(id,newObj) - + getattr(self,id).reindex_object() if RESPONSE is not None: 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): """split it""" ret=None @@ -1455,9 +1526,13 @@ def splitatf(fh,dir=None,ext=None): i=0 ext.result+="
" #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=ret.split('_')[0] + 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: @@ -1476,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() @@ -1485,7 +1560,7 @@ class CDLIFileFolder(versionedFileFolder folderMetaType=['CDLI Folder'] default_catalog='CDLICatalog' defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufŸgen 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={} def setTemp(self,name,value): """set tmp""" @@ -1529,7 +1604,7 @@ class CDLIFileFolder(versionedFileFolder - def findObjectsFromListWithVersion(self,list): + def findObjectsFromListWithVersion(self,list,author=None): """find objects from a list with versions @param list: list of tuples (cdliFile,version) """ @@ -1542,7 +1617,7 @@ class CDLIFileFolder(versionedFileFolder pt=getattr(self,'filelistVersioned.html') - return pt(search=list) + return pt(search=list,author=author) @@ -1607,7 +1682,6 @@ class CDLIFileFolder(versionedFileFolder RESPONSE.redirect("filelist.html?start:int="+str(start)) - security.declareProtected('Manage','createAllFilesAsSingleFile') def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files""" @@ -1617,14 +1691,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!""" + + 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="" for l in list: obj=l[1].getObject() @@ -1633,6 +1715,9 @@ 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 + get_transaction().commit() #os.close(tf) #RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) return True @@ -1665,16 +1750,6 @@ class CDLIFileFolder(versionedFileFolder 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') def index_html(self): """main""" @@ -1722,7 +1797,7 @@ class CDLIRoot(Folder): """main folder for cdli""" meta_type="CDLIRoot" - + downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible def URLquote(self,str): """quote url""" return urllib.quote(str) @@ -1740,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): @@ -1765,7 +1840,7 @@ class CDLIRoot(Folder): 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): """get the last n changes""" @@ -1799,7 +1874,7 @@ class CDLIRoot(Folder): """check threads""" ret="" for thread in threading.enumerate(): - ret+="

%s : %s

"%(repr(thread),thread.isAlive()) + ret+="

%s (%s): %s

"%(repr(thread),thread.getName(),thread.isAlive()) return ret @@ -1864,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] @@ -1873,7 +1948,8 @@ class CDLIRoot(Folder): #self._v_uploadATF[threadName].continueVar=False 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['tmpdir']=tmp['dir'] #del(self.cdli_main.tmpStore2[threadName]) @@ -1888,7 +1964,7 @@ class CDLIRoot(Folder): """redo the upload""" tmp=self.cdli_main.tmpStore2[threadName] 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']) def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None): @@ -1902,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