Enano CMS (1.1.x): comparison includes/search.php

equal deleted inserted replaced

-:32429702305e
+:c72b545f1304
 *   page_text: string, the contents of the page (trimmed to ~150 bytes if necessary)
 *   score: numerical relevance score, 1-100, rounded to 2 digits and calculated based on which terms were present and which were not
 * @param string Search query
 * @param string Will be filled with any warnings encountered whilst parsing the query
 * @param bool Case sensitivity - defaults to false
+* @param array|reference Will be filled with the parsed list of words.
 * @return array
 */
-function perform_search($query, &$warnings, $case_sensitive = false)
+function perform_search($query, &$warnings, $case_sensitive = false, &$word_list)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $warnings = array();
 $query = parse_search_query($query, $warnings);
 }
 }
 if ( isset($scores[$idstring]) )
 {
 $page_data[$idstring] = array(
-'page_name' => $page['name'],
+'page_name' => highlight_search_result($page['name'], $word_list, $case_sensitive),
 'page_text' => '',
 'page_id' => $page['urlname_nons'],
 'namespace' => $page['namespace'],
 'score' => $scores[$idstring],
 'page_length' => 1,
 // Calculate score
 // if ( $score > $divisor )
 //   $score = $divisor;
 $datum['score'] = round($score / $divisor, 2) * 100;
+// Highlight the URL
+$datum['url_highlight'] = makeUrlComplete($datum['namespace'], $datum['page_id']);
+$datum['url_highlight'] = preg_replace('/\?.+$/', '', $datum['url_highlight']);
+$datum['url_highlight'] = highlight_search_result($datum['url_highlight'], $word_list, $case_sensitive);
 // Store it in our until-now-unused results array
 $results[] = $datum;
 }
 * @return array
 */
 function parse_search_query($query, &$warnings)
 {
+global $lang;
 $stopwords = get_stopwords();
 $ret = array(
 'any' => array(),
 'req' => array(),
 'not' => array()
 $ticker++;
 if ( $ticker == 20 )
 {
-$warnings[] = 'Some of your search terms were excluded because searches are limited to 20 terms to prevent excessive server load.';
+$warnings[] = $lang->get('search_err_query_too_many_terms');
 break;
 }
 if ( substr ( $atom, 0, 2 ) == '+"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
 {
 $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
 if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
 {
-$warnings[] = 'One or more of your search terms was excluded because either it was less than 2 characters in length or is a common word (a stopword) that is typically found on a large number of pages. Examples of stopwords include "the", "this", "which", "with", etc.';
+$warnings[] = $lang->get('search_err_query_has_stopwords');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['req']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['req'][] = $word;
 }
 elseif ( substr ( $atom, 0, 2 ) == '-"' && substr ( $atom, ( strlen ( $atom ) - 1 ), 1 ) == '"' )
 {
 $word = substr ( $atom, 2, ( strlen( $atom ) - 3 ) );
 if ( strlen ( $word ) < 4 )
 {
-$warnings[] = 'One or more of your search terms was excluded because terms must be at least 4 characters in length.';
+$warnings[] = $lang->get('search_err_query_term_too_short');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['not']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['not'][] = $word;
 }
 elseif ( substr ( $atom, 0, 1 ) == '+' )
 {
 $word = substr ( $atom, 1 );
 if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
 {
-$warnings[] = 'One or more of your search terms was excluded because either it was less than 2 characters in length or is a common word (a stopword) that is typically found on a large number of pages. Examples of stopwords include "the", "this", "which", "with", etc.';
+$warnings[] = $lang->get('search_err_query_has_stopwords');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['req']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['req'][] = $word;
 }
 elseif ( substr ( $atom, 0, 1 ) == '-' )
 {
 $word = substr ( $atom, 1 );
 if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
 {
-$warnings[] = 'One or more of your search terms was excluded because either it was less than 2 characters in length or is a common word (a stopword) that is typically found on a large number of pages. Examples of stopwords include "the", "this", "which", "with", etc.';
+$warnings[] = $lang->get('search_err_query_has_stopwords');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['not']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['not'][] = $word;
 }
 elseif ( substr ( $atom, 0, 1 ) == '"' && substr ( $atom, ( strlen($atom) - 1 ), 1 ) == '"' )
 {
 $word = substr ( $atom, 1, ( strlen ( $atom ) - 2 ) );
 if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
 {
-$warnings[] = 'One or more of your search terms was excluded because either it was less than 2 characters in length or is a common word (a stopword) that is typically found on a large number of pages. Examples of stopwords include "the", "this", "which", "with", etc.';
+$warnings[] = $lang->get('search_err_query_has_stopwords');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['any']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['any'][] = $word;
 }
 else
 {
 $word = $atom;
 if ( strlen ( $word ) < 2 || in_array($word, $stopwords) )
 {
-$warnings[] = 'One or more of your search terms was excluded because either it was less than 2 characters in length or is a common word (a stopword) that is typically found on a large number of pages. Examples of stopwords include "the", "this", "which", "with", etc.';
+$warnings[] = $lang->get('search_err_query_has_stopwords');
 $ticker--;
 continue;
 }
 if(in_array($word, $ret['any']))
 {
-$warnings[] = 'One or more of your search terms was excluded because duplicate terms were encountered.';
+$warnings[] = $lang->get('search_err_query_dup_terms');
 $ticker--;
 continue;
 }
 $ret['any'][] = $word;
 }

changeset 334	c72b545f1304
parent 322	5f1cd51bf1be
child 335	67bd3121a12e