phpbb-checkins Mailing List for phpBB (Page 587)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv12407/includes

Modified Files:
	search.php 
Log Message:
Simplified routines somewhat and introduced title searching

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.php	2002/01/03 11:06:21	1.1
--- search.php	2002/01/14 14:17:18	1.2
***************
*** 20,74 ****
   ***************************************************************************/
  
! function clean_words($entry, &$stopword_list, &$synonym_list)
  {
  	// Weird, $init_match doesn't work with static when double quotes (") are used...
! 	static $init_match =   array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%');
! 	static $init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ");
  
- 	static $later_match =   array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
- 	static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ",  " ", " ", " ");
- 
- 	static $sgml_match = array("&nbsp;", "&szlig;", "&agrave;", "&aacute;", "&acirc;", "&atilde;", "&auml;", "&aring;", "&aelig;", "&ccedil;", "&egrave;", "&eacute;", "&ecirc;", "&euml;", "&igrave;", "&iacute;", "&icirc;", "&iuml;", "&eth;", "&ntilde;", "&ograve;", "&oacute;", "&ocirc;", "&otilde;", "&ouml;", "&oslash;", "&ugrave;", "&uacute;", "&ucirc;", "&uuml;", "&yacute;", "&thorn;", "&yuml;");
- 	static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
- 
  	static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
  	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
  	$entry = " " . strip_tags(strtolower($entry)) . " ";
- 
- 	$entry = str_replace($sgml_match, $sgml_match, $entry);
- 	$entry = str_replace($accent_match, $accent_replace, $entry);
  
! 	// Replace line endings by a space
! 	$entry = preg_replace("/[\n\r]/is", " ", $entry); 
! 	// Remove URL's
! 	$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry); 
  
! 	// Filter out strange characters like ^, $, &, change "it's" to "its"
! 	// str_replace with arrays is buggy in some PHP versions so traverse the arrays manually ;(
! 	for($i = 0; $i < count($init_match); $i++)
  	{
! 		$entry = str_replace($init_match[$i], $init_replace[$i], $entry);
  	}
  
! 	// Quickly remove BBcode.
! 	$entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry); 
! 	$entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry); 
! 	$entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
! 	// URLs
! 	$entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
! 	$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
! 	// Numbers
  	$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry); 
! 	// HTML entities like &1234;
! 	$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry); 
! 	// 'words' that consist of <2 or >50 characters are removed.
! 	$entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry); 
! 	$entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry); 
  
! 	// Remove some more strange characters
! 	for($i = 0; $i < count($later_match); $i++)
  	{
! 		$entry = str_replace($later_match[$i], $later_replace[$i], $entry);
  	}
  
--- 20,73 ----
   ***************************************************************************/
  
! function clean_words($mode, $entry, &$stopword_list, &$synonym_list)
  {
  	// Weird, $init_match doesn't work with static when double quotes (") are used...
! 	static $drop_char_match =   array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '*', '!');
! 	static $drop_char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ",  " ", " ", " ");
  
  	static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
  	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
  	$entry = " " . strip_tags(strtolower($entry)) . " ";
  
! 	for($i = 0; $i < count($accent_match); $i++)
! 	{
! 		$entry = str_replace($accent_match[$i], $accent_replace[$i], $entry);
! 	}
  
! 	if( $mode == "post" )
  	{
! 		// HTML entities like &nbsp;
! 		$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry); 
! 		// Replace line endings by a space
! 		$entry = preg_replace("/[\n\r]/is", " ", $entry); 
! 		// Remove URL's
! 		$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry); 
! 		// Quickly remove BBcode.
! 		$entry = preg_replace("/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/is", " ", $entry); 
! 		$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
! 		$entry = preg_replace("/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
  	}
+ 	else if( $mode == "search" ) 
+ 	{
+ 		$entry = str_replace("+", " and ", $entry);
+ 		$entry = str_replace("-", " not ", $entry);
+ 	}
  
! 	// Replace numbers on their own
  	$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry); 
! 
! 	//
! 	// Filter out strange characters like ^, $, &, change "it's" to "its"
! 	//
! 	for($i = 0; $i < count($drop_char_match); $i++)
! 	{
! 		$entry = str_replace($drop_char_match[$i], $drop_char_replace[$i], $entry);
! 	}
  
! 	if( $mode == "post" )
  	{
! 		// 'words' that consist of <=2 or >=50 characters are removed.
! 		$entry = preg_replace("/\b([a-z0-9]{1,2}|[a-z0-9]{50,})\b/si", " ", $entry); 
  	}
  
***************
*** 78,82 ****
  		{
  			$filter_word = trim(strtolower($stopword_list[$j]));
! 			$entry =  preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
  		}
  	}
--- 77,85 ----
  		{
  			$filter_word = trim(strtolower($stopword_list[$j]));
! 
! 			if( ( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" ) || $mode == "post" )
! 			{
! 				$entry =  preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry);
! 			}
  		}
  	}
***************
*** 87,91 ****
  		{
  			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
! 			$entry =  preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
  		}
  	}
--- 90,99 ----
  		{
  			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
! 
! 			if( ( $match_synonym != "and" && $match_synonym != "or" && $match_synonym != "not" && 
! 				$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" ) || $mode == "post" )
! 			{
! 				$entry =  preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
! 			}
  		}
  	}
***************
*** 93,128 ****
  	return $entry;
  }
  
! function clean_words_search($entry)
  {
  
! 	$char_match =   array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%", "~", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "!");
! 	$char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
  
! 	$sgml_match = array("&nbsp;", "&szlig;", "&agrave;", "&aacute;", "&acirc;", "&atilde;", "&auml;", "&aring;", "&aelig;", "&ccedil;", "&egrave;", "&eacute;", "&ecirc;", "&euml;", "&igrave;", "&iacute;", "&icirc;", "&iuml;", "&eth;", "&ntilde;", "&ograve;", "&oacute;", "&ocirc;", "&otilde;", "&ouml;", "&oslash;", "&ugrave;", "&uacute;", "&ucirc;", "&uuml;", "&yacute;", "&thorn;", "&yuml;");
! 	$sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
! 	$accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
! 	$accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
  
! 	$entry = " " . strip_tags(strtolower($entry)) . " ";
  
! 	$entry = str_replace("+", " and ", $entry);
! 	$entry = str_replace("-", " not ", $entry);
  
! 	$entry = str_replace($sgml_match, $sgml_match, $entry);
! 	$entry = str_replace($accent_match, $accent_replace, $entry);
! 	$entry = str_replace($char_match, $char_replace, $entry); 
  
! 	$entry = preg_replace("/\b[0-9]+\b/", " ", $entry);
  
! 	return $entry;
! }
  
! function split_words(&$entry)
! {
! 	preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
  
! 	return $split_entries[1];
  }
  
--- 101,218 ----
  	return $entry;
  }
+ 
+ function split_words(&$entry)
+ {
+ 	preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
+ 
+ 	return $split_entries[1];
+ }
  
