[Erp5-report] r14434 - /erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widg...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed May  9 17:35:08 2007
New Revision: 14434

URL: http://svn.erp5.org?rev=14434&view=rev
Log:
Explicitly call 'discoverMetadata' on contributed document.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml?rev=14434&r1=14433&r2=14434&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml Wed May  9 17:35:08 2007
@@ -87,14 +87,32 @@
 if contribute_file is not None:\n
   kw[\'file\'] = contribute_file\n
 \n
-# We want to discover metadata synchronously \n
-kw[\'discover_metadata\'] = 0 \n
-\n
-new_content = context.portal_contributions.newContent(**kw)\n
-msg = context.Base_translateString(\'Document successfully created\')\n
-\n
-return new_content.Base_redirect(\'view\', \n
-                                 keep_items=dict(portal_status_message=msg, editable_mode=1))\n
+kw[\'discover_metadata\'] = 0 # We want to discover metadata synchronously\n
+\n
+#try:\n
+if 1:\n
+  new_content = context.portal_contributions.newContent(**kw)\n
+  if hasattr(contribute_file, \'filename\'):\n
+    file_name = contribute_file.filename\n
+  else:\n
+    file_name = None\n
+\n
+  merged_content = new_content.discoverMetadata(file_name=file_name) # Consider putting an exception handler\n
+  if merged_content is not new_content:\n
+    msg = context.Base_translateString(\'Document successfully updated\')\n
+    target = merged_content\n
+  else:\n
+    msg = context.Base_translateString(\'Document successfully created\')\n
+    target = new_content\n
+  editable_mode = 1\n
+else:\n
+#except Exception, e:\n
+  msg = \'There was a problem: ${exception}\'\n
+  msg = context.Base_translateString(msg, mapping=dict(exception=str(e)))\n
+  target = context\n
+  editable_mode = 0\n
+\n
+return target.Base_redirect(\'view\', keep_items=dict(portal_status_message=msg, editable_mode=editable_mode))\n
 </string> </value>
         </item>
         <item>
@@ -105,6 +123,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -148,8 +172,15 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>new_content</string>
+                            <string>hasattr</string>
+                            <string>file_name</string>
+                            <string>merged_content</string>
                             <string>msg</string>
+                            <string>target</string>
+                            <string>editable_mode</string>
                             <string>dict</string>
+                            <string>str</string>
+                            <string>e</string>
                           </tuple>
                         </value>
                     </item>