X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FSEARCH.php;h=ae28362260b254d4ab5a4e730cb44283b1fa1f58;hb=1b12994176cd3e82b32eca66a99ab4bca9b74760;hp=4420c09f1a4ad2d91013e5255beb02fa98cf0ccb;hpb=b7e5335177b8724f95d0f9b7e08550f4d9ec91b4;p=nucleus-jp%2Fnucleus-next.git

diff --git a/nucleus/libs/SEARCH.php b/nucleus/libs/SEARCH.php
index 4420c09..ae28362 100644
--- a/nucleus/libs/SEARCH.php
+++ b/nucleus/libs/SEARCH.php
@@ -1,221 +1,221 @@
-<?php
-
-/*
- * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2003-2009 The Nucleus Group
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * (see nucleus/documentation/index.html#license for more info)
- */
-/**
- * SEARCH(querystring) offers different functionality to create an
- * SQL query to find certain items. (and comments)
- *
- * based on code by David Altherr:
- * http://www.evolt.org/article/Boolean_Fulltext_Searching_with_PHP_and_MySQL/18/15665/
- * http://davidaltherr.net/web/php_functions/boolean/funcs.mysql.boolean.txt
- *
- * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2009 The Nucleus Group
- * @version $Id: SEARCH.php 1556 2011-07-11 14:18:48Z ftruscot $
- */
-
-
-
-class SEARCH {
-
-	var $querystring;
-	var $marked;
-	var $inclusive;
-	var $blogs;
-
-
-	function SEARCH($text) {
-		global $blogid;
-		$text = preg_replace ("/[<,>,=,?,!,#,^,(,),[,\],:,;,\\\,%]/","",$text);
-		$this->querystring	= $text;
-		$this->marked		= $this->boolean_mark_atoms($text);
-		$this->inclusive	= $this->boolean_inclusive_atoms($text);
-		$this->blogs		= array();
-
-		// get all public searchable blogs, no matter what, include the current blog allways.
-		$res = sql_query('SELECT bnumber FROM '.sql_table('blog').' WHERE bincludesearch=1 ');
-		while ($obj = sql_fetch_object($res))
-			$this->blogs[] = intval($obj->bnumber);
-	}
-
-	function  boolean_sql_select($match){
-		if (i18n::strlen($this->inclusive) > 0) {
-		   /* build sql for determining score for each record */
-		   $result=i18n::explode(" ",$this->inclusive);
-		   for($cth=0;$cth<count($result);$cth++){
-			   if(i18n::strlen($result[$cth])>=4){
-				   $stringsum_long .=  " $result[$cth] ";
-			   }else{
-				   $stringsum_a[] = ' '.$this->boolean_sql_select_short($result[$cth],$match).' ';
-			   }
-		   }
-
-		   if(i18n::strlen($stringsum_long)>0){
-				$stringsum_long = sql_real_escape_string($stringsum_long);
-				$stringsum_a[] = " match ($match) against ('$stringsum_long') ";
-		   }
-
-		   $stringsum .= implode("+",$stringsum_a);
-		   return $stringsum;
-		}
-	}
-
-	function boolean_inclusive_atoms($string){
-		$result = trim($string);
-		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
-
-		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
-		# just added delimiters to regex and the 'i' for case-insensitive matching
-
-		/* convert normal boolean operators to shortened syntax */
-		$result = preg_replace('# not #i', ' -', $result);
-		$result = preg_replace('# and #i', ' ', $result);
-		$result = preg_replace('# or #i', ',', $result);
-
-		/* drop unnecessary spaces */
-		$result = str_replace(' ,', ',', $result);
-		$result = str_replace(', ', ',', $result);
-		$result = str_replace('- ', '-', $result);
-		$result = str_replace('+', '', $result);
-
-		/* strip exlusive atoms */
-		$result = preg_replace(
-			"#\-\([A-Za-z0-9]{1,}[A-Za-z0-9\-\.\_\,]{0,}\)#",
-			'',
-			$result);
-
-		$result = str_replace('(', ' ', $result);
-		$result = str_replace(')', ' ', $result);
-		$result = str_replace(',', ' ', $result);
-
-		return $result;
-	}
-
-    function boolean_sql_where($match){
-
-        $result = $this->marked;
-
-        $this->boolean_sql_where_cb1($match); // set the static $match
-
-        $result = preg_replace_callback(
-
-            "/foo\[\(\'([^\)]{4,})\'\)\]bar/",
-
-            array($this,'boolean_sql_where_cb1'),
-
-            $result);
-
-        $this->boolean_sql_where_cb2($match); // set the static $match
-
-        $result = preg_replace_callback(
-
-            "/foo\[\(\'([^\)]{1,3})\'\)\]bar/",
-
-            array($this,'boolean_sql_where_cb2'),
-
-            $result);
-
-        return $result;
-
-    }
-
-    function boolean_sql_where_cb1($matches){
-
-        static $match;
-
-        if (!is_array($matches)) $match=$matches;
-
-        else return ' match ('.$match.') against (\''.sql_real_escape_string($matches[1]).'\') > 0 ';
-
-    }
-
-    function boolean_sql_where_cb2($matches){
-
-        static $match;
-
-        if (!is_array($matches)) $match=$matches;
-
-        else return ' ('.$this->boolean_sql_where_short(sql_real_escape_string($matches[1]),$match).') ';
-
-    }	
-
-	function boolean_mark_atoms($string){
-		$result = trim($string);
-		$result = preg_replace("/([[:space:]]{2,})/",' ',$result);
-
-		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
-		# just added delimiters to regex and the 'i' for case-insensitive matching
-
-		/* convert normal boolean operators to shortened syntax */
-		$result = preg_replace('# not #i', ' -', $result);
-		$result = preg_replace('# and #i', ' ', $result);
-		$result = preg_replace('# or #i', ',', $result);
-
-		/* strip excessive whitespace */
-		$result = str_replace('( ', '(', $result);
-		$result = str_replace(' )', ')', $result);
-		$result = str_replace(', ', ',', $result);
-		$result = str_replace(' ,', ',', $result);
-		$result = str_replace('- ', '-', $result);
-		$result = str_replace('+', '', $result);
-
-		// remove double spaces (we might have introduced some new ones above)
-		$result = trim($result);
-		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
-
-		/* apply arbitrary function to all 'word' atoms */
-
-		$result_a = i18n::explode(' ', $result);
-
-		for($word = 0;$word<count($result_a);$word++)
-		{
-			$result_a[$word] = "foo[('" . $result_a[$word] . "')]bar";
-		}
-
-		$result = implode(' ', $result_a);
-
-		/* dispatch ' ' to ' AND ' */
-		$result = str_replace(' ', ' AND ', $result);
-
-		/* dispatch ',' to ' OR ' */
-		$result = str_replace(',', ' OR ', $result);
-
-		/* dispatch '-' to ' NOT ' */
-		$result = str_replace(' -', ' NOT ', $result);
-		return $result;
-	}
-
-	function boolean_sql_where_short($string,$match){
-		$match_a = i18n::explode(',',$match);
-		for($ith=0;$ith<count($match_a);$ith++){
-			$like_a[$ith] = " $match_a[$ith] LIKE '% $string %' ";
-		}
-		$like = implode(" OR ",$like_a);
-
-		return $like;
-	}
-	function boolean_sql_select_short($string,$match){
-		$match_a = i18n::explode(',',$match);
-		$score_unit_weight = .2;
-		for($ith=0;$ith<count($match_a);$ith++){
-			$score_a[$ith] =
-						   " $score_unit_weight*(
-						   LENGTH(" . sql_real_escape_string($match_a[$ith]) . ") -
-						   LENGTH(REPLACE(LOWER(" . sql_real_escape_string($match_a[$ith]) . "),LOWER('" . sql_real_escape_string($string) . "'),'')))
-						   /LENGTH('" . sql_real_escape_string($string) . "') ";
-		}
-		$score = implode(" + ",$score_a);
-
-		return $score;
-	}
-}
-?>
+<?php
+
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2003-2009 The Nucleus Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+/**
+ * SEARCH(querystring) offers different functionality to create an
+ * SQL query to find certain items. (and comments)
+ *
+ * based on code by David Altherr:
+ * http://www.evolt.org/article/Boolean_Fulltext_Searching_with_PHP_and_MySQL/18/15665/
+ * http://davidaltherr.net/web/php_functions/boolean/funcs.mysql.boolean.txt
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: SEARCH.php 1556 2011-07-11 14:18:48Z ftruscot $
+ */
+
+
+
+class Search
+{
+	var $querystring;
+	var $marked;
+	var $inclusive;
+	var $blogs;
+
+
+	function SEARCH($text) {
+		global $blogid;
+		$text = preg_replace ("/[<,>,=,?,!,#,^,(,),[,\],:,;,\\\,%]/","",$text);
+		$this->querystring	= $text;
+		$this->marked		= $this->boolean_mark_atoms($text);
+		$this->inclusive	= $this->boolean_inclusive_atoms($text);
+		$this->blogs		= array();
+
+		// get all public searchable blogs, no matter what, include the current blog allways.
+		$res = DB::getResult('SELECT bnumber FROM '.sql_table('blog').' WHERE bincludesearch=1 ');
+		foreach ( $res as $row )
+			$this->blogs[] = intval($row['bnumber']);
+	}
+
+	function  boolean_sql_select($match){
+		if (i18n::strlen($this->inclusive) > 0) {
+		   /* build sql for determining score for each record */
+		   $result=preg_split("# #",$this->inclusive);
+		   for($cth=0;$cth<count($result);$cth++){
+			   if(i18n::strlen($result[$cth])>=4){
+				   $stringsum_long .=  " $result[$cth] ";
+			   }else{
+				   $stringsum_a[] = ' '.$this->boolean_sql_select_short($result[$cth],$match).' ';
+			   }
+		   }
+
+		   if(i18n::strlen($stringsum_long)>0){
+				$stringsum_long = DB::quoteValue($stringsum_long);
+				$stringsum_a[] = " match ({$match}) against ({$stringsum_long}) ";
+		   }
+
+		   $stringsum .= implode("+",$stringsum_a);
+		   return $stringsum;
+		}
+	}
+
+	function boolean_inclusive_atoms($string){
+		$result = trim($string);
+		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
+
+		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
+		# just added delimiters to regex and the 'i' for case-insensitive matching
+
+		/* convert normal boolean operators to shortened syntax */
+		$result = preg_replace('# not #i', ' -', $result);
+		$result = preg_replace('# and #i', ' ', $result);
+		$result = preg_replace('# or #i', ',', $result);
+
+		/* drop unnecessary spaces */
+		$result = str_replace(' ,', ',', $result);
+		$result = str_replace(', ', ',', $result);
+		$result = str_replace('- ', '-', $result);
+		$result = str_replace('+', '', $result);
+
+		/* strip exlusive atoms */
+		$result = preg_replace(
+			"#\-\([A-Za-z0-9]{1,}[A-Za-z0-9\-\.\_\,]{0,}\)#",
+			'',
+			$result);
+
+		$result = str_replace('(', ' ', $result);
+		$result = str_replace(')', ' ', $result);
+		$result = str_replace(',', ' ', $result);
+
+		return $result;
+	}
+
+    function boolean_sql_where($match){
+
+        $result = $this->marked;
+
+        $this->boolean_sql_where_cb1($match); // set the static $match
+
+        $result = preg_replace_callback(
+
+            "/foo\[\(\'([^\)]{4,})\'\)\]bar/",
+
+            array($this,'boolean_sql_where_cb1'),
+
+            $result);
+
+        $this->boolean_sql_where_cb2($match); // set the static $match
+
+        $result = preg_replace_callback(
+
+            "/foo\[\(\'([^\)]{1,3})\'\)\]bar/",
+
+            array($this,'boolean_sql_where_cb2'),
+
+            $result);
+
+        return $result;
+
+    }
+
+    function boolean_sql_where_cb1($matches){
+
+        static $match;
+
+        if (!is_array($matches)) $match=$matches;
+
+        else return ' match ('.$match.') against ('.DB::quoteValue($matches[1]).') > 0 ';
+
+    }
+
+    function boolean_sql_where_cb2($matches){
+
+        static $match;
+
+        if (!is_array($matches)) $match=$matches;
+
+        else return ' ('.$this->boolean_sql_where_short($matches[1], $match).') ';
+
+    }	
+
+	function boolean_mark_atoms($string){
+		$result = trim($string);
+		$result = preg_replace("/([[:space:]]{2,})/",' ',$result);
+
+		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
+		# just added delimiters to regex and the 'i' for case-insensitive matching
+
+		/* convert normal boolean operators to shortened syntax */
+		$result = preg_replace('# not #i', ' -', $result);
+		$result = preg_replace('# and #i', ' ', $result);
+		$result = preg_replace('# or #i', ',', $result);
+
+		/* strip excessive whitespace */
+		$result = str_replace('( ', '(', $result);
+		$result = str_replace(' )', ')', $result);
+		$result = str_replace(', ', ',', $result);
+		$result = str_replace(' ,', ',', $result);
+		$result = str_replace('- ', '-', $result);
+		$result = str_replace('+', '', $result);
+
+		// remove double spaces (we might have introduced some new ones above)
+		$result = trim($result);
+		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
+
+		/* apply arbitrary function to all 'word' atoms */
+
+		$result_a = preg_split('# #', $result);
+
+		for($word = 0;$word<count($result_a);$word++)
+		{
+			$result_a[$word] = "foo[('" . $result_a[$word] . "')]bar";
+		}
+
+		$result = implode(' ', $result_a);
+
+		/* dispatch ' ' to ' AND ' */
+		$result = str_replace(' ', ' AND ', $result);
+
+		/* dispatch ',' to ' OR ' */
+		$result = str_replace(',', ' OR ', $result);
+
+		/* dispatch '-' to ' NOT ' */
+		$result = str_replace(' -', ' NOT ', $result);
+		return $result;
+	}
+
+	function boolean_sql_where_short($string,$match){
+		$match_a = preg_split('#,#',$match);
+		for($ith=0;$ith<count($match_a);$ith++){
+			$like_a[$ith] = ' $match_a[$ith] LIKE ' . DB::quoteValue("% {$string} %") . ' ';
+		}
+		$like = implode(" OR ",$like_a);
+
+		return $like;
+	}
+	function boolean_sql_select_short($string,$match){
+		$match_a = preg_split('#,#',$match);
+		$score_unit_weight = .2;
+		for($ith=0;$ith<count($match_a);$ith++){
+			$score_a[$ith] =
+						   " $score_unit_weight*(
+						   LENGTH(" . DB::quoteValue($match_a[$ith]) . ") -
+						   LENGTH(REPLACE(LOWER(" . DB::quoteValue($match_a[$ith]) . "),LOWER(" . DB::quoteValue($string) . "),'')))
+						   /LENGTH(" . DB::quoteValue($string) . ") ";
+		}
+		$score = implode(" + ",$score_a);
+
+		return $score;
+	}
+}
+?>