[Gforge-commits] gforge/www/search index.php,1.11,1.12

[gsmet]

Update of /cvsroot/gforge/gforge/www/search
In directory db.perdue.net:/tmp/cvs-serv17528/www/search

Modified Files:
        index.php 
Log Message:
implemented a new search engine architecture

Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/search/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.php   16 Dec 2003 20:05:01 -0000      1.11
+++ index.php   9 Feb 2004 10:22:22 -0000       1.12
@@ -1,498 +1,77 @@
 <?php
+
 /**
-  *
-  * SourceForge Search Engine
-  *
-  * Parameters:
-  *   $type ($t)  = one of 'soft'[ware],'people','forums','bugs'
-  *   $words ($q) = target words to search
-  *   $exact     = 1 for search ing all words (AND), 0 - for any word (OR)
-  *   $rss       = 1 to export RSS
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * GForge Search Engine
+ *
+ * Portions Copyright 1999-2001 (c) VA Linux Systems
+ * The rest Copyright 2004 (c) Guillaume Smet / Open Wide
+ *
+ * http://gforge.org
+ *
+ * @version $Id$
+ */
 
 // Support for short aliases
+
 if (!$words) {
-       $words=$q;
+       $words = $q;
 }
 
 if (!$type_of_search) {
-       $type_of_search=$type;
+       $type_of_search = $type;
 }
 if (!$type_of_search) {
-       $type_of_search=$t;
+       $type_of_search = $t;
 }
 if (!$type_of_search) {
-       $type_of_search='soft';
+       $type_of_search = SEARCH__TYPE_IS_SOFTWARE;
 }
 
 require_once('pre.php');
+require_once('common/include/escapingUtils.php');
 require_once('www/tracker/include/ArtifactTypeHtml.class');
 
