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

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Jan 22 13:19:39 2009
New Revision: 25254

URL: http://svn.erp5.org?rev=25254&view=rev
Log:
Check if text exists before trying to get a random excerpt from it.

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

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml?rev=25254&r1=25253&r2=25254&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml [utf8] Thu Jan 22 13:19:39 2009
@@ -66,11 +66,12 @@
 \n
 def getRandomDocumentTextExcerpt():\n
   # try to get somewhat arbitrary choice of searchable attrs\n
-  start = min(len(document_text) - 300, 200)\n
-  if is_gadget_mode:\n
-    # in gadget mode less space is available thus show less text\n
-    max_text_length = 100\n
-  return \'%s ...\' %document_text[start:start + max_text_length]\n
+  if isinstance(document_text, str) and document_text!=\'\':\n
+    start = min(len(document_text) - 300, 200)\n
+    if is_gadget_mode:\n
+      # in gadget mode less space is available thus show less text\n
+      max_text_length = 100\n
+    return \'%s ...\' %document_text[start:start + max_text_length]\n
 \n
 # get search words from listbox selection\n
 argument_names = (\'advanced_search_text\', \n
@@ -83,7 +84,6 @@
 \n
 if document_text is None:\n
   # convert object to text (if possible)\n
-  document_text = \'\'\n
   if getattr(context, \'asText\', None) is not None and \\\n
       getattr(context, \'hasBaseData\', None) is not None:\n
     if context.hasBaseData():\n
@@ -108,7 +108,7 @@
   return getRandomDocumentTextExcerpt()\n
 \n
 search_argument_list = context.Base_parseSearchString(search_string)\n
-search_words = search_argument_list.get(\'searchabletext\')\n
+search_words = search_argument_list.get(\'searchabletext\', None)\n
 \n
 if search_words in (\'\', None,):\n
   # the searched words are empty (e.g. because we used only parameters \n

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=25254&r1=25253&r2=25254&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Thu Jan 22 13:19:39 2009
@@ -1,1 +1,1 @@
-950
+952