--- versionedFile/extVersionedFile.py	2008/10/01 15:59:01	1.27
+++ versionedFile/extVersionedFile.py	2009/06/21 11:28:55	1.32
@@ -3,6 +3,7 @@ using the ExtFile Product, this version
 DW 11.10.2006
 """
 
+import email
 from OFS.Folder import Folder
 from OFS.Image import File
 from OFS.Image import cookId
@@ -142,6 +143,19 @@ class extVersionedFileFolder(Folder,ECHO
         )
 
     
+    def redirect(self,RESPONSE,url):
+        """mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen"""
+        
+        timeStamp=time.time()
+        
+        if url.find("?")>-1: #giebt es schon parameter
+            addStr="&time=%s"
+        else:
+            addStr="?time=%s"
+            
+        RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
+        logging.error(email.Utils.formatdate()+' GMT')
+        RESPONSE.redirect(url+addStr%timeStamp)
     def changeHistoryFileNamesForm(self):
         """change position of version num"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self)
@@ -631,7 +645,13 @@ class extVersionedFileObject(ExtFile):
         #logging.debug("+++++++getData1:"+repr(self.get_filename()))
         filename = self.get_filename()
         #return ExtFile.index_html(self)
-        return file(filename).read()
+        try:
+            logging.info("readfile:"+filename)
+            return file(filename).read()
+        except:
+            logging.info("cannot readfile:"+filename)
+            return ExtFile.index_html(self)
+
     
     def getFileName(self):
         """return filename"""
@@ -947,12 +967,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):
@@ -1014,7 +1034,20 @@ class extVersionedFile(CatalogAware,Fold
         #return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor())
         return self.history()
 
-    
+    def getVersionNr(self,nr):
+        """get version with number nr"""
+        tmp=0
+        lastVersion=None
+        
+        
+        for version in self.ZopeFind(self):
+            
+            if hasattr(version[1],'versionNumber'):
+                
+                if int(version[1].versionNumber) ==nr :
+                    return version[1]
+           
+        return None
     security.declarePublic('getVersion')                                              
     def getVersion(self):
         # TODO: this is ugly and it returns the next version number 
@@ -1059,14 +1092,23 @@ class extVersionedFile(CatalogAware,Fold
         return vl
 
     security.declareProtected('AUTHENTICATED_USER','forceunlock')   
-    def forceunlock(self,RESPONSE=None):
+    def forceunlock(self,RESPONSE=None,user=None):
         """unlock"""
         #safe who had the lock
+        logging.debug("extVersionFile: (forceunlock)"+str(user))
         if self.lockedBy:
-            self.brokenLock=str(self.lockedBy)
+            if user is not None:
+                if str(self.lockedBy)==user:
+                    self.brokenLock=str(self.lockedBy)
+                    self.lockedBy=''
+                else:
+                    self.brokenLock=""
+            else:
+                self.brokenLock=str(self.lockedBy)
+                self.lockedBy=''
         else:
             self.brokenLock=""
-        self.lockedBy=''
+        
         return self.brokenLock
 
     security.declareProtected('AUTHENTICATED_USER','unlock')   
@@ -1074,7 +1116,7 @@ class extVersionedFile(CatalogAware,Fold
         """unlock"""
         if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]:
             self.lockedBy=''
-            RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])
+            self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER'],)
         else:
             return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER'])