Changeset 1548 for trunk/pylucid/PyLucid/plugins_internal/search/search.py

Timestamp:

05/01/08 12:24:21 (7 months ago)

Author:

JensDiemer

Message:

put the plugin preferences into the plugin model.
TODO: update detect_page and set system_settings at install.

Files:

• trunk/pylucid/PyLucid/plugins_internal/search/search.py (modified) (8 diffs)

trunk/pylucid/PyLucid/plugins_internal/search/search.py

@@ -27 +27 @@
 
 from django import newforms as forms
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
-from django.utils.safestring import mark_safe
-
-from PyLucid.models import Page
+
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 from PyLucid.tools.utils import escape
-
-
-# How min/max long must a search term be?
-MIN_TERM_LEN = 3
-MAX_TERM_LEN = 50
-
-# Number of the paged for the result page:
-MAX_RESULTS = 20
-
-# The length of the text-hit-cutouts:
-TEXT_CUTOUT_LEN = 50
-
-# Max. cutout lines for every search term:
-MAX_CUTOUTS_LINES = 5
+from PyLucid.models import Page, Plugin
 
 
@@ -71 +57 @@
     )
 
-
-class SearchForm(forms.Form):
-    # TODO: min und max should be saved in the prefereces.
-    search_string = forms.CharField(
-        min_length = MIN_TERM_LEN, max_length = MAX_TERM_LEN
-    )
+# We used preferences values in a newform. We need these values here.
+try:
+    preferences = Plugin.objects.get_preferences(__file__)
+except Plugin.DoesNotExist, e:
+    # in _install section?
+    pass
+else:
+    class SearchForm(forms.Form):
+        search_string = forms.CharField(
+            min_length = preferences["min_term_len"],
+            max_length = preferences["max_term_len"],
+        )
 
 
@@ -85 +77 @@
         Insert a empty search form into the page.
         """
-        self.page_msg("Preferences:", self.preferences)
         search_form = SearchForm()
         context = {
@@ -138 +129 @@
         search_strings = []
         for term in raw_search_strings:
-            if len(term)<MIN_TERM_LEN:
+            if len(term)<preferences["min_term_len"]:
                 self.page_msg("Ignore '%s' (too small)" % cgi.escape(term))
             else:
@@ -178 +169 @@
 
         # Use only the first pages:
-        results = results[:MAX_RESULTS]
+        results = results[:preferences["max_results"]]
 
         # Build a dict, for the template
@@ -191 +182 @@
         the lines.
         """
+        text_cutout_len = preferences["text_cutout_len"]
+        max_cutout_lines = preferences["max_cutout_lines"]
+
         for result in results:
             result["cutouts"] = []
@@ -197 +191 @@
             for term in search_strings:
                 start = 0
-                for _ in xrange(MAX_CUTOUTS_LINES):
+                for _ in xrange(max_cutout_lines):
                     try:
                         index = content.index(term, start)
@@ -206 +200 @@
                     start = index+1
 
-                    if index<TEXT_CUTOUT_LEN:
-                        txt = content[:TEXT_CUTOUT_LEN]
+                    if index<text_cutout_len:
+                        txt = content[:text_cutout_len]
                     else:
-                        txt = content[index-TEXT_CUTOUT_LEN:index+TEXT_CUTOUT_LEN]
+                        start = index-text_cutout_len
+                        end = index+text_cutout_len
+                        txt = content[start:end]
 
                     txt = escape(txt)