--- cdli/cdli_files.py 2006/07/14 19:08:30 1.37 +++ cdli/cdli_files.py 2006/11/14 17:02:59 1.51 @@ -1,11 +1,13 @@ """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 import os from types import * import urlparse +import urllib +import cgi from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem import time @@ -13,6 +15,7 @@ from OFS.Folder import manage_addFolder import re from AccessControl import ClassSecurityInfo from Acquisition import Implicit +from Globals import Persistent from threading import Thread from ZPublisher.HTTPRequest import HTTPRequest from ZPublisher.HTTPResponse import HTTPResponse @@ -20,7 +23,27 @@ from ZPublisher.BaseRequest import Reque import threading +class BasketContent(SimpleItem): + """classe fuer den Inhalt eines Baskets""" + + def __init__(self,content=[]): + """content""" + self.contentList=content[0:] + + def getContent(self): + """get content""" + return self.contentList + + def setContent(self,content): + self.contentList=content[0:] + + def numberOfItems(self): + """number""" + + return len(self.getContent()) + + class uploadATFfinallyThread(Thread): """class for adding uploaded filed (temporarily stored in the staging area at /tmp""" @@ -77,7 +100,8 @@ class uploadATFfinallyThread(Thread): conn.close() #set flag for end of this method self.end=True - return True + print "ended" + return True def __del__(self): """delete""" @@ -105,7 +129,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 @@ -120,7 +144,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 @@ -218,10 +242,10 @@ class uploadATFThread(Thread): #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue get_transaction().commit() - + while self.continueVar: pass - + conn.close() @@ -247,6 +271,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 @@ -261,7 +287,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 @@ -287,29 +313,37 @@ 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) + 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 - 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 @@ -446,7 +480,9 @@ class BasketObject_old(Folder): def numberOfItems(self): """return anzahl der elemente im basket""" - return len(self.contents) + num=len(self.contents) + + return num def addObjects(self,ids): """addObjects""" @@ -491,7 +527,10 @@ class BasketObject_old(Folder): ret="" lockedObjects={} - + + 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: @@ -518,11 +557,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'] @@ -533,6 +576,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): @@ -560,6 +606,14 @@ class CDLIBasketContainer(OrderedFolder) security=ClassSecurityInfo() meta_type="CDLIBasketContainer" + def upDateBaskets(self): + """update content in to objects""" + + founds=self.ZopeFind(self,obj_metatypes=['CDLIBasketVersion'],search_sub=1) + + for found in founds: + found[1].updateBasket() + security.declareProtected('manage','deleteBaskets') def deleteBaskets(self,ids=None): """delete baskets, i.e. move them into trash folder""" @@ -637,7 +691,19 @@ class CDLIBasketContainer(OrderedFolder) self.id=id self.title=title - + + def getBasketsId(self): + """get all baskets als klartext""" + + ret="" + baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket']) + for basket in baskets: + com,user,time,values = basket[1].getContentIds() + ret+= "BASKET:"+com+"\t"+user+"\t"+time+"\n" + for x in values: + ret+= x[0]+"\t"+x[1]+"\n" + return ret + def getBaskets(self,sortField='title'): """get all baskets files""" @@ -693,7 +759,7 @@ class CDLIBasketContainer(OrderedFolder) baskets.sort(sortAuthor) elif sortField=='comment': baskets.sort(sortComment) - print "got the baskets" + return baskets @@ -711,9 +777,13 @@ class CDLIBasketContainer(OrderedFolder) def setActiveBasket(self,basketId,REQUEST=None): """store active basketId in a cookie""" self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") - + try: + qs=cgi.parse_qs(REQUEST['QUERY_STRING']) + del(qs['basketId']) + except: + qs={} if REQUEST: - REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING']) + REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+urllib.urlencode(qs)) def getActiveBasket(self): """get active basket from cookie""" @@ -785,6 +855,7 @@ class CDLIBasket(Folder,CatalogAware): meta_type="CDLIBasket" default_catalog="CDLIBasketCatalog" + def getFile(self,obj): return obj[1] @@ -840,12 +911,22 @@ class CDLIBasket(Folder,CatalogAware): def getLastVersion(self): """hole letzte version""" - ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])] + + ids=[] + idsTmp= self.objectIds() + for x in idsTmp: + try: + ids.append(int(x)) + except: + pass ids.sort() + if len(ids)==0: return None else: ob=getattr(self,str(ids[-1])) + + return ob def getVersions(self): @@ -860,7 +941,7 @@ class CDLIBasket(Folder,CatalogAware): ids=[ids] lastVersion=self.getLastVersion() - oldContent=lastVersion.basketContent[0:] + oldContent=lastVersion.content.getContent() newContent=[] #first copy the old @@ -883,10 +964,13 @@ class CDLIBasket(Folder,CatalogAware): ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) + obj=self._getOb(ob.getId()) if RESPONSE: - obj=self._getOb(ob.getId()) + RESPONSE.redirect(obj.absolute_url()) - + + return obj + def addObjects(self,ids,deleteOld=None,username=None): """generate a new version of the basket with objects added""" @@ -895,7 +979,7 @@ class CDLIBasket(Folder,CatalogAware): if lastVersion is None: oldContent=[] else: - oldContent=lastVersion.basketContent[0:] + oldContent=lastVersion.content.getContent() if deleteOld: oldContent=[] @@ -903,8 +987,10 @@ class CDLIBasket(Folder,CatalogAware): newContent=[] added=0 for id in ids: - founds=self.CDLICatalog.search({'title':id}) - + try: + founds=self.CDLICatalog.search({'title':id}) + except: + founds=[] for found in founds: if found.getObject() not in oldContent: #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version @@ -921,6 +1007,19 @@ class CDLIBasket(Folder,CatalogAware): return added + + + + def getContentIds(self): + """print basket content""" + ret=[] + lv=self.getLastVersion() + for obj in lv.content.getContent(): + ret.append((obj[0].getId(),obj[1].getId())) + + + return lv.getComment(),lv.getUser(),lv.getTime(),ret + def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None): """change a basket""" if submit=="update": @@ -935,7 +1034,7 @@ class CDLIBasket(Folder,CatalogAware): ids=[ids] lastVersion=self.getLastVersion() - oldContent=lastVersion.basketContent[0:] + oldContent=lastVersion.content.getContent() newContent=[] for obj in oldContent: if obj[1].getId() not in ids: @@ -969,12 +1068,25 @@ def manage_addCDLIBasket(self,title,shor else: return ob -class CDLIBasketVersion(SimpleItem): +class CDLIBasketVersion(Implicit,Persistent,Folder): """version of a basket""" meta_type="CDLIBasketVersion" security=ClassSecurityInfo() + def updateBasket(self): + """update""" + try: + self._setObject('content',BasketContent(self.basketContent)) + except: + try: + if len(self.basketContent)>0: + self.content.setContent(self.basketContent) + except: + print "error",self.getId(),self.aq_parent.getId() + self.basketContent=[] + + def containsNonActualFiles(self): """returns True if basket contains one or more non current files""" @@ -987,24 +1099,44 @@ class CDLIBasketVersion(SimpleItem): 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. lockedObjects={} - for object in self.basketContent: + for object in self.content.getContent(): if not object[1].lockedBy=="": lockedObjects[object[1].title]=repr(object[1].lockedBy) @@ -1016,41 +1148,51 @@ class CDLIBasketVersion(SimpleItem): 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.basketContent: - + + 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" + ret+=str(object[0].getData())+"\n" elif current=="yes": #search current object founds=self.CDLICatalog.search({'title':object[0].getId()}) if len(founds)>0: - ret+=str(founds[0].getObject().getLastVersion().data)+"\n" + ret+=str(founds[0].getObject().getLastVersion().getData())+"\n" 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 len(self.basketContent) + return self.content.numberOfItems() def getTime(self): """getTime""" @@ -1066,14 +1208,15 @@ class CDLIBasketVersion(SimpleItem): def getContent(self): """get Basket Content""" - return self.basketContent + return self.content.getContent() def __init__(self,id,user,comment="",basketContent=[]): """ init a basket version""" self.id=id self.coment=comment - self.basketContent=basketContent[0:] + self._setObject('content',BasketContent(basketContent)) + #self.basketContent=basketContent[0:]a self.user=user self.time=time.localtime() @@ -1090,8 +1233,9 @@ class CDLIBasketVersion(SimpleItem): """view the basket""" if self.REQUEST.get('change',False): - - self.aq_parent.updateObjects(self.REQUEST['change']) + ob=self.aq_parent.updateObjects(self.REQUEST['change']) + + self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) return pt() @@ -1128,7 +1272,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" @@ -1169,13 +1313,27 @@ class CDLIFileObject(CatalogAware,versio pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) return pt() + security.declarePublic('getPNumber') + def getPNumber(self): + """get the pnumber""" + try: + txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:]) + except: + txt=self.getData()[0:] + + return "ERROR" + try: + return "P"+txt.group(1) + except: + return "ERROR" + security.declarePublic('getDesignation') 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: @@ -1186,11 +1344,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) @@ -1207,23 +1365,37 @@ 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: + + 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 + self.reindex_object() + self._getOb(id).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" default_catalog='CDLICatalog' #security.declarePublic('history') + def getLastVersionData(self): + """get last version data""" + return self.getLastVersion().getData() + + #security.declarePublic('history') + + def history(self): """history""" @@ -1235,6 +1407,18 @@ class CDLIFile(versionedFile,CatalogAwar return pt() + def getBasketFromId(self,basketid, context=None): + """get basket from id""" + + if not context: + context=self + + for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]): + if basket[0]==basketid: + return basket[1] + else: + None + def isContainedInBaskets(self,context=None): """check is this file is part of any basket @@ -1272,8 +1456,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: @@ -1306,8 +1492,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() @@ -1347,50 +1534,76 @@ 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 + + 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: + + return False,"atf checker error: %s"%value + else: + return True,"" + def splitatf(fh,dir=None,ext=None): """split it""" ret=None nf=None i=0 - for line in fh.readlines(): - if ext: - i+=1 - if (i%100)==0: - ext.result+="." - if i==10000: - i=0 - ext.result+="
" - #check if basket name is in the first line - if line.find("#atf basket")>=0: - ret=line.replace('#atf basket ','') - ret=ret.split('_')[0] - else: - if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile - if nf: - nf.close() #close last file - - - filename=line[1:].split("=")[0].rstrip()+".atf" - if dir: - filename=os.path.join(dir,filename) - nf=file(filename,"w") - if nf: - nf.write(line) - + + for lineTmp in fh.readlines(): + for line in lineTmp.split("\r"): + if ext: + i+=1 + if (i%100)==0: + ext.result+="." + if i==10000: + i=0 + ext.result+="
" + #check if basket name is in the first line + 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: + nf.close() #close last file + + + filename=line[1:].split("=")[0].rstrip()+".atf" + if dir: + filename=os.path.join(dir,filename) + nf=file(filename,"w") + if nf: + nf.write(line.replace("\n","")+"\n") + nf.close() fh.close() return ret,len(os.listdir(dir)) -class CDLIFileFolder(versionedFileFolder): +class CDLIFileFolder(extVersionedFileFolder): """CDLI File Folder""" security=ClassSecurityInfo() @@ -1399,7 +1612,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""" @@ -1443,7 +1656,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) """ @@ -1456,7 +1669,7 @@ class CDLIFileFolder(versionedFileFolder pt=getattr(self,'filelistVersioned.html') - return pt(search=list) + return pt(search=list,author=author) @@ -1521,7 +1734,6 @@ class CDLIFileFolder(versionedFileFolder RESPONSE.redirect("filelist.html?start:int="+str(start)) - security.declareProtected('Manage','createAllFilesAsSingleFile') def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files""" @@ -1531,14 +1743,24 @@ class CDLIFileFolder(versionedFileFolder catalog=getattr(self,self.default_catalog) #tf,tfilename=mkstemp() - - + if not hasattr(self.temp_folder,'downloadCounter'): + self.temp_folder.downloadCounter=0 + + if getattr(self.temp_folder,'downloadCounter',0) > 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() @@ -1546,7 +1768,10 @@ class CDLIFileFolder(versionedFileFolder #os.write(tf,obj.getLastVersion().data) if RESPONSE: - RESPONSE.write(obj.getLastVersion().data[0:]) + RESPONSE.write(obj.getLastVersion().getData()[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 @@ -1579,16 +1804,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""" @@ -1636,7 +1851,17 @@ 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 showFile(self,fileId): + """show a file""" + f=self.CDLICatalog({'title':fileId}) + if not f: + return "" + + return f[0].getObject().getLastVersionData() + def URLquote(self,str): """quote url""" return urllib.quote(str) @@ -1651,10 +1876,10 @@ class CDLIRoot(Folder): ret=[] for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1): un=f[1].forceunlock() - print un + if un and un !="": ret.append((f[0],un)) - print ret + return ret def getChangesByAuthor(self,author,n=100): @@ -1679,7 +1904,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""" @@ -1711,7 +1936,13 @@ class CDLIRoot(Folder): def checkThreads(self): """check threads""" - return threading.enumerate() + ret="" + for thread in threading.enumerate(): + ret+="

%s (%s): %s

"%(repr(thread),thread.getName(),thread.isAlive()) + + return ret + + def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): """standard ausgabe""" @@ -1772,31 +2003,32 @@ 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] tmp=self._v_uploadATF[threadName].returnValue - #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['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]) - print "here the templates" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) - print "init p" - 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 redoUpload(self,threadName): """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): @@ -1810,7 +2042,8 @@ class CDLIRoot(Folder): threadName=thread.getName()[0:] if (not hasattr(self,'_v_uploadATF')): - self._v_uploadATF={} + self._v_uploadATF={} + self._v_uploadATF[threadName]=thread @@ -1852,10 +2085,10 @@ class CDLIRoot(Folder): if RESPONSE is not None: RESPONSE.redirect(self.absolute_url()) - def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None): + def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/atf", files=None,ext=None): """import files""" root=self.cdli_main - + count=0 if not files: files=os.listdir(folderName) @@ -1865,7 +2098,7 @@ class CDLIRoot(Folder): obj=self.ZopeFind(root,obj_ids=[folder]) if ext: - ext.result+="

Adding: %s

"%f + ext.result+="

adding: %s

"%f if not obj: manage_addCDLIFileFolder(root,folder,folder) fobj=getattr(root,folder) @@ -1882,18 +2115,24 @@ 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]) - + count+=1 + + if count > 1000: + print "committing" + get_transaction().commit() + count=0 + get_transaction().commit() return "ok"