[Erp5-report] r10728 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Oct 14 17:01:54 CEST 2006
Author: bartek
Date: Sat Oct 14 17:01:51 2006
New Revision: 10728
URL: http://svn.erp5.org?rev=10728&view=rev
Log:
fixed bugs remaining after function naming changes; removed some redundant logs.
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findPredecessors.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getSimilarityCloud.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_handleMail.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_ingestFile.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertAfter.xml
erp5/trunk/bt5/erp5_dms/bt/revision
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findPredecessors.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findPredecessors.xml?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findPredecessors.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_findPredecessors.xml Sat Oct 14 17:01:51 2006
@@ -78,6 +78,7 @@
ss.append(context.getReference()+\'-\'+context.getLanguage())\n
if context.getVersion() is not None:\n
ss.append(context.getReference()+\'-\'+context.getLanguage()+\'-\'+context.getVersion())\n
+context.log(ss)\n
lst=[]\n
for t in ss:\n
lst+=context.portal_catalog(SearchableText=\'%\'+t+\'%\')\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getSimilarityCloud.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getSimilarityCloud.xml?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getSimilarityCloud.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getSimilarityCloud.xml Sat Oct 14 17:01:51 2006
@@ -90,7 +90,7 @@
\n
getSimilarities(context)\n
if lista.has_key(context):lista.pop(context)\n
-return [o.DMSDocument_getLastVersion() for o in lista.keys()]\n
+return [o.DMSDocument_getLatestVersion() for o in lista.keys()]\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_handleMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_handleMail.xml?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_handleMail.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_handleMail.xml Sat Oct 14 17:01:51 2006
@@ -71,7 +71,7 @@
<value> <string encoding="cdata"><![CDATA[
#from Products.ERP5Type.Message import Message\n
-context.log(\'themail\',theMail)\n
+\n
noSenderInHeaderMsg="no sender in headers"\n
noSenderMsg="you are not in user database"\n
manySendersMsg="very serious error: your address has multiple entries"\n
@@ -157,13 +157,13 @@
<string>theMail</string>
<string>_print_</string>
<string>_print</string>
- <string>_getattr_</string>
- <string>context</string>
<string>noSenderInHeaderMsg</string>
<string>noSenderMsg</string>
<string>manySendersMsg</string>
<string>_getitem_</string>
<string>fromraw</string>
+ <string>_getattr_</string>
+ <string>context</string>
<string>senderemail</string>
<string>None</string>
<string>r</string>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_ingestFile.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_ingestFile.xml?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_ingestFile.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_ingestFile.xml Sat Oct 14 17:01:51 2006
@@ -77,14 +77,15 @@
else:\n
context.setSourceReference(fname)\n
if fname is not None:\n
+ context.log(fname)\n
context.setPropertyListFromFilename(fname)\n
context.guessMimeType(fname)\n
if not context.getTitle():\n
context.setTitle(fname)\n
# use duck typing to check if it is OOo\n
- if hasattr(context,\'convert\') and hasattr(context,\'hasFile\') and hasattr(context,\'hasOOfile\'):\n
+ if hasattr(context,\'convert\') and hasattr(context,\'hasFile\') and hasattr(context,\'hasOOFile\'):\n
context.reset()\n
- if context.hasFile() and not context.hasOOfile():\n
+ if context.hasFile() and not context.hasOOFile():\n
context.activate( activity = \'SQLQueue\').OOoDocument_convertAfter()\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertAfter.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertAfter.xml?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertAfter.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertAfter.xml Sat Oct 14 17:01:51 2006
@@ -69,14 +69,14 @@
<item>
<key> <string>_body</string> </key>
<value> <string>ob=context\n
-if ob.hasFile() and not ob.hasOOfile(): #doublecheck\n
+if ob.hasFile() and not ob.hasOOFile(): #doublecheck\n
try:\n
res=ob.convert()\n
ob.log(res)\n
- ob.setStatusMessage(str(res[1]))\n
+ ob.setExternalProcessingStatusMessage(str(res[1]))\n
except Exception,e:\n
ob.log(e)\n
- ob.setStatusMessage(str(e))\n
+ ob.setExternalProcessingStatusMessage(str(e))\n
#raise Exception(str(e)) # do we want the activity to keep trying?\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=10728&r1=10727&r2=10728&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Sat Oct 14 17:01:51 2006
@@ -1,1 +1,1 @@
-264
+273
More information about the Erp5-report
mailing list