--- basket/basket.py	2006/04/06 16:49:14	1.8
+++ basket/basket.py	2006/04/18 09:48:26	1.12
@@ -39,6 +39,16 @@ class BasketBasis(OrderedFolder):
     
     security=ClassSecurityInfo()
     
+    def content_html(self,type):
+        """generische ausgabe des objectes als html"""
+        if hasattr(self,type+"_template"):
+            obj=getattr(self,type+"_template")
+            return obj()
+        else:
+            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','%s_template_standard.zpt'%type)).__of__(self)
+            pt.content_type="text/html"
+            return pt()
+    
     def checkPermission(self,modus):
         """check permission"""
         if modus=='open':
@@ -278,7 +288,7 @@ class Basket(BasketBasis):
         """return the save button"""
         ret="""
         <a class="editLink" style="cursor:pointer"
-                    'onClick="forms.changeSetContents.actualId.value='%s';forms.changeSetContents.submit();">save</a> -
+                    onClick="forms.changeSetContents.actualId.value='%s';forms.changeSetContents.submit();">save</a> -
     
         """%actualId
         return ret
@@ -544,13 +554,19 @@ class BasketFile(BasketObject,File):
     
     def download(self):
         """download the file"""
+
         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.title)
         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
    
         self.content_type="application/octet-stream"
-        self.REQUEST.RESPONSE.write(self.data)
-        
-    
+	try:
+        	self.REQUEST.RESPONSE.write(self.data)
+        except:
+		try:
+			self.REQUEST.RESPONSE.write(str(self.data))
+		except:
+			self.REQUEST.RESPONSE.write(repr(self.data))
+
     def upDateFile(self,fileUpload=None,comment=None,title="",REQUEST=None):
         """update file"""
         
@@ -577,7 +593,7 @@ class BasketFile(BasketObject,File):
         """format object as html fragment"""
         
         
-        return BasketBasis.content_html(self,"BasketFile")
+        return BasketObject.content_html(self,"BasketFile")
     
 def manage_addBasketFile(self,id,title,comment,fileUpload,content_type='',precondition='',REQUEST=None):
     """add a basket file"""
@@ -638,7 +654,7 @@ class BasketXRef(BasketObject):
         """format object as html fragment"""
         
         type=self.xref[0:3]
-        return BasketBasis.content_html(self,"BasketXRef_%s"%type)
+        return BasketObject.content_html(self,"BasketXRef_%s"%type)
     
 def manage_addBasketXRefForm(self):
     """form for adding a basket"""
@@ -663,7 +679,7 @@ class BasketInternalLink(BasketObject):
     #security=ClassSecurityInfo()
     meta_type="BasketInternalLink"
     
-    manage_options=BasketBasis.manage_options+(
+    manage_options=BasketObject.manage_options+(
         {'label':'manage internal link','action':'changeBasketInternalLinkForm'},
         )
  
@@ -688,7 +704,7 @@ class BasketInternalLink(BasketObject):
     def content_html(self):
         """format object as html fragment"""
         
-        return BasketBasis.content_html(self,"BasketInternalLink")
+        return BasketObject.content_html(self,"BasketInternalLink")
     
     def linkToObject(self):
         """link to the object (internalLink)"""
@@ -719,7 +735,7 @@ class BasketExternalLink(BasketObject):
     #security=ClassSecurityInfo()
     meta_type="BasketExternalLink"
     
-    manage_options=BasketBasis.manage_options+(
+    manage_options=BasketObject.manage_options+(
         {'label':'manage internal link','action':'changeBasketExternalLinkForm'},
         )
  
@@ -744,7 +760,7 @@ class BasketExternalLink(BasketObject):
     def content_html(self):
         """format object as html fragment"""
         
-        return BasketBasis.content_html(self,"BasketExternalLink")
+        return BasketObject.content_html(self,"BasketExternalLink")
     
     def linkToObject(self):
         """link to the object (externalLink)"""