--- cdli/cdli_files.py 2007/09/03 11:10:04 1.80 +++ cdli/cdli_files.py 2007/10/06 13:44:46 1.80.2.1 @@ -1450,10 +1450,8 @@ class CDLIFileObject(CatalogAware,extVer security=ClassSecurityInfo() - - security.declarePublic('makeThisVersionCurrent') - security.declareProtected('manage','index_html') + def PrincipiaSearchSource(self): """Return cataloguable key for ourselves.""" return str(self) @@ -1463,28 +1461,26 @@ class CDLIFileObject(CatalogAware,extVer pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) return pt() + + security.declarePublic('makeThisVersionCurrent') def makeThisVersionCurrent(self,comment,author,RESPONSE=None): """copy this version to current""" parent=self.aq_parent - - newversion=parent.manage_addCDLIFileObject('',comment,author) newversion.manage_upload(self.getData()) if RESPONSE is not None: RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') - return True - security.declarePublic('view') - def getFormattedData(self): """fromat text""" data=self.getData() # return re.sub("\s\#lem"," #lem",data) #remove return vor #lem return re.sub("#lem"," #lem",data) #remove return vor #lem + security.declarePublic('view') def view(self): """view file""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) @@ -1520,10 +1516,10 @@ class CDLIFileObject(CatalogAware,extVer manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') -def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', +def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0, + precondition='', content_type='', from_tmp=False,REQUEST=None): """Add a new File object. - Creates a new File object 'id' with the contents of 'file'""" id=str(id) @@ -1536,11 +1532,8 @@ def manage_addCDLIFileObject(self,id,vC= self=self.this() # First, we create the file without data: - self._setObject(id, CDLIFileObject(id,title,'',content_type, precondition)) + self._setObject(id, CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=vC,time=time.localtime(),author=author)) fob = self._getOb(id) - fob.versionComment=str(vC) - fob.time=time.localtime() - setattr(fob,'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. @@ -1548,14 +1541,17 @@ def manage_addCDLIFileObject(self,id,vC= if file and not from_tmp: fob.manage_upload(file) elif file and from_tmp: - fob.manage_upload_from_tmp(file) + fob.manage_file_upload(file) # manage_upload_from_tmp doesn't exist in ExtFile2 + # fob.manage_upload_from_tmp(file) # manage_upload_from_tmp doesn't exist in ExtFile2 if content_type: fob.content_type=content_type - logging.debug("reindex1: %s"%repr(self)) + logging.debug("manage_add: lastversion=%s"%self.getData()) + logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) self.reindex_object() + logging.debug("manage_add: fob_data=%s"%fob.getData()) logging.debug("reindex2: %s in %s"%(repr(fob), repr(fob.default_catalog))) - fob.reindex_object() + fob.index_object() if REQUEST is not None: REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') @@ -1566,20 +1562,20 @@ class CDLIFile(extVersionedFile,CatalogA security=ClassSecurityInfo() meta_type="CDLI file" + content_meta_type = ["CDLI File Object"] + default_catalog='CDLICatalog' security.declareProtected('manage','index_html') - #security.declarePublic('history') + def getLastVersionData(self): """get last version data""" - return self.getLastVersion().getData() + return self.getData() def getLastVersionFormattedData(self): """get last version data""" - return self.getLastVersion().getFormattedData() + return self.getContentObject().getFormattedData() #security.declarePublic('history') - - def history(self): """history""" @@ -1624,6 +1620,11 @@ class CDLIFile(extVersionedFile,CatalogA #return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] + def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None): + """factory for content objects. to be overridden in derived classes.""" + return CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) + + def addCDLIFileObjectForm(self): """add a new version""" @@ -1649,58 +1650,27 @@ class CDLIFile(extVersionedFile,CatalogA except: pass - - if changeName=="yes": - filename=file.filename - self.title=filename[max(filename.rfind('/'), - filename.rfind('\\'), - filename.rfind(':'), - )+1:] + ob = self.addContentObject(id, vC, author, file, title, changeName=changeName, newName=newName, from_tmp=from_tmp, + precondition=precondition, content_type=content_type) - - if not newName=='': - self.title=newName[0:] - - - - - positionVersionNum=getattr(self,'positionVersionNum','front') - - if positionVersionNum=='front': - id="V%i"%self.getVersion()+"_"+self.title - else: - tmp=os.path.splitext(self.title) - if len(tmp)>1: - id=tmp[0]+"_V%i"%self.getVersion()+tmp[1] - else: - id=tmp[0]+"_V%i"%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() + #FIXME: wozu ist das gut? + self.REQUEST.SESSION['objID_parent']=self.getId() except: - pass + pass if RESPONSE: - - obj=self.ZopeFind(self,obj_ids=[id])[0][1] - if obj.getSize()==0: - self.REQUEST.SESSION['objID']=obj.getId() + if ob.getSize()==0: + self.REQUEST.SESSION['objID']=ob.getId() pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) return pt() - else: if come_from and (come_from!=""): - RESPONSE.redirect(come_from+"?change="+self.getId()) + RESPONSE.redirect(come_from+"?change="+self.getId()) else: RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) - else: - return self.ZopeFind(self,obj_ids=[id])[0][1] + return ob def manage_addCDLIFileForm(self): @@ -1714,8 +1684,6 @@ def manage_addCDLIFile(self,id,title,loc tryToggle=True tryCount=0 - - self._setObject(id,newObj) getattr(self,id).reindex_object() @@ -1806,12 +1774,14 @@ class CDLIFileFolder(extVersionedFileFol security=ClassSecurityInfo() meta_type="CDLI Folder" - filesMetaType=['CDLI file'] - folderMetaType=['CDLI Folder'] + file_meta_type=['CDLI file'] + folder_meta_type=['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""" @@ -1833,7 +1803,7 @@ class CDLIFileFolder(extVersionedFileFol ids=[ids] cut=self.manage_cutObjects(ids) trash.manage_pasteObjects(cut) - + def getVersionNumbersFromIds(self,ids): """get the numbers of the current versions of documents described by their ids""" @@ -1843,7 +1813,7 @@ class CDLIFileFolder(extVersionedFileFol founds=self.CDLICatalog.search({'title':searchStr}) for found in founds: - lastVersion=found.getObject().getLastVersion() + lastVersion=found.getObject().getContentObject() ret.append((found.getId,lastVersion)) return ret @@ -1854,7 +1824,7 @@ class CDLIFileFolder(extVersionedFileFol if not founds: return "" else: - obj=founds[0].getObject().getLastVersion() + obj=founds[0].getObject().getContentObject() return obj.getData()[0:] @@ -1982,7 +1952,7 @@ class CDLIFileFolder(extVersionedFileFol #os.write(tf,obj.getLastVersion().data) if RESPONSE: - RESPONSE.write(obj.getLastVersion().getData()[0:]) + RESPONSE.write(obj.getData()[0:]) RESPONSE.write("\n") self.temp_folder.downloadCounter-=1 self._p_changed=1 @@ -2002,7 +1972,7 @@ class CDLIFileFolder(extVersionedFileFol def hasParent(self): """returns true falls subfolder""" - if self.aq_parent.meta_type in self.folderMetaType: + if self.aq_parent.meta_type in self.folder_meta_type: return True else: return False @@ -2010,11 +1980,11 @@ class CDLIFileFolder(extVersionedFileFol def getFolders(self): """get all subfolders""" ret=[] - folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType) + folders=self.ZopeFind(self,obj_metatypes=self.folder_meta_type) for folder in folders: ret.append((folder[1], - len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)), - len(self.ZopeFind(folder[1],obj_metatypes=self.filesMetaType)) + len(self.ZopeFind(folder[1],obj_metatypes=self.folder_meta_type)), + len(self.ZopeFind(folder[1],obj_metatypes=self.file_meta_type)) )) return ret @@ -2078,10 +2048,8 @@ class CDLIRoot(Folder): manage_addCDLIFileFolder(self, '.trash',title="Trash") trash=self._getOb('.trash') else: - logging.info(found) trash=found[0][1] - for id in ids: founds=self.CDLICatalog.search({'title':id.split(".")[0]}) if founds: @@ -2235,7 +2203,7 @@ class CDLIRoot(Folder): if wholePage: logging.info("whole") - return f[0].getObject().getLastVersion().view() + return f[0].getObject().getContentObject().view() else: return f[0].getObject().getLastVersionFormattedData() @@ -2244,7 +2212,7 @@ class CDLIRoot(Folder): """get lines with word fromFileId""" file=self.showFile(fileId) - logging.info("regEXP %s"%regExp) + logging.info("regEXP %s"%regExp) ret=[] if regExp: # wenn regexp dann generiere alle worte aus der list die der regexp entsprechen wordlist=self.findWordRegExp(indexName,word)