--- cdli/cdli_files.py 2006/06/15 22:02:40 1.25 +++ cdli/cdli_files.py 2006/07/04 08:47:10 1.31 @@ -18,7 +18,7 @@ from ZPublisher.HTTPRequest import HTTPR from ZPublisher.HTTPResponse import HTTPResponse from ZPublisher.BaseRequest import RequestContainer import threading - + class uploadATFfinallyThread(Thread): @@ -58,7 +58,7 @@ class uploadATFfinallyThread(Thread): req = HTTPRequest(None, env, resp) return app.__of__(RequestContainer(REQUEST = req)) - + def run(self): """run""" @@ -215,7 +215,7 @@ class uploadATFThread(Thread): ctx = self.getContext(app,serverport=self.serverport) self.uploadATFThread(ctx,self.upload,self.basketId) - ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue + #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue get_transaction().commit() @@ -294,8 +294,8 @@ class uploadATFThread(Thread): for found in founds: #analyse the differences to the actual file obj=found.getObject() - - if (not obj.lockedBy=='') and (not obj.lockedBy==self.username): + + 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() @@ -689,7 +689,7 @@ class CDLIBasketContainer(OrderedFolder) baskets.sort(sortAuthor) elif sortField=='comment': baskets.sort(sortComment) - + print "got the baskets" return baskets @@ -963,7 +963,7 @@ class CDLIBasketVersion(SimpleItem): for object in self.basketContent: if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): - ret+=object[0].data + ret+=str(object[0].data) if lock and object[1].lockedBy=='': object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] @@ -1054,7 +1054,7 @@ def manage_addCDLIBasketVersion(self,use else: return ob -class CDLIFileObject(versionedFileObject,CatalogAware): +class CDLIFileObject(CatalogAware,versionedFileObject): """CDLI file object""" meta_type="CDLI File Object" @@ -1062,6 +1062,34 @@ class CDLIFileObject(versionedFileObject security=ClassSecurityInfo() + + security.declarePublic('makeThisVersionCurrent') + + def PrincipiaSearchSource(self): + """Return cataloguable key for ourselves.""" + return str(self) + + def makeThisVersionCurrent_html(self): + """form for making this version current""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) + return pt() + def makeThisVersionCurrent(self,comment,author,RESPONSE=None): + """copy this version to current""" + parent=self.aq_parent + + + newversion=parent.manage_addCDLIFileObject('',comment,author) + newversion.data=self.data[0:] + + if RESPONSE is not None: + RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') + + + return True + + security.declarePublic('view') + def view(self): """view file""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) @@ -1121,7 +1149,18 @@ class CDLIFile(versionedFile,CatalogAwar meta_type="CDLI file" default_catalog='CDLICatalog' - + #security.declarePublic('history') + def history(self): + """history""" + + ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"]) + if ext: + return getattr(self,ext[0][1].getId())() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self) + return pt() + + def isContainedInBaskets(self,context=None): """check is this file is part of any basket @@ -1321,8 +1360,23 @@ class CDLIFileFolder(versionedFileFolder - - + def findObjectsFromListWithVersion(self,list): + """find objects from a list with versions + @param list: list of tuples (cdliFile,version) + """ + + + + #self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage + #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] + + + pt=getattr(self,'filelistVersioned.html') + + return pt(search=list) + + + def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): """findObjectsFromList (, TAB oder LINE separated)""" @@ -1493,14 +1547,41 @@ class CDLIRoot(Folder): meta_type="CDLIRoot" - def getChangesByAuthor(self,author): + def forceunlock(self): + "break all locks" + 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): """getChangesByAuthor""" - zcat=self.CDLICatalog - return zcat({'lastEditor':author, + zcat=self.CDLIObjectsCatalog + res=zcat({'lastEditor':author, 'sort_on':'getTime', 'sort_order':'descending', 'sort_limit':n})[:n ] - + + return res + + def getChangesByAuthor_html(self,author,n=100): + """html output for changes by author""" + tmp={} + list=[] + for x in self.getChangesByAuthor(author): + nr=x.getObject().getVersionNumber() + id=x.getObject().aq_parent.getId() + #hinzufuegen, wenn Version neuer als die + if tmp.get(id,(0,0))[1] < nr: + tmp[id]=(x.getObject().aq_parent,nr) + + + return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values()) + def getLastChanges(self,n=100): """get the last n changes""" n=int(n) @@ -1592,19 +1673,33 @@ class CDLIRoot(Folder): # tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] # else: # tmp[key]=self._v_uploadATF[threadName].returnValue[key] - - tmp=self.cdli_main.tmpStore2[threadName] - del(self.cdli_main.tmpStore2[threadName]) - self._v_uploadATF[threadName].continueVar=False +# print repr(tmp[key]),repr(key) +# +# # + #tmp=self.cdli_main.tmpStore2[threadName] + tmp=self._v_uploadATF[threadName].returnValue + + #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['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'], 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'], + basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) + def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None): """nowupload the files"""