[CMF-checkins] CVS: CMF/CMFDefault - Document.py:1.59 NewsItem.py:1.21

Yvo Schubbe schubbe@web.de
Tue, 15 Jul 2003 11:51:28 -0400


Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv9258/CMFDefault

Modified Files:
	Document.py NewsItem.py 
Log Message:
Merged yuppie-collector168-redo-branch:
- Un-hardwired manage_FTPget for 'text/html'. (Collector #168)
- Some cleanup.

=== CMF/CMFDefault/Document.py 1.58 => 1.59 ===
--- CMF/CMFDefault/Document.py:1.58	Sat Jun 28 12:31:21 2003
+++ CMF/CMFDefault/Document.py	Tue Jul 15 11:50:51 2003
@@ -18,6 +18,7 @@
 from StructuredText.HTMLWithImages import HTMLWithImages
 from Globals import DTMLFile, InitializeClass
 from AccessControl import ClassSecurityInfo, getSecurityManager
+from Acquisition import aq_base
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.PortalContent import NoWL, ResourceLockedError
@@ -43,7 +44,8 @@
   , 'factory'        : 'addDocument'
   , 'immediate_view' : 'metadata_edit_form'
   , 'aliases'        : {'(Default)':'document_view',
-                        'view':'document_view'}
+                        'view':'document_view',
+                        'gethtml':'source_html'}
   , 'actions'        : ( { 'id'            : 'view' 
                          , 'name'          : 'View'
                          , 'action': 'string:${object_url}/document_view'
@@ -384,29 +386,40 @@
         ' <title>%(title)s</title>\n'
        '%(metatags)s\n'
         ' </head>\n'
-        ' <body>\n%(body)s\n </body>\n'
+        ' <body>%(body)s</body>\n'
         '</html>\n'
         )
 
     security.declareProtected(View, 'manage_FTPget')
     def manage_FTPget(self):
         "Get the document body for FTP download (also used for the WebDAV SRC)"
-        hdrlist = self.getMetadataHeaders()
         if self.Format() == 'text/html':
-            hdrtext = ''
-            for name, content in hdrlist:
-                if name.lower() == 'title':
-                    continue
+            ti = self.getTypeInfo()
+            method_id = ti and ti.getMethodURL('gethtml') or None
+            if method_id:
+                method = getattr(self, method_id)
+                if getattr(aq_base(method), 'isDocTemp', 0):
+                    bodytext = method(self, self.REQUEST)
                 else:
-                    hdrtext = '%s\n <meta name="%s" content="%s" />' % (
-                        hdrtext, name, content)
-
-            bodytext = self._htmlsrc % {
-                'title': self.Title(),
-                'metatags': hdrtext,
-                'body': self.EditableBody(),
-                }
+                    bodytext = method()
+            else:
+                # Use the old code as fallback. May be removed some day.
+                hdrlist = self.getMetadataHeaders()
+                hdrtext = ''
+                for name, content in hdrlist:
+                    if name.lower() == 'title':
+                        continue
+                    else:
+                        hdrtext = '%s\n <meta name="%s" content="%s" />' % (
+                            hdrtext, name, content)
+
+                bodytext = self._htmlsrc % {
+                    'title': self.Title(),
+                    'metatags': hdrtext,
+                    'body': self.EditableBody(),
+                    }
         else:
+            hdrlist = self.getMetadataHeaders()
             hdrtext = formatRFC822Headers( hdrlist )
             bodytext = '%s\r\n\r\n%s' % ( hdrtext, self.text )
 


=== CMF/CMFDefault/NewsItem.py 1.20 => 1.21 ===
--- CMF/CMFDefault/NewsItem.py:1.20	Sat Jun 28 12:31:21 2003
+++ CMF/CMFDefault/NewsItem.py	Tue Jul 15 11:50:51 2003
@@ -36,7 +36,8 @@
   , 'factory'        : 'addNewsItem'
   , 'immediate_view' : 'metadata_edit_form'
   , 'aliases'        : {'(Default)':'newsitem_view',
-                        'view':'newsitem_view'}
+                        'view':'newsitem_view',
+                        'gethtml':'source_html'}
   , 'actions'        : ( { 'id'            : 'view'
                          , 'name'          : 'View'
                          , 'action': 'string:${object_url}/newsitem_view'