[geeklog-cvs] geeklog-1.3/system lib-plugins.php,1.28,1.29

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv20735/system

Modified Files:
	lib-plugins.php 
Log Message:
Fixed the plugin search (Hi Vinny) and added $keyType as an additional parameter to the plugins search function.


Index: lib-plugins.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** lib-plugins.php	28 Apr 2004 03:21:38 -0000	1.28
--- lib-plugins.php	11 Jul 2004 18:18:05 -0000	1.29
***************
*** 339,351 ****
  * formatted table rows that can be quickly printed by search.php 
  *
! * @param        string      $query          What the user searched for
! * @param        date        $datestart      beginning of date range to search for
! * @param        date        $dateend        ending date range to search for
! * @param        string      $topic          the topic the user searched within 
! * @param        int         $author         UID...only return results for this person
! * @return       array       Returns search results
  *
  */
! function PLG_doSearch($query, $datestart, $dateend, $topic, $type, $author) 
  {
      global $_TABLES, $_CONF, $_PLUGINS;
--- 339,353 ----
  * formatted table rows that can be quickly printed by search.php 
  *
! * @param    string  $query      What the user searched for
! * @param    date    $datestart  beginning of date range to search for
! * @param    date    $dateend    ending date range to search for
! * @param    string  $topic      the topic the user searched within 
! * @param    string  $type       Type of items they are searching, or 'all'
! * @param    int     $author     UID...only return results for this person
! * @param    string  $keyType    search key type: 'all', 'phrase', 'any'
! * @return   array               Returns search results
  *
  */
! function PLG_doSearch($query, $datestart, $dateend, $topic, $type, $author, $keyType = 'all') 
  {
      global $_TABLES, $_CONF, $_PLUGINS;
***************
*** 359,366 ****
          $function = 'plugin_dopluginsearch_' . $pi_name;
          if (function_exists($function)) {
!             $plugin_result = $function($query, $datestart, $dateend, $topic, $type, $author);
              $nrows_plugins = $nrows_plugins + $plugin_result->num_searchresults;
              $total_plugins = $total_plugins + $plugin_result->num_itemssearched;
!             $search_results[$i] = $plugin_result;
          } // no else because implementation of this API function not required
      }
--- 361,368 ----
          $function = 'plugin_dopluginsearch_' . $pi_name;
          if (function_exists($function)) {
!             $plugin_result = $function($query, $datestart, $dateend, $topic, $type, $author, $keyType);
              $nrows_plugins = $nrows_plugins + $plugin_result->num_searchresults;
              $total_plugins = $total_plugins + $plugin_result->num_itemssearched;
!             $search_results[] = $plugin_result;
          } // no else because implementation of this API function not required
      }