Changeset 2308

Timestamp:

4 Oct 2007, 06:33:13 (17 years ago)

Author:

Henrik Bettermann

Message:

simplify search to improve speed

Location:

WAeUP_SRP/base/skins/waeup_default

Files:

• waeup_search.py (added)
• waeup_search_form.pt (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_default/waeup_search_form.pt

@@ -5 +5 @@
   <metal:block metal:fill-slot="main">
   <tal:block define="SearchableText python:request.get('SearchableText','');
-                     sort_by python:request.get('sort_by', '');
-                     direction python:request.get('direction', '');
-                     folder_prefix python:request.get('folder_prefix', '');
-                     items python:here.search(query=request.form,
-                                              sort_by=sort_by,
-                                              direction=direction,
-                                              folder_prefix=folder_prefix);
-                     no_form python:1;
-                     site_wide python:1;
+                     items python:here.waeup_search(query=request.form);
                      items_length python:len(items);
-                     format string:detail;
-                     filter python:0;
                      title_search request/title_search|nothing;
-                     swr request/search_within_results|nothing;
                     ">
 
-    <div style="text-align:right;" class="group">
+    <div style="text-align:left;" class="group">
       <form id="searchFormBottom" method="get" action="waeup_search_form"
         onsubmit="return checkEmptySearch(this)">
@@ -35 +24 @@
                i18n:attributes="value" />
         </div>
-        <tal:block condition="not:swr">
-          <metal:block
-            use-macro="here/generic_lib_search_folder_prefix_option/macros/search_folder_prefix_option" />
-        </tal:block>
-        <tal:block condition="swr"
-          define="criteria python:['search_within_results', 'title_search',
-                                   'folder_prefix', 'review_state'];
-                  criteria_list python:['portal_type'];">
-          <tal:block repeat="criterion criteria">
-            <input type="hidden" tal:condition="value"
-              tal:define="value request/?criterion|nothing"
-              tal:attributes="name criterion;
-                              value value" />
-          </tal:block>
-          <tal:block repeat="criterion criteria_list">
-            <tal:block tal:condition="values"
-               tal:define="values request/?criterion|nothing">
-              <tal:block repeat="value values">
-                <input type="hidden"
-                  tal:define="value value"
-                  tal:attributes="name python:criterion+':list'; value value" />
-              </tal:block>
-            </tal:block>
-          </tal:block>
-        </tal:block>
+        
      </form>
     </div>