[Erp5-report] r12575 - in /erp5/trunk/bt5/erp5_dms: ExtensionTemplateItem/ SkinTemplateItem...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 7 18:17:29 CET 2007
Author: bartek
Date: Wed Feb 7 18:17:24 2007
New Revision: 12575
URL: http://svn.erp5.org?rev=12575&view=rev
Log:
Searchable Text stored in a dedicated selection.
Modified:
erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
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/ExtensionTemplateItem/documentUtils.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py?rev=12575&r1=12574&r2=12575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py (original)
+++ erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py Wed Feb 7 18:17:24 2007
@@ -60,7 +60,18 @@
return {}
return m.groupdict()
-def ofof(one, another):
- return one.__of__(another)
+def getLastWorkflowDate(self, state_name='simulation_state', state=('released','public')):
+ '''we can make something more generic out of it
+ or JP says "there is an API for it" and we trash this one'''
+ for name,wflow in self.workflow_history.items():
+ if len(wflow) == 0: continue # empty history
+ if wflow[0].get(state_name) is None: continue # not the right one
+ for i in range(len(wflow)):
+ ch = wflow[-1-i]
+ act = ch.get('action', '')
+ if act is not None and act.endswith('action'):
+ if ch.get(state_name, '') in state:
+ return ch['time']
+ return 0
# vim: syntax=python shiftwidth=2
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml?rev=12575&r1=12574&r2=12575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml Wed Feb 7 18:17:24 2007
@@ -74,7 +74,7 @@
The main search script. Receives one big string - a SearchableText, in\n
the search syntax, parses the string using external method parseSearchString,\n
then does the following:\n
-- processes arguments for searching by any category (this requires SQLCatalog patch)\n
+- processes arguments for searching by any category\n
- selects search mode\n
- adds creation and modification date clauses\n
- searches\n
@@ -90,9 +90,14 @@
# SearchableText can be supplied in request or stored in selection\n
sstr = context.REQUEST.get(\'SearchableText\')\n
\n
-if not sstr:\n
- sstr = kw.get(\'SearchableText\')\n
-\n
+if sstr:\n
+ context.portal_selections.setSelectionParamsFor(\'search_params_selection\', dict(SearchableText=sstr))\n
+else:\n
+ params = context.portal_selections.getSelectionParamsFor(\'search_params_selection\')\n
+ if params:\n
+ sstr = params.get(\'SearchableText\')\n
+\n
+context.log(sstr)\n
if not sstr: return []\n
\n
args = context.parseSearchString(sstr)\n
@@ -233,6 +238,8 @@
<string>_getattr_</string>
<string>context</string>
<string>sstr</string>
+ <string>dict</string>
+ <string>params</string>
<string>args</string>
<string>_getitem_</string>
<string>_write_</string>
@@ -243,7 +250,6 @@
<string>v</string>
<string>mode</string>
<string>modemap</string>
- <string>dict</string>
<string>cf</string>
<string>ct</string>
<string>mf</string>
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=12575&r1=12574&r2=12575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml Wed Feb 7 18:17:24 2007
@@ -91,7 +91,11 @@
txt = \'\'\n
\n
argument_names = (\'SearchableText\', \'SearchableText_any\', \'SearchableText_all\', \'SearchableText_phrase\')\n
-search_string = \' \'.join(selection.params.get(name, \'\') for name in argument_names)\n
+\n
+# a quick hack because sometimes we get a list\n
+params = [selection.params.get(name, \'\') for name in argument_names]\n
+params = [(hasattr(par, \'sort\') and \'\'.join(par) or par) for par in params]\n
+search_string = \' \'.join(params)\n
\n
if not search_string:\n
# if the searched text is empty (e.g. because the listbox uses its own method)\n
@@ -161,6 +165,13 @@
<string>txt</string>
<string>AttributeError</string>
<string>argument_names</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>name</string>
+ <string>params</string>
+ <string>par</string>
+ <string>hasattr</string>
<string>search_string</string>
<string>_getitem_</string>
<string>context</string>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=12575&r1=12574&r2=12575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Wed Feb 7 18:17:24 2007
@@ -1,1 +1,1 @@
-502
+503
More information about the Erp5-report
mailing list