--- cdli/cdli_files.py	2009/06/05 07:30:11	1.107
+++ cdli/cdli_files.py	2009/06/24 11:13:47	1.112
@@ -343,7 +343,7 @@ def splitatf(fh,dir=None,ext=None):
     for lineTmp in iter:
         lineTmp=lineTmp.replace(codecs.BOM_UTF8,'') # make sure that all BOM are removed..
         for line in lineTmp.split("\r"):
-            #logging.log("Deal with: %s"%line)
+            #logging.info("Deal with: %s"%line)
             if ext:
                 i+=1
                 if (i%100)==0:
@@ -721,6 +721,19 @@ class CDLIRoot(Folder):
     splitter = {'words':cdliSplitter.wordSplitter(),
                 'graphemes':cdliSplitter.graphemeSplitter()}
     
+    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 unicodify(self,txt):
         return unicodify(txt)
@@ -756,7 +769,9 @@ class CDLIRoot(Folder):
         """view an Object"""
         ob = self.CDLICatalog({'title':id})
         if len(ob)>0:
-            RESPONSE.redirect(ob[0].getLastVersion().absolute_url())
+            logging.info("objekt:"+repr(ob[0]))
+            #RESPONSE.redirect(ob[0].getLastVersion().absolute_url())
+            RESPONSE.redirect(ob[0].absolute_url+"/download")
         return "not found"
     def addCDLIFileObjectForm(self,id,RESPONSE):
         """view an Object"""
@@ -779,10 +794,14 @@ class CDLIRoot(Folder):
             RESPONSE.redirect(ob[0].absolute_url+"/unlock")
         return "not found"
     
+    
     def getFileObject(self,fileId):
         """get an object"""
+        logging.debug("getFileObj:"+repr(fileId))
+        if isinstance(fileId,CDLIFileObject): # support for old baskets
+		          return fileId
         x=self.v_files.get(fileId)
-        #logging.debug(x)
+        
         return x
     
     def getFileObjectLastVersion(self,fileId):
@@ -1044,9 +1063,12 @@ class CDLIRoot(Folder):
     
             
         
-        
-    def forceunlock(self,REQUEST=None,user=None):
+        gen
+    def forceunlock(self,REQUEST=None,user=None,fid=None):
         "break all locks"
+        if fid is not None:
+            self.getFileObject(fid).forceunlock()
+            return fid
         ret=[]
         
         for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
@@ -1067,8 +1089,8 @@ class CDLIRoot(Folder):
         """hole alle gesperrten files"""
         ret={}
     
-        for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
-            lb = f[1].lockedBy
+        for nm,f in self.v_files.items():
+            lb = str(f.lockedBy)
             add=False
             if (lb is not None) and (lb!=""):
                
@@ -1080,7 +1102,7 @@ class CDLIRoot(Folder):
                 if add==True:
                     if not ret.has_key(lb):
                         ret[lb]=[]
-                    ret[lb].append(f[0])
+                    ret[lb].append(nm)
         
         
         if REQUEST is not None: