[Erp5-report] r44276 ivan - in /erp5/trunk/bt5/erp5_km_sphinxse_full_text_search: SkinTempl...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Mar 15 09:48:14 2011
New Revision: 44276

URL: http://svn.erp5.org?rev=44276&view=rev
Log:
Return 'version' & 'language' in search results.

Modified:
    erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_getFullTextSearchResultList.xml
    erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_zGetAdvancedSearchResultList.xml
    erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/bt/revision

Modified: erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_getFullTextSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_getFullTextSearchResultList.xml?rev=44276&r1=44275&r2=44276&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_getFullTextSearchResultList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_getFullTextSearchResultList.xml [utf8] Tue Mar 15 09:48:14 2011
@@ -117,6 +117,8 @@ else:\n
                                 \'reference\': line[\'reference\'],\n
                                 \'category_relative_url\': line[\'category_relative_url\'],\n
                                 \'owner\': line[\'owner\'],\n
+                                \'version\': line[\'version\'],\n
+                                \'language\': line[\'language\'],\n
                                 \'web_site\': web_site.getRelativeUrl()})\n
   \n
   # one document can belong to n categories, we need show only one doc\n

Modified: erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_zGetAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_zGetAdvancedSearchResultList.xml?rev=44276&r1=44275&r2=44276&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_zGetAdvancedSearchResultList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/SkinTemplateItem/portal_skins/erp5_km_sphinxse_full_text_search/WebSite_zGetAdvancedSearchResultList.xml [utf8] Tue Mar 15 09:48:14 2011
@@ -28,11 +28,11 @@
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>base_category_uid_list\r\n
-kw\r\n
-search_string\r\n
-is_full_text_search_on\r\n
-use_text_excerpts\r\n
+            <value> <string>base_category_uid_list\n
+kw\n
+search_string\n
+is_full_text_search_on\n
+use_text_excerpts\n
 </string> </value>
         </item>
         <item>
@@ -90,9 +90,12 @@ SELECT catalog.uid, \n
        <dtml-if is_full_text_search_on> text, </dtml-if>\n
        category_uid,\n
        base_category_uid,\n
-       category_relative_url\n
+       category_relative_url,\n
+       versioning.version,\n
+       versioning.language\n
 \n
 FROM  catalog,\n
+      versioning,\n
       (SELECT catalog.uid\n
               <dtml-if is_full_text_search_on>\n
                 <dtml-if use_text_excerpts>\n
@@ -141,7 +144,7 @@ FROM  catalog,\n
             ) AS join_category\n
             ON search_results.uid = join_category.join_category_uid\n
 \n
-WHERE search_results.uid = catalog.uid\n
+WHERE search_results.uid = catalog.uid and versioning.uid = catalog.uid\n
 \n
 </dtml-let>
 

Modified: erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/bt/revision?rev=44276&r1=44275&r2=44276&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_sphinxse_full_text_search/bt/revision [utf8] Tue Mar 15 09:48:14 2011
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file