! function add_search_words($post_id, $post_text, $post_title = "")
  {
+ 	global $db, $phpbb_root_path, $board_config, $lang;
  
! 	$stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt"); 
! 	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
  
! 	$search_raw_words = array();
! 	$search_raw_words['text'] = split_words(clean_words("post", $post_text, $stopword_array, $synonym_array));
! 	$search_raw_words['title'] = split_words(clean_words("post", $post_title, $stopword_array, $synonym_array));
  
! 	while( list($word_in, $search_matches) = @each($search_raw_words) )
! 	{
! 		$title_match = ( $word_in == 'title' ) ? 1 : 0;
  
! 		if( count($search_matches) )
! 		{
! 			$word = array();
! 			sort($search_matches);
  
! 			$word_text_sql = "";
! 			for ($i = 0; $i < count($search_matches); $i++)
! 			{ 
! 				$search_matches[$i] = trim($search_matches[$i]);
  
! 				if( $search_matches[$i] != "" && $search_matches[$i] != $search_matches[$i-1] ) 
! 				{
! 					$word[] = $search_matches[$i]; 
  
! 					if( $word_text_sql != "" )
! 					{
! 						$word_text_sql .= ", ";
! 					}
  
! 					$word_text_sql .= "'" . $search_matches[$i] . "'";
! 				} 
! 			}
  
! 			$sql = "SELECT word_id, word_text, word_common    
! 				FROM " . SEARCH_WORD_TABLE . " 
! 				WHERE word_text IN ($word_text_sql)";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
! 			}
  
! 			$check_words = array();
! 			$word_id_list = array();
! 			if( $word_check_count = $db->sql_numrows($result) )
! 			{
! 				while( $row = $db->sql_fetchrow($result) )
! 				{
! 					$check_words[$row['word_text']] = $row['word_common'];
! 					$word_id_list[] = $row['word_id'];
! 				}
! 			}
! 
! 			$match_word = array();
! 			for ($i = 0; $i < count($word); $i++)
! 			{ 
! 				$new_match = true;
! 				$word_common = false;
! 
! 				if( $word_check_count )
! 				{
! 					if( isset($check_words[$word[$i]]) )
! 					{
! 						$new_match = false;
! 					}
! 				}
! 
! 				if( !$check_words[$word[$i]] )
! 				{
! 					$match_word[] = "'" . $word[$i] . "'";
! 				}
! 
! 				if( $new_match )
! 				{
! 					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . "  (word_text, word_common) 
! 						VALUES ('" . $word[$i] . "', 0)"; 
! 					$result = $db->sql_query($sql); 
! 					if( !$result )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
! 					}
! 				}
! 			}
! 
! 			$word_sql_in = implode(", ", $match_word);
! 
! 			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
! 				SELECT $post_id, word_id, $title_match  
! 					FROM " . SEARCH_WORD_TABLE . " 
! 					WHERE word_text IN ($word_sql_in)"; 
! 			$result = $db->sql_query($sql); 
! 			if( !$result )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
! 			}
! 		}
! 	}
! 
! 	remove_common("single", 40, $word_id_list);
! 
! 	return;
  }
  
***************
*** 130,140 ****
  // Check if specified words are too common now
  //
! function remove_common($percent, $word_id_list = array())
  {
  	global $db;
  
- 	// 0.01-0.06s
- 	$sql = "SELECT SUM(forum_posts) AS total_posts 
- 		FROM " . FORUMS_TABLE ;
  	$result = $db->sql_query($sql); 
  	if( !$result )
--- 220,229 ----
  // Check if specified words are too common now
  //
! function remove_common($mode, $percent, $word_id_list = array())
  {
  	global $db;
+ 
+ 	$sql = ( $mode == "global" ) ? "SELECT COUNT(DISTINCT post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
  
  	$result = $db->sql_query($sql); 
  	if( !$result )
***************
*** 150,159 ****
  
  		$word_id_sql = "";
! 		if( count($word_id_list) )
  		{
  			$word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
  		}
  
- 		// 0.020-0.024s
  		$sql = "SELECT word_id 
  			FROM " . SEARCH_MATCH_TABLE . " 
--- 239,247 ----
  
  		$word_id_sql = "";
! 		if( $mode == "single" && count($word_id_list) )
  		{
  			$word_id_sql = "WHERE word_id IN (" . implode(", ", $word_id_list) . ") ";
  		}
  
  		$sql = "SELECT word_id 
  			FROM " . SEARCH_MATCH_TABLE . " 
***************
*** 167,171 ****
  		}
  
- 		// No matches
  		if( $word_count = $db->sql_numrows($result) )
  		{
--- 255,258 ----
***************
*** 205,281 ****
  }
  
- //
- // Search complete wordlist for words that are too common
- //
- function remove_common_global($percent, $delete_common = 0)
- {
- 	global $db;
- 	
- 	$sql = "SELECT COUNT(DISTINCT post_id) as total_posts
- 	   FROM " . SEARCH_MATCH_TABLE;
- 	$result = $db->sql_query($sql); 
- 	if( !$result )
- 	{
- 	   $error = $db->sql_error();
- 	   die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
- 	}
- 	$total_posts = $db->sql_fetchrow($result);
- 	$total_posts = $total_posts['total_posts'];
- 	
- 	$common_threshold = floor($total_posts * ( $percent / 100 ));
- 
- 	$sql = "SELECT word_id 
- 		FROM " . SEARCH_MATCH_TABLE . "
- 		GROUP BY word_id
- 		HAVING count(word_id) > $common_threshold";
- 	$result = $db->sql_query($sql); 
- 	if( !$result )
- 	{
- 	   $error = $db->sql_error();
- 	   die("Couldn't obtain common word list :: " . $sql . " :: " . $error['message']);
- 	}
- 	$common_words =  $db->sql_numrows($result);
- 
- 	while($row = $db->sql_fetchrow($result))
- 	{
- 		$common_word_ids[] = $row['word_id'];
- 	}
- 	$db->sql_freeresult($result);
- 	
- 	if(count($common_word_ids) != 0)
- 	{
- 		$common_word_ids = implode(',',$common_word_ids);
- 	}
- 	else
- 	{
- 		// We didn't remove any common words
- 		return 0;
- 	}
- 
- 	$sql = "UPDATE ". SEARCH_WORD_TABLE ."
- 		SET word_common = 1
- 		WHERE word_id IN ($common_word_ids)";
- 	$result = $db->sql_query($sql); 
- 	if( !$result )
- 	{
- 		$error = $db->sql_error();
- 		die("Couldn't delete word list entry :: " . $sql . " :: " . $error['message']);
- 	}
- 
- 	if( $delete_common)
- 	{
- 		$sql = "DELETE FROM ".SEARCH_MATCH_TABLE." 
- 			WHERE word_id IN ($common_word_ids)";
- 		$result = $db->sql_query($sql); 
- 		if( !$result )
- 		{
- 			$error = $db->sql_error();
- 			die("Couldn't delete word match entry :: " . $sql . " :: " . $error['message']);
- 		}
- 	}
- 	
- 	return $common_words;
- }
- 
  function remove_unmatched_words()
  {
--- 292,295 ----
***************
*** 337,341 ****
  		case 'mysql':
  		case 'mysql4':
- 			// 0.07s
  			$sql = "SELECT w.word_id 
  				FROM " . SEARCH_WORD_TABLE . " w 
--- 351,354 ----
***************
*** 356,360 ****
  					if( $word_id_sql )
  					{
- 						// 0.07s (about 15-20 words)
  						$sql = "DELETE FROM " . SEARCH_WORD_TABLE . "  
  							WHERE word_id IN ($word_id_sql)";
--- 369,372 ----
***************
*** 381,523 ****
  	return $unmatched_count;
  }
- 
- function add_search_words($post_id, $post_text, $post_title = "")
- {
- 	global $db, $phpbb_root_path, $board_config, $lang;
- 
- 	$stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt"); 
- 	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
- 
- 	$search_text = clean_words($post_text, $stopword_array, $synonym_array);
- 	$search_matches = split_words($search_text);
- 
- 	if( count($search_matches) )
- 	{
- 		$word = array();
- 		sort($search_matches);
- 
- 		$word_text_sql = "";
- 		for ($i = 0; $i < count($search_matches); $i++)
- 		{ 
- 			$search_matches[$i] = trim($search_matches[$i]);
- 
- 			if( $search_matches[$i] != "" && $search_matches[$i] != $search_matches[$i-1] ) 
- 			{
- 				$word[] = $search_matches[$i]; 
- 
- 				if( $word_text_sql != "" )
- 				{
- 					$word_text_sql .= ", ";
- 				}
- 
- 				$word_text_sql .= "'" . $search_matches[$i] . "'";
- 			} 
- 		}
- 
- 		$sql = "SELECT word_id, word_text, word_common    
- 			FROM " . SEARCH_WORD_TABLE . " 
- 			WHERE word_text IN ($word_text_sql)";
- 		$result = $db->sql_query($sql);
- 		if( !$result )
- 		{
- 			message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
- 		}
- 
- 		$check_words = array();
- 		$word_id_list = array();
- 		if( $word_check_count = $db->sql_numrows($result) )
- 		{
- 			while( $row = $db->sql_fetchrow($result) )
- 			{
- 				$check_words[$row['word_text']] = $row['word_common'];
- 				$word_id_list[] = $row['word_id'];
- 			}
- 		}
- 
- 		$match_word = array();
- 		for ($i = 0; $i < count($word); $i++)
- 		{ 
- 			$new_match = true;
- 			$word_common = false;
- 
- 			if( $word_check_count )
- 			{
- 				if( isset($check_words[$word[$i]]) )
- 				{
- 					$new_match = false;
- 				}
- 			}
- 
- 			if( !$check_words[$word[$i]] )
- 			{
- 				$match_word[] = "'" . $word[$i] . "'";
- 			}
- 
- 			if( $new_match )
- 			{
- 				$sql = "INSERT INTO " . SEARCH_WORD_TABLE . "  (word_text, word_common) 
- 					VALUES ('". $word[$i] . "', 0)"; 
- 				$result = $db->sql_query($sql); 
- 				if( !$result )
- 				{
- 					message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
- 				}
- 			}
- 		}
- 
- 		$word_sql_in = implode(", ", $match_word);
- 
- 		$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
- 			SELECT $post_id, word_id, 0 
- 				FROM " . SEARCH_WORD_TABLE . " 
- 				WHERE word_text IN ($word_sql_in)";
- 		$result = $db->sql_query($sql); 
- 		if( !$result )
- 		{
- 			message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
- 		}
- 	}
- 
- 	remove_common(0.15, $word_id_list);
- 
- 	return;
- }
- 
- function remove_stop_words($entry, &$stopword_list)
- {
- 
- 	if( !empty($stopword_list) )
- 	{
- 		for ($j = 0; $j < count($stopword_list); $j++)
- 		{ 
- 			$filter_word = trim(strtolower($stopword_list[$j])); 
- 			if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
- 			{
- 				$entry =  preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry); 
- 			}
- 		} 
- 	}
- 
- 	return $entry;
- }
- 
- function replace_synonyms($entry, &$synonym_list)
- {
- 	if( !empty($synonym_list) )
- 	{
- 		for ($j = 0; $j < count($synonym_list); $j++)
- 		{ 
- 			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j]))); 
- 
- 			if( $match_synonym != "and" && $match_synonym != "or" && $match_synonym != "not" && 
- 				$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
- 			{
- 				$entry =  preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry); 
- 			}
- 		} 
- 	}
- 
- 	return $entry;
- }
  
! ?>
--- 393,396 ----
  	return $unmatched_count;
  }
  
! ?>
\ No newline at end of file

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (193)	Nov (393)	Dec (347)
2002	Jan (401)	Feb (232)	Mar (343)	Apr (129)	May (129)	Jun (116)	Jul (189)	Aug (129)	Sep (68)	Oct (172)	Nov (298)	Dec (148)
2003	Jan (264)	Feb (210)	Mar (322)	Apr (309)	May (234)	Jun (188)	Jul (215)	Aug (161)	Sep (234)	Oct (163)	Nov (110)	Dec (7)
2004	Jan (95)	Feb (107)	Mar (55)	Apr (3)	May (49)	Jun (35)	Jul (57)	Aug (43)	Sep (56)	Oct (40)	Nov (25)	Dec (21)
2005	Jan (93)	Feb (25)	Mar (22)	Apr (72)	May (45)	Jun (24)	Jul (29)	Aug (20)	Sep (50)	Oct (93)	Nov (69)	Dec (183)
2006	Jan (185)	Feb (143)	Mar (402)	Apr (260)	May (322)	Jun (367)	Jul (234)	Aug (299)	Sep (206)	Oct (288)	Nov (338)	Dec (307)
2007	Jan (296)	Feb (250)	Mar (261)	Apr (434)	May (539)	Jun (274)	Jul (440)	Aug (190)	Sep (128)	Oct (249)	Nov (86)	Dec (51)
2008	Jan (177)	Feb (67)	Mar (61)	Apr (48)	May (56)	Jun (97)	Jul (60)	Aug (64)	Sep (151)	Oct (79)	Nov (109)	Dec (123)
2009	Jan (70)	Feb (70)	Mar (73)	Apr (80)	May (22)	Jun (193)	Jul (191)	Aug (181)	Sep (120)	Oct (48)	Nov (24)	Dec

phpbb-checkins Mailing List for phpBB (Page 587)

phpBB is the world's leading open source discussion forum software.

phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com