--- versionedFile/versionedFile.py	2004/03/22 15:46:07	1.1.1.1
+++ versionedFile/versionedFile.py	2004/06/04 08:10:26	1.4
@@ -20,13 +20,26 @@ class versionedFileFolder(Folder):
     
     def getVersionedFiles(self):
         """get all versioned files"""
-        versionedFiles=self.ZopeFind(self,obj_metatypes="versionedFiles")
-        print versionedFiles
+        
+	versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile'])
+       
         return versionedFiles
 
-    
+
+    def header_html(self):
+        """zusätzlicher header"""
+        ext=self.ZopeFind(self,obj_ids=["header.html"])
+        if ext:
+            return ext[0][1]()
+        else:
+            return ""
+        
     def index_html(self):
         """main"""
+        ext=self.ZopeFind(self,obj_ids=["index.html"])
+        if ext:
+            return ext[0]
+        
         pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self)
         return pt()
 
@@ -45,8 +58,8 @@ 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)
+        file2=file
+        ob.manage_addVersionedFileObject(id,vC,file2,content_type=content_type)
 
         RESPONSE.redirect(self.REQUEST['URL1'])
 
@@ -120,12 +133,12 @@ def manage_addVersionedFileObject(self,i
     """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)
     precondition=str(precondition)
-
+    
     id, title = cookId(id, title, file)
 
     self=self.this()
@@ -162,11 +175,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 +194,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 +221,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 +232,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)