[Erp5-report] r14828 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Jun 14 15:55:54 2007
New Revision: 14828

URL: http://svn.erp5.org?rev=14828&view=rev
Log:
It's possible to specify 'reference' directly in preferred re pattern.
This method of determining document's reference has highest priority overall.

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getPropertyDictFromFileName.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getPropertyDictFromFileName.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getPropertyDictFromFileName.xml?rev=14828&r1=14827&r2=14828&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getPropertyDictFromFileName.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getPropertyDictFromFileName.xml Thu Jun 14 15:55:54 2007
@@ -90,6 +90,7 @@
 language = property_dict.get(\'language\', \'en\')\n
 version = property_dict.get(\'version\', \'001\')\n
 local_id = property_dict.get(\'local_id\', \'undefined\')\n
+reference = property_dict.get(\'reference\', None)\n
 group_reference_path = property_dict.get(\'group_reference_path\', None)\n
 source_conference_reference = property_dict.get(\'source_conference_reference\', None)\n
 source_project_reference = property_dict.get(\'source_project_reference\', None)\n
@@ -97,7 +98,11 @@
 new_dict = dict(language = language, \n
                 version = version)\n
 \n
-if source_project_reference:\n
+if reference:\n
+  # we get directly extracted reference in property_dict (from re pattern)\n
+  # this method has highest priority\n
+  pass\n
+elif source_project_reference:\n
   # generate document\'s reference using project reference\n
   reference = \'P-%s-%s\' %(source_project_reference, local_id)\n
   project = context.portal_catalog.getResultValue(reference = source_project_reference,\n
@@ -197,12 +202,12 @@
                             <string>version</string>
                             <string>local_id</string>
                             <string>None</string>
+                            <string>reference</string>
                             <string>group_reference_path</string>
                             <string>source_conference_reference</string>
                             <string>source_project_reference</string>
                             <string>dict</string>
                             <string>new_dict</string>
-                            <string>reference</string>
                             <string>context</string>
                             <string>project</string>
                             <string>conference</string>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=14828&r1=14827&r2=14828&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Thu Jun 14 15:55:54 2007
@@ -1,1 +1,1 @@
-655
+658