[Erp5-report] r26411 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: romain
Date: Tue Apr 14 16:20:46 2009
New Revision: 26411

URL: http://svn.erp5.org?rev=26411&view=rev
Log:
Do not extract text if no search words are found.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml?rev=26411&r1=26410&r2=26411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml [utf8] Tue Apr 14 16:20:46 2009
@@ -68,23 +68,27 @@
   params = context.portal_selections.getSelectionParamsFor(\'search_result_selection\')\n
 search_words = params.get(\'your_search_text\')\n
 \n
-if document_text is None:\n
-  document_text = context.getSearchableText()\n
+if search_words is None:\n
+  return \'\'\n
+else:\n
 \n
-found_text_fragments = context.Base_getExcerptText(\n
-                         context, \\\n
-                         document_text, \\\n
-                         search_words, \\\n
-                         tags = (\'<em>\', \'</em>\'), \\\n
-                         trail = 5, \\\n
-                         maxlines = max_lines)\n
-result = \' \'.join(map(str, found_text_fragments))\n
+  if document_text is None:\n
+    document_text = context.getSearchableText()\n
 \n
-# Document may contains charactors which utf8 codec cannot decode.\n
-unicode_result = result.decode(\'utf-8\', \'ignore\')\n
-result = unicode_result.encode(\'utf-8\')\n
+  found_text_fragments = context.Base_getExcerptText(\n
+                           context, \\\n
+                           document_text, \\\n
+                           search_words, \\\n
+                           tags = (\'<em>\', \'</em>\'), \\\n
+                           trail = 5, \\\n
+                           maxlines = max_lines)\n
+  result = \' \'.join(map(str, found_text_fragments))\n
 \n
-return result\n
+  # Document may contains charactors which utf8 codec cannot decode.\n
+  unicode_result = result.decode(\'utf-8\', \'ignore\')\n
+  result = unicode_result.encode(\'utf-8\')\n
+\n
+  return result\n
 
 
 ]]></string> </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=26411&r1=26410&r2=26411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Apr 14 16:20:46 2009
@@ -1,1 +1,1 @@
-1151
+1153