--- versionedFile/extVersionedFile.py 2008/08/19 14:43:25 1.26 +++ versionedFile/extVersionedFile.py 2008/10/09 07:44:34 1.29 @@ -628,8 +628,26 @@ class extVersionedFileObject(ExtFile): def getData(self): """returns object content (calls ExtFile.index_html)""" - return ExtFile.index_html(self) - + #logging.debug("+++++++getData1:"+repr(self.get_filename())) + filename = self.get_filename() + #return ExtFile.index_html(self) + try: + return file(filename).read() + except: + return ExtFile.index_html(self) + + + def getFileName(self): + """return filename""" + return self.get_filename() + + def addToFile(self,filehandle): + filehandle.write(self.getData()) + + def addToFile2(self,filename): + str="cat %s > %s"%(self.get_filename(),filename) + os.popen(str) + security.declarePublic('getVComment') def getVComment(self): """get the comment of this file""" @@ -933,12 +951,12 @@ class extVersionedFile(CatalogAware,Fold lv=None for v in self.objectValues(self.content_meta_type): - logging.debug("getlastversion: check %s"%v.getId()) + #logging.debug("getlastversion: check %s"%v.getId()) if v.getVersionNumber() > tmp: tmp=v.getVersionNumber() lv=v - logging.debug("getlastversion: got %s"%lv.getId()) + #ogging.debug("getlastversion: got %s"%lv.getId()) return lv def getContentObject(self): @@ -956,6 +974,7 @@ class extVersionedFile(CatalogAware,Fold security.declarePublic('getData') def getData(self): """Returns the content of the last version""" + logging.debug("+++++++getData2") ob = self.getContentObject() if ob is not None: return ob.getData()