Changeset 2092 in ExiteCMS for trunk/includes/search/search.articles.php

Timestamp:

12/05/08 20:23:35 (3 years ago)

Author:

WanWizard

Message:

ticket #58: added "search entire site" to the search module
added missing svn properties to several files

File:

• trunk/includes/search/search.articles.php (modified) (2 diffs)

trunk/includes/search/search.articles.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.articles.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -154 +151 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-    
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
+        $rows = dbrows($rptresult);
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
+        // are there any results?
+        if ($rows) {
 
-            // get the results if any
-            if ($rptresult) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
+            }
 
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
         }
+
     }
 }