search_nodeapi 'update index' problem

Hi,

I have been playing with the Solr search module and hit a problem I have traced back to the core search module.

The problem: On some search results the description ends with '()'

The cause: search_nodeapi 'update index' hook is returning a imploded array wrapped in a anchor tag without checking the array size is > 0.

Problem code line 631 search.module

/**
 * Implementation of hook_nodeapi().
 */
function search_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
  switch ($op) {
    // Transplant links to a node into the target node.
    case 'update index':
      $result = db_query("SELECT caption FROM {search_node_links} WHERE nid = %d", $node->nid);
      $output = array();
      while ($link = db_fetch_object($result)) {
        $output[] = $link->caption;
      }
      return '<a>('. implode(', ', $output) .')</a>';
    // Reindex the node when it is updated.  The node is automatically indexed
    // when it is added, simply by being added to the node table.
    case 'update':
      search_touch_node($node->nid);
      break;
  }
}

Chainging it to the below fixes my error of '()' appearing in search results:

/**
 * Implementation of hook_nodeapi().
 */
function search_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
  switch ($op) {
    // Transplant links to a node into the target node.
    case 'update index':
      $result = db_query("SELECT caption FROM {search_node_links} WHERE nid = %d", $node->nid);
      $output = array();
      while ($link = db_fetch_object($result)) {
        $output[] = $link->caption;
      }
      
      if(count($output >=1) { 
        return '<a>('. implode(', ', $output) .')</a>';
      }

    // Reindex the node when it is updated.  The node is automatically indexed
    // when it is added, simply by being added to the node table.
    case 'update':
      search_touch_node($node->nid);
      break;
  }
}