Changeset 1761 for trunk

Timestamp:

10/13/07 01:13:32 (14 months ago)

Author:

cfriesen

Message:

Keep existing functionality by making it an option to search within words (feel free to move the checkbox).

Location:

trunk/gregarius

Files:

• cls/search.php (modified) (5 diffs)
• cls/wrappers/searchform.php (modified) (1 diff)
• themes/default/web/searchform.php (modified) (1 diff)

trunk/gregarius/cls/search.php

@@ -30 +30 @@
 define ('QUERY_PRM','rss_query');
 define ('QUERY_MATCH_MODE', 'rss_query_match');
+define ('QUERY_MATCH_TYPE', 'rss_query_match_type');
 define ('QUERY_CHANNEL', 'rss_query_channel');
 define ('QUERY_RESULTS','rss_query_res_per_page');
@@ -42 +43 @@
 define ('QUERY_MATCH_AND','and');
 define ('QUERY_MATCH_EXACT','exact');
+define ('QUERY_MATCH_WITHIN', 'within');
 
 // This is needed for some constants
@@ -50 +52 @@
     var $searchTerms = array();
     var $matchMode;
+    var $matchType;
     var $regMatch = "";
 
@@ -95 +98 @@
                 reset($this->searchTerms);
                 $match = ($this->matchMode == QUERY_MATCH_AND || $this->matchMode == QUERY_MATCH_EXACT);
+
                 foreach ($this->searchTerms as $term) {
-                    if ($this->matchMode == QUERY_MATCH_AND) {
-                        $match = ((stristr($descr_noTags, $term) || stristr($title_noTags, $term)) && $match);
-                    } else if ($this->matchMode == QUERY_MATCH_EXACT) {
-                            $match = (preg_match("/\b" . $term . "\b/i", $descr_noTags) || preg_match("/\b" . $term . "\b/i", $title_noTags));
+                    if ($this->matchMode == QUERY_MATCH_AND || $this->matchMode == QUERY_MATCH_EXACT) {
+                            if($this->matchType == QUERY_MATCH_WITHIN) {
+                            $match = ((stristr($descr_noTags, $term) || stristr($title_noTags, $term)) && $match);
+                        } else {
+                            $match = ((preg_match("/\b" . $term . "\b/i", $descr_noTags) || preg_match("/\b" . $term . "\b/i", $title_noTags)) && $match);
+                                                }
                     } else {
-                        $match = ($match || (stristr($descr_noTags, $term) || stristr($title_noTags, $term)));
-                    }
+                            if($this->matchType == QUERY_MATCH_WITHIN) {
+                            $match = ($match || (stristr($descr_noTags, $term) || stristr($title_noTags, $term)));
+                        } else {
+                                                    $match = ($match || (preg_match("/\b" . $term . "\b/i", $descr_noTags) || preg_match("/\b" . $term . "\b/i", $title_noTags)));
+                                                }
+                    }   
                 }
 
@@ -132 +142 @@
                 (!array_key_exists(QUERY_MATCH_MODE, $_REQUEST) ? QUERY_MATCH_AND : $_REQUEST[QUERY_MATCH_MODE]), 
             RSS_SANITIZER_CHARACTERS_EXT);
-            
+        
+        $this->matchType = sanitize(
+            (!array_key_exists(QUERY_MATCH_TYPE, $_REQUEST) ? "" : $_REQUEST[QUERY_MATCH_TYPE]),
+            RSS_SANITIZER_CHARACTERS_EXT);
+
         $this->channelId = sanitize(
             ((array_key_exists(QUERY_CHANNEL, $_REQUEST)) ? $_REQUEST[QUERY_CHANNEL] : ALL_CHANNELS_ID),

trunk/gregarius/cls/wrappers/searchform.php

@@ -64 +64 @@
     return ((array_key_exists(QUERY_ORDER_BY,$_REQUEST) &&
      $_REQUEST[QUERY_ORDER_BY] == QUERY_ORDER_BY_CHANNEL)?" checked=\"checked\"":"");
+}
+
+function rss_search_within() {
+    return ((array_key_exists(QUERY_MATCH_TYPE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_TYPE] == QUERY_MATCH_WITHIN)?" checked=\"checked\"":"");  
 }
 

trunk/gregarius/themes/default/web/searchform.php

@@ -16 +16 @@
         <input type="radio" id="qry_match_exact" name="<?php echo QUERY_MATCH_MODE ?>" value="<?php echo QUERY_MATCH_EXACT ?>" <?php echo rss_search_exact_checked() ?>/>
         <label for="qry_match_exact"><?php echo __('Exact match') ?></label>
+    </p>
+    
+    <p>
+        <label for="qry_match_within"><?php echo __('Search within words') ?></label>
+        <input type="checkbox" id="qry_match_within" name="<?php echo QUERY_MATCH_TYPE ?>" value="<?php echo QUERY_MATCH_WITHIN ?>" <?php echo rss_search_within() ?> />
     </p>