--- versionedFile/versionedFile.py 2004/03/22 15:46:07 1.1 +++ versionedFile/versionedFile.py 2004/03/23 10:43:55 1.2 @@ -20,8 +20,9 @@ class versionedFileFolder(Folder): def getVersionedFiles(self): """get all versioned files""" - versionedFiles=self.ZopeFind(self,obj_metatypes="versionedFiles") - print versionedFiles + print "hi" + versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) + print "hi",versionedFiles return versionedFiles @@ -45,7 +46,7 @@ class versionedFileFolder(Folder): manage_addVersionedFile(self,id,'','') ob=self._getOb(id) ob.title=id - print "MYVC",vC + ob.manage_addVersionedFileObject(self,id,vC,file,content_type=content_type) RESPONSE.redirect(self.REQUEST['URL1']) @@ -162,11 +163,11 @@ class versionedFile(Folder): """Last Version""" tmp=0 lastVersion=None - print "FI",self.ZopeFind(self) + for version in self.ZopeFind(self): - print version + if hasattr(version[1],'versionNumber'): - print "HI",version[1].versionNumber + if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) lastVersion=version[1] @@ -181,9 +182,9 @@ class versionedFile(Folder): def getVersion(self): tmp=0 for version in self.ZopeFind(self): - print version + if hasattr(version[1],'versionNumber'): - print "HI",version[1].versionNumber + if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) return tmp+1 @@ -208,7 +209,7 @@ class versionedFile(Folder): def unlock(self,RESPONSE): """unlock""" - if str(self.lockedBy) in str(self.REQUEST['AUTHENTICATED_USER']): + if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: self.lockedBy='' RESPONSE.redirect(self.REQUEST['URL2']) else: @@ -219,8 +220,8 @@ class versionedFile(Folder): def addVersionedFileObjectForm(self): """add a new version""" - print self.REQUEST['AUTHENTICATED_USER'] - if str(self.REQUEST['AUTHENTICATED_USER']) in "Anonymous User": + + if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: return "please login first" if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self)