-function highlight_target_words($word_array,$text) {
-       if (!$text) {
-               return '&nbsp;';
-       }
-       $re=implode($word_array,'|');
-       return eregi_replace("($re)",'<span 
style="background-color:pink">\1</span>',$text);
-}
-
-function error_while_in_rss($descr) {
-       header("Content-Type: text/plain");
-       print '<channel></channel>';
-       exit;
-}
-
-if (!$rss) {
-       // If search context is a project, show its toolbar
-       if ($type_of_search == "forums" || $type_of_search == "artifact") {
-               site_project_header(array('title'=>'Project 
Search','group'=>$group_id,'pagename'=>'search'));
-       } else {
-               $HTML->header(array('title'=>'Search','pagename'=>'search'));
-       }
-
-       echo "<p align=\"center\">";
-
-       // show search box which will return results on
-       // this very page (default is to open new window)
-       echo $HTML->searchBox();
-}
-
-/*
-       Force them to enter at least three characters
-*/
-
-$words = htmlspecialchars(trim($words));
-$words = ereg_replace("[ \t]+", ' ', $words);
+$offset = getIntFromGet('offset');
 
-if ($words && (strlen($words) < 3)) {
-       if ($rss) {
-               error_while_in_rss('Search must be at least three characters');
+if($type_of_search == SEARCH__TYPE_IS_SOFTWARE) {
+       if($rss) {
+               require('include/ProjectRssSearchRenderer.class');
+               $searchQuery = new ProjectRssSearchRenderer($words, $offset, 
$exact);
        } else {
-               echo "<h2>Search must be at least three characters</h2>";
-               $HTML->footer(array());
-               exit;
+               require('include/ProjectHtmlSearchRenderer.class');
+               $searchQuery = new ProjectHtmlSearchRenderer($words, $offset, 
$exact);
        }
-}
+} elseif ($type_of_search == SEARCH__TYPE_IS_PEOPLE) {
+       
+       require('include/PeopleHtmlSearchRenderer.class');
+       $searchQuery = new PeopleHtmlSearchRenderer($words, $offset, $exact);
+       
+} elseif ($type_of_search == SEARCH__TYPE_IS_FORUM && $forum_id && $group_id) {
+       
+       require('include/ForumHtmlSearchRenderer.class');
+       $searchQuery = new ForumHtmlSearchRenderer($words, $offset, $exact, 
$group_id, $forum_id);
 
-if (!$words) {
-       if ($rss) {
-               error_while_in_rss('Search criteria are not specified');
-       } else {
-               echo "<br />Enter Your Search Words Above</p>";
-               $HTML->footer(array());
-               exit;
-       }
+} elseif ($type_of_search == SEARCH__TYPE_IS_ARTIFACT && $atid && $group_id) {
+       
+       require('include/ArtifactHtmlSearchRenderer.class');
+       $searchQuery = new ArtifactHtmlSearchRenderer($words, $offset, $exact, 
$group_id, $atid);
+       
+} elseif ($type_of_search == SEARCH__TYPE_IS_SKILL) {
+       
+       require('include/SkillHtmlSearchRenderer.class');
+       $searchQuery = new SkillHtmlSearchRenderer($words, $offset, $exact);
+       
 }
 
-$no_rows = 0;
-
-if ($exact) {
-       $crit='AND';
+if(isset($searchQuery)) {
+       $searchQuery->flush();
 } else {
-       $crit='OR';
-}
-
-if (!$offset || $offset < 0) {
-       $offset = 0;
-}
-
-if ($type_of_search == "soft") {
-       /*
-               Query to find software
-       */
-
-       // If multiple words, separate them and put ILIKE (pgsql's 
-       // case-insensitive LIKE) in between
-       // XXX:SQL: this assumes db understands backslash-quoting
-
-       $array=explode(" ",quotemeta($words));
-       // we need to use double-backslashes in SQL
-       $array_re=explode(" ",addslashes(quotemeta($words)));
-
-       $words1="group_name ILIKE '%" . implode($array,"%' $crit group_name 
ILIKE '%") ."%'";
-       $words2="short_description ILIKE '%" . implode($array,"%' $crit 
short_description ILIKE '%") ."%'";
-       $words3="unix_group_name ILIKE '%" . implode($array,"%' $crit 
unix_group_name ILIKE '%") . "%'";
-
-       if (!$rss) {
-               $sql = "SELECT 
group_name,unix_group_name,type,group_id,short_description "
-                          ."FROM groups "
-                          ."WHERE status IN ('A','H') "
-                          ."AND is_public='1' "
-                          ."AND (($words1) OR ($words2) OR ($words3))";
-       } else {
-                       // If it's RSS export, try to infer additional 
information, as
-                       // shown by Freshmeat search. This means that only 
projects
-                       // categorized under Trove will be exported - that's 
good, since
-                       // cross-site search performed not to get junk results.
-                       $sql = "SELECT 
group_name,unix_group_name,type,groups.group_id, "
-                                  ."short_description,license,register_time "
-                                  ."FROM groups "
-                                  ."WHERE status IN ('A','H') "
-                                          ."AND is_public='1' "
-                                  ."AND groups.short_description<>'' "
-                                  ."AND (($words1) OR ($words2) OR ($words3))";
-       }
-
-       if ($rss) {
-               $limit=200; 
-       } else {
-               $limit=25;
-       }
-       $result = db_query($sql, $limit+1, $offset, SYS_DB_SEARCH);
-       $rows = $rows_returned = db_numrows($result);
-
-       /*
-        *  Dump RSS rendering of search results, date registered, 
-        *  include trove categories, license.
-        */
-       if ($rss) {
-               include_once('www/export/rss_utils.inc');
-               function callback($data_row) {
-                                               // trove_cat_root=18 - Topic 
subtree
-                       // [CB] now $default_trove_cat defined in local.inc
-                       $res = db_query("
-                               SELECT trove_cat.fullpath 
-                               FROM trove_group_link,trove_cat 
-                               WHERE 
trove_group_link.trove_cat_root=$default_trove_cat 
-                               AND 
trove_group_link.trove_cat_id=trove_cat.trove_cat_id 
-                               AND group_id='".$data_row['group_id']."'");
-                       $ret = ' | date registered: '.date('M jS 
Y',$data_row['register_time']);
-                       $ret .= ' | category: '.str_replace(' 
','',implode(util_result_column_to_array($res),','));
-                       return $ret.' | license: '.$data_row['license'];
-               }
-               header("Content-Type: text/plain");
-               rss_dump_project_result_set($result, 'SourceForge Search 
Results', 
-                       'SourceForge Search Results for "' 
.htmlspecialchars($words).'"', 'callback');
-               exit;
-       }
-
-       /*
-        *  Else, render HTML
-        */
-
-       if (!$result || $rows < 1) {
-               $no_rows = 1;
-               echo "<h2>No matches found for $words</h2>";
-               echo db_error();
-//             echo $sql;
-       } else {
-
-               if ( $rows_returned > $limit) {
-                       $rows = $limit;
-               }
-
-               echo "<h3>Search results for $words</h3><p>\n\n";
-
-               $title_arr = array();
-               $title_arr[] = 'Group Name';
-               $title_arr[] = 'Description';
-
-               echo $GLOBALS['HTML']->listTableTop($title_arr);
-
-               for ( $i = 0; $i < $rows; $i++ ) {
-                       if (db_result($result, $i, 'type') == 2) {
-                               $what = 'foundry';
-                       } else {
-                               $what = 'projects';
-                       }
-                       
-                       print   "<tr ". $HTML->boxGetAltRowStyle($i)."><td><a 
href=\"/$what/"
-                               . db_result($result, $i, 
'unix_group_name')."/\">"
-                               . 
html_image("ic/msg.png","10","12",array("border"=>"0"))
-                               . 
highlight_target_words($array,db_result($result, $i, 'group_name'))."</a></td>"
-                               . 
"<td>".highlight_target_words($array,db_result($result,$i,'short_description'))."</td></tr>\n";
-               }
-
-               echo $GLOBALS['HTML']->listTableBottom();
-
-       }
-
-} else if ($type_of_search == "people") {
-       /*
-               Query to find users
-       */
-
-       // If multiple words, separate them and put ILIKE in between
-       $array=explode(" ",$words);
-       $words1=implode($array,"%' $crit user_name ILIKE '%");
-       $words2=implode($array,"%' $crit realname ILIKE '%");
-
-       $sql =  "SELECT user_name,user_id,realname 
-               FROM users 
-               WHERE ((user_name ILIKE '%$words1%') 
-               OR (realname ILIKE '%$words2%')) 
-               AND (status='A') 
-               ORDER BY user_name";
-
-       $result = db_query($sql, 26, $offset, SYS_DB_SEARCH);
-
-       $rows = $rows_returned = db_numrows($result);
-
-       if (!$result || $rows < 1) {
-               $no_rows = 1;
-               echo "<h2>No matches found for $words</h2>";
-               echo db_error();
-       } else {
-
-               if ( $rows_returned > 25) {
-                       $rows = 25;
-               }
-
-               echo "<h3>Search results for $words</h3><p>\n\n";
-
-               $title_arr = array();
-               $title_arr[] = 'User Name';
-               $title_arr[] = 'Real Name';
-
-               echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-               for ( $i = 0; $i < $rows; $i++ ) {
-                       print   "<tr ". $HTML->boxGetAltRowStyle($i) ."><td><a 
href=\"/users/".db_result($result, $i, 'user_name')."/\">"
-                               . 
html_image("ic/msg.png","10","12",array("border"=>"0")) . db_result($result, 
$i, 'user_name')."</a></td>"
-                               . 
"<td>".db_result($result,$i,'realname')."</td></tr>\n";
-               }
-
-               echo $GLOBALS['HTML']->listTableBottom() . '</p>';
-
-       }
-
-} else if ($type_of_search == 'forums' && $forum_id && $group_id) {
-       /*
-               Query to search within forum messages
-       */
-
-       $array=explode(" ",$words);
-       $words1=implode($array,"%' $crit forum.body ILIKE '%");
-       $words2=implode($array,"%' $crit forum.subject ILIKE '%");
-
-       $sql =  "SELECT 
forum.msg_id,forum.subject,forum.post_date,users.user_name 
-               FROM forum,users 
-               WHERE users.user_id=forum.posted_by AND ((forum.body ILIKE 
'%$words1%') 
-               OR (forum.subject ILIKE '%$words2%')) AND 
forum.group_forum_id='$forum_id' 
-               GROUP BY msg_id,subject,post_date,user_name";
-       $result = db_query($sql,26,$offset);
-       $rows = $rows_returned = db_numrows($result);
-
-       if (!$result || $rows < 1) {
-               $no_rows = 1;
-               echo "<h2>No matches found for $words</h2>";
-               echo db_error();
-       } else {
-
-               if ( $rows_returned > 25) {
-                       $rows = 25;
-               }
-
-               echo "<h3>Search results for $words</h3><p>\n\n";
-
-               $title_arr = array();
-               $title_arr[] = 'Thread';
-               $title_arr[] = 'Author';
-               $title_arr[] = 'Date';
-
-               echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-               for ( $i = 0; $i < $rows; $i++ ) {
-                       print   "<tr ". $HTML->boxGetAltRowStyle($i) ."><td><a 
href=\"/forum/message.php?msg_id="
-                               . db_result($result, $i, "msg_id")."\">"
-                               . 
html_image("ic/msg.png","10","12",array("border"=>"0"))
-                               . db_result($result, $i, "subject")."</a></td>"
-                               . "<td>".db_result($result, $i, 
"user_name")."</td>"
-                               . 
"<td>".date($sys_datefmt,db_result($result,$i,"post_date"))."</td></tr>\n";
-               }
-
-               echo $GLOBALS['HTML']->listTableBottom() . '</p>';
-
-       }
-
-} else if ($type_of_search == 'artifact' && $atid && $group_id) {
-       /*
-               Query to search within a specific ArtifactType
-       */
-
-       $array=explode(" ",$words);
-       $words1=implode($array,"%' $crit a.details ILIKE '%");
-       $words2=implode($array,"%' $crit a.summary ILIKE '%");
+       $HTML->header(array('title'=>$Language->getText('search', 'title'), 
'pagename'=>'search'));
        
-       if (ereg('^#?[0-9]+$', $words)) {
-               $no = ereg_replace('^#?([0-9]+)$', '\\1', $words);
-               $by_no_sql = "OR artifact_id=$no ";
-       }
-
-       $sql =  "SELECT DISTINCT ON (a.group_artifact_id,a.artifact_id) 
a.group_artifact_id,a.artifact_id,a.summary,a.open_date,users.user_name
-               FROM artifact a,users 
-               WHERE 
-               a.group_artifact_id='$atid'
-               AND users.user_id=a.submitted_by 
-               AND ((a.details ILIKE '%$words1%') 
-                       OR (a.summary ILIKE '%$words2%')
-                       $by_no_sql) 
-               ORDER BY group_artifact_id ASC,artifact_id ASC";
-
-               //GROUP BY 
group_artifact_id,artifact_id,summary,open_date,user_name
-/*
-
-create index art_groupartid_artifactid on artifact 
(group_artifact_id,artifact_id);
-
-*/
-
-       $result = db_query($sql,26,$offset);
-       $rows = $rows_returned = db_numrows($result);
-
-       if ( !$result || $rows < 1) {
-               $no_rows = 1;
-               echo "<h2>No matches found for $words</h2>";
-               echo db_error();
-       } else {
-
-               if ( $rows_returned > 25) {
-                       $rows = 25;
-               }
-
-               echo "<h3>Search results for $words</h3><p>\n";
-
-               $title_arr = array();
-               $title_arr[] = '#';
-               $title_arr[] = 'Bug Summary';
-               $title_arr[] = 'Submitted By';
-               $title_arr[] = 'Date';
-
-               echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-               for ( $i = 0; $i < $rows; $i++ ) {
-                       print   "\n<tr ". $HTML->boxGetAltRowStyle($i) .">
-                               <td>".db_result($result, $i, 
"artifact_id")."</td>
-                               <td><a 
href=\"/tracker/?group_id=$group_id&amp;atid="
-                               . db_result($result, $i, "group_artifact_id") 
-                               . "&amp;func=detail&aid="
-                               . db_result($result, $i, "artifact_id")."\"> "
-                               . 
html_image("ic/msg.png","10","12",array("border"=>"0"))
-                               . db_result($result, $i, "summary")."</a></td>"
-                               . "<td>".db_result($result, $i, 
"user_name")."</td>"
-                               . "<td>". 
date($sys_datefmt,db_result($result,$i,"open_date"))."</td></tr>";
-               }
-
-               echo $GLOBALS['HTML']->listTableBottom() . '</p>';
-
-       }
-
-} else if ($type_of_search == "skill") {
-       /*
-               Query to find users with a particular skill
-       */
-
-       // If multiple words, separate them and put LIKE in between
-       $array=explode(" ",$words);
-       $words1=implode($array,"%' $crit title ILIKE '%");
-       $words2=implode($array,"%' $crit keywords ILIKE '%");
-
-       $sql =  "SELECT * 
-               FROM skills_data,users, skills_data_types 
-               WHERE ((title ILIKE '%$words1%') OR (keywords ILIKE 
'%$words2%')) 
-               AND (skills_data.user_id=users.user_id) 
-               AND (skills_data.type=skills_data_types.type_id) ORDER BY 
finish DESC";
-       $result = db_query($sql);
-       $rows = $rows_returned = db_numrows($result);
-
-       if (!$result || $rows < 1) {
-               $no_rows = 1;
-               echo "<h2>No matches found for '$words'</h2>";
-               echo db_error();
-//             echo $sql;
-       } else {
-
-/*             if ( $rows_returned > 25) {
-                       $rows = 25;
-               }
-*/
-               echo "<h3>Search results for 
<strong><em>$words</em></strong></h3><p>\n\n";
-
-               $title_arr = array();
-               $title_arr[] = 'Name';
-               $title_arr[] = 'Type';
-               $title_arr[] = 'Title';
-               $title_arr[] = 'Keywords';
-               $title_arr[] = 'From';
-               $title_arr[] = 'To';
-
-               echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-               $monthArray = array();
-               for($i = 1; $i <= 12; $i++) {
-                       array_push($monthArray,date("M", 
mktime(0,0,0,$i,10,1980)));
-               }               
-               
-               for ( $i = 0; $i < $rows; $i++ ) {
-
-                  $start = db_result($result, $i, 'start');
-                  $startY = substr($start, 0, 4);
-                  $startM = substr($start, 4, 2);
-                  
-                  $finish = db_result($result, $i, 'finish');
-                  $finishY = substr($finish, 0, 4);
-                  $finishM = substr($finish, 4, 2);
-                               
-                  echo '<tr '.$HTML->boxGetAltRowStyle($i+1).'>';
-                  echo '<td><a href="/users/'.db_result($result, $i, 
'user_name').'/">'.
-                                 db_result($result, $i, 
'realname').'</a></td>';
-                  echo '<td>'.db_result($result, $i, 'type_name').'</td>';
-                  echo '<td>'.db_result($result, $i, 'title').'</td>';
-                  echo '<td>'.db_result($result, $i, 'keywords').'</td>';
-                  echo '<td>'.$monthArray[$startM-1].' '.$startY.'</td>';
-                  echo '<td>'.$monthArray[$finishM-1].' '.$finishY.'</td>';
-                  echo '<tr>';
-               }
-
-               echo $GLOBALS['HTML']->listTableBottom() . '</p>';
-
-       }
-
-} else {
-
-       echo "<h1>Invalid Search - ERROR!!!!</h1>";
-
-}
-
-   // This code puts the nice next/prev.
-if ( !$no_rows && ( ($rows_returned > $rows) || ($offset != 0) ) ) {
-
-       echo "<br />\n";
-
-       echo "<table style=\"background-color:".$HTML->COLOR_LTBACK1."\" 
width=\"100%\" cellpadding=\"5\" cellspacing=\"0\">\n";
-       echo "<tr>\n";
-       echo "\t<td align=\"left\">";
-       if ($offset != 0) {
-               echo "<span style=\"font-family:arial, 
helvetica;text-decoration: none\">";
-               echo "<a href=\"javascript:history.back()\">"
-                       . 
html_image("t2.png","15","15",array("border"=>"0","align"=>"middle"))
-                       . " <strong>Previous Results</strong></a></span>";
-       } else {
-               echo "&nbsp;";
-       }
-       echo "</td>\n\t<td align=\"right\">";
-       if ( $rows_returned > $rows) {
-               echo "<span style=\"font-family:arial, 
helvetica;text-decoration: none\">";
-               echo "<a 
href=\"/search/?type=$type_of_search&amp;exact=$exact&amp;q=".urlencode($words)."&amp;offset=".($offset+25);
-               if ( $type_of_search == 'artifact' ) {
-                       echo "&amp;group_id=$group_id&amp;atid=$atid";
-               } 
-               if ( $type_of_search == 'forums' ) {
-                       echo "&amp;group_id=$group_id&amp;forum_id=$forum_id";
-               }
-               echo "\"><strong>Next Results " . 
html_image("t.png","15","15",array("border"=>"0","align"=>"middle")) . 
"</strong></a></span>";
-       } else {
-               echo "&nbsp;";
-       }
-       echo "</td>\n</tr>\n";
-       echo "</table>\n";
+       echo '<h1>'.$Language->getText('search', 
'error_invalid_search').'</h1>';
+       
+       $HTML->footer(array());
+       exit();
 }
 
-$HTML->footer(array());
-?>
+?>
\ No newline at end of file