--- cdli/cdli_files.py	2006/10/16 13:21:23	1.50
+++ cdli/cdli_files.py	2006/11/15 13:57:13	1.52
@@ -691,16 +691,18 @@ class CDLIBasketContainer(OrderedFolder)
         self.id=id
         self.title=title
      
+ 
     def getBasketsId(self):
         """get all baskets als klartext"""
-	ret=""
+        
+        ret=""
         baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket'])
         for basket in baskets:
             com,user,time,values = basket[1].getContentIds()
             ret+= "BASKET:"+com+"\t"+user+"\t"+time+"\n"
             for x in values:
                 ret+= x[0]+"\t"+x[1]+"\n"
-	return ret
+		return ret
 
     def getBaskets(self,sortField='title'):
         """get all baskets files"""
@@ -1005,11 +1007,14 @@ class CDLIBasket(Folder,CatalogAware):
     
         return added
     
+    
+                
+    
     def getContentIds(self):
         """print basket content"""
         ret=[]
         lv=self.getLastVersion()
-	for obj in lv.content.getContent():
+        for obj in lv.content.getContent():
             ret.append((obj[0].getId(),obj[1].getId()))
         
         
@@ -1302,7 +1307,12 @@ class CDLIFileObject(CatalogAware,extVer
         return True
     
     security.declarePublic('view')
-                                        
+ 
+    def getFormattedData(self):
+        """fromat text"""
+        data=self.getData()
+        return re.sub("\s\#lem"," #lem",data) #remove return vor #lem
+        
     def view(self):
         """view file"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
@@ -1384,6 +1394,17 @@ class CDLIFile(extVersionedFile,CatalogA
     default_catalog='CDLICatalog'
     
     #security.declarePublic('history')
+    def getLastVersionData(self):
+        """get last version data"""
+        return self.getLastVersion().getData()
+
+    def getLastVersionFormattedData(self):
+        """get last version data"""
+        return self.getLastVersion().getFormattedData()
+
+    #security.declarePublic('history')
+    
+    
     def history(self):
         """history"""  
 
@@ -1840,6 +1861,16 @@ class CDLIRoot(Folder):
     
     meta_type="CDLIRoot"
     downloadCounterBaskets=0# counts the current basket downloads if counter > 10 no downloads are possible
+    
+
+    def showFile(self,fileId):
+        """show a file"""
+        f=self.CDLICatalog({'title':fileId})
+        if not f:
+            return ""
+        
+        return f[0].getObject().getLastVersionFormattedData()
+        
     def URLquote(self,str):
         """quote url"""
         return urllib.quote(str)