From c3cdcfc05c328d62878d7272868a5de99a6bfe87 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Tue, 2 Mar 2010 15:49:25 +0000
Subject: [PATCH] Handle all reference, language, version cases.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33289 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_dms/Base_getAdvancedSearchResultList.xml   | 13 ++++++++-----
 bt5/erp5_dms/bt/revision                            |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
index 9e65389db3..3805b4a4d5 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
@@ -100,9 +100,10 @@ parsed_searchabletext = parsed_search_string.get(\'searchabletext\', None)\n
 if parsed_searchabletext is not None: \n
   query_kw[\'full_text.SearchableText\'] =  parsed_searchabletext\n
 \n
-reference = parsed_search_string.get(\'reference\', None)\n
-if reference is not None:\n
-  query_kw[\'reference\'] = reference\n
+for key in (\'reference\', \'version\', \'language\',):\n
+  value = parsed_search_string.get(key, None)\n
+  if value is not None:\n
+    query_kw[key] = value\n
 \n
 where_expression_list = []\n
 creation_from = parsed_search_string.get(\'creation_from\', None)\n
@@ -139,6 +140,7 @@ if parsed_search_string.get(\'newest\'):\n
 else:\n
   result = portal.portal_catalog(**query_kw)\n
 \n
+context.log(portal.portal_catalog(src__=1, **query_kw))\n
 return result\n
 
 
@@ -194,7 +196,9 @@ return result\n
                             <string>len</string>
                             <string>_write_</string>
                             <string>parsed_searchabletext</string>
-                            <string>reference</string>
+                            <string>_getiter_</string>
+                            <string>key</string>
+                            <string>value</string>
                             <string>where_expression_list</string>
                             <string>creation_from</string>
                             <string>creation_to</string>
@@ -203,7 +207,6 @@ return result\n
                             <string>str</string>
                             <string>append</string>
                             <string>$append0</string>
-                            <string>_getiter_</string>
                             <string>_apply_</string>
                             <string>doc</string>
                             <string>result</string>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 7f2d3517e8..bf0a67dc5c 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-1083
\ No newline at end of file
+1084
\ No newline at end of file
-- 
2.30.9