r13606 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget: . browser

"Alain Meurant" <[email protected]> Wed, 04 May 2011 09:19:48 +0000
Newsgroups gmane.comp.web.zope.plone.archetypes.cvs
Message-ID <[email protected]>
Author: ameurant
Date: Wed May  4 09:19:48 2011
New Revision: 13606

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/browser/view.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/widget.py
Log:
ajout du wildcard refs #2

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/browser/view.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/browser/view.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/browser/view.py	Wed May  4 09:19:48 2011
@@ -98,6 +98,7 @@
     def __call__(self, show_all=0,
                  quote_logic=0,
                  quote_logic_indexes=['SearchableText'],
+                 wild_card_search=False,
                  search_catalog=None):
 
         results=[]
@@ -131,7 +132,13 @@
 # doesn't normal call catalog unless some field has been queried
 # against. if you want to call the catalog _regardless_ of whether
 # any items were found, then you can pass show_all=1.
-
+        if wild_card_search: 
+            try:
+                query['SearchableText'] = '*' + query['SearchableText'] + '*'
+            except:
+                #in case saerchableText is not present
+                pass
+ 
         if show_query:
             try:
                 results = catalog(**query)
@@ -233,7 +240,7 @@
                                  name='refbrowser_querycatalog')
             result = (self.widget.show_results_without_query or \
                       self.search_text) and \
-                      qc(search_catalog=self.widget.search_catalog)
+                      qc(wild_card_search=self.widget.wild_card_search, search_catalog=self.widget.search_catalog)
 
             self.has_queryresults = bool(result)
 

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/widget.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/widget.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/livesearch/src/archetypes/referencebrowserwidget/widget.py	Wed May  4 09:19:48 2011
@@ -39,6 +39,7 @@
         'popup_width': 500,
         'popup_height': 550,
         'popup_name': 'popup',
+        'wild_card_search' : False
         })
 
     # for documentation of properties see: README.txt
@@ -152,4 +153,8 @@
 registerPropertyType('image_portal_types', 'lines', ReferenceBrowserWidget)
 registerPropertyType('image_method', 'string', ReferenceBrowserWidget)
 registerPropertyType('force_close_on_insert',
-                     'boolean', ReferenceBrowserWidget)
+                     'boolean', ReferenceBrowserWidget) 
+registerPropertyType('wild_card_search',
+                     'boolean', ReferenceBrowserWidget) 
+                     
+                     

------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network 
management toolset available today.  Delivers lowest initial 
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd