[Webbinder-commits] root/lib/search searchlib.php,1.1.1.1,1.2

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

Update of /cvsroot/webbinder/root/lib/search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4222/lib/search

Modified Files:
	searchlib.php 
Log Message:
avoid notice for new php version

Index: searchlib.php
===================================================================
RCS file: /cvsroot/webbinder/root/lib/search/searchlib.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** searchlib.php	18 Aug 2005 13:44:07 -0000	1.1.1.1
--- searchlib.php	5 Feb 2006 14:41:49 -0000	1.2
***************
*** 38,42 ****
  	}

! 	function &find($where,$words,$offset, $maxRecords) {
  	  $exact=$this->find_exact($where,$words,$offset, $maxRecords);
  	  $part=$this->find_part($where,$words,$offset, $maxRecords);
--- 38,42 ----
  	}

! 	function find($where,$words,$offset, $maxRecords) {
  	  $exact=$this->find_exact($where,$words,$offset, $maxRecords);
  	  $part=$this->find_part($where,$words,$offset, $maxRecords);
***************
*** 62,66 ****

!         function &find_part($where,$words,$offset, $maxRecords) {
            $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY);
            if (count($words)>0) {
--- 62,66 ----

!         function find_part($where,$words,$offset, $maxRecords) {
            $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY);
            if (count($words)>0) {
***************
*** 107,111 ****
          }

! 	function &refresh_lru_wordlist($syllable) {
  		global $search_max_syllwords;
  		global $search_lru_length;
--- 107,111 ----
          }

! 	function refresh_lru_wordlist($syllable) {
  		global $search_max_syllwords;
  		global $search_lru_length;
***************
*** 161,165 ****
  	}

! 	function &get_lru_wordlist($syllable) {
  		if(!isset($this->wordlist_cache[$syllable])) {
          		$query="select `searchword` from `tiki_searchwords` where `syllable`=?";
--- 161,165 ----
  	}

! 	function get_lru_wordlist($syllable) {
  		if(!isset($this->wordlist_cache[$syllable])) {
          		$query="select `searchword` from `tiki_searchwords` where `syllable`=?";
***************
*** 172,176 ****
  	}

! 	function &get_wordlist_from_syllables($syllables) {
  		$ret=array();
  		global $search_syll_age;
--- 172,176 ----
  	}

! 	function get_wordlist_from_syllables($syllables) {
  		$ret=array();
  		global $search_syll_age;
***************
*** 199,239 ****
  	}

!         function &find_part_articles($words,$offset, $maxRecords) {
                  return $this->find_exact_articles($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_forums($words,$offset, $maxRecords) {
                  return $this->find_exact_forums($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_blogs($words,$offset, $maxRecords) {
                  return $this->find_exact_blogs($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_blog_posts($words,$offset, $maxRecords) {
                  return $this->find_exact_blog_posts($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_faqs($words,$offset, $maxRecords) {
                  return $this->find_exact_faqs($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_directory($words,$offset, $maxRecords) {
                  return $this->find_exact_directory($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_imggals($words,$offset, $maxRecords) {
                  return $this->find_exact_imggals($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_img($words,$offset, $maxRecords) {
                  return $this->find_exact_img($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function &find_part_trackers($words,$offset, $maxRecords) {
                  return $this->find_exact_trackers($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!       function &find_part_files($words,$offset, $maxRecords) {
                  return $this->find_exact_files($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }
--- 199,239 ----
  	}

!         function find_part_articles($words,$offset, $maxRecords) {
                  return $this->find_exact_articles($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_forums($words,$offset, $maxRecords) {
                  return $this->find_exact_forums($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_blogs($words,$offset, $maxRecords) {
                  return $this->find_exact_blogs($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_blog_posts($words,$offset, $maxRecords) {
                  return $this->find_exact_blog_posts($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_faqs($words,$offset, $maxRecords) {
                  return $this->find_exact_faqs($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_directory($words,$offset, $maxRecords) {
                  return $this->find_exact_directory($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_imggals($words,$offset, $maxRecords) {
                  return $this->find_exact_imggals($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_img($words,$offset, $maxRecords) {
                  return $this->find_exact_img($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!         function find_part_trackers($words,$offset, $maxRecords) {
                  return $this->find_exact_trackers($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }

!       function find_part_files($words,$offset, $maxRecords) {
                  return $this->find_exact_files($this->get_wordlist_from_syllables($words),$offset, $maxRecords);
          }
***************
*** 241,245 ****

!         function &find_part_all($words,$offset, $maxRecords) {

  			global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries,
--- 241,245 ----

!         function find_part_all($words,$offset, $maxRecords) {

  			global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries,
***************
*** 345,349 ****
          }

! 	function &find_exact($where,$words,$offset, $maxRecords) {
  	  $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY);
  	  if (count($words)>0) {
--- 345,349 ----
          }

! 	function find_exact($where,$words,$offset, $maxRecords) {
  	  $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY);
  	  if (count($words)>0) {
***************
*** 390,394 ****
  	}

! 	function &find_exact_all($words,$offset, $maxRecords) {
  		global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries,
  			$feature_articles, $feature_forums, $feature_blogs, $feature_faqs, $feature_trackers, $feature_file_galleries;
--- 390,394 ----
  	}

! 	function find_exact_all($words,$offset, $maxRecords) {
  		global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries,
  			$feature_articles, $feature_forums, $feature_blogs, $feature_faqs, $feature_trackers, $feature_file_galleries;
***************
*** 491,495 ****

!         function &find_exact_trackers($words,$offset, $maxRecords) {
  	  global $feature_trackers, $tiki_p_view_trackers_pending, $tiki_p_view_trackers_closed, $tikilib;
  	  global $user;
--- 491,495 ----

!         function find_exact_trackers($words,$offset, $maxRecords) {
  	  global $feature_trackers, $tiki_p_view_trackers_pending, $tiki_p_view_trackers_closed, $tikilib;
  	  global $user;
***************
*** 571,575 ****

!         function &find_exact_imggals($words,$offset, $maxRecords) {
            global $feature_galleries;
  	  global $user;
--- 571,575 ----

!         function find_exact_imggals($words,$offset, $maxRecords) {
            global $feature_galleries;
  	  global $user;
***************
*** 605,609 ****
          }

!         function &find_exact_img($words,$offset, $maxRecords) {
            global $feature_galleries;
  	  global $user;
--- 605,609 ----
          }

!         function find_exact_img($words,$offset, $maxRecords) {
            global $feature_galleries;
  	  global $user;
***************
*** 640,644 ****
          }

! 	function &find_exact_blogs($words,$offset, $maxRecords) {
            global $feature_blogs;
  	  global $user;
--- 640,644 ----
          }

! 	function find_exact_blogs($words,$offset, $maxRecords) {
            global $feature_blogs;
  	  global $user;
***************
*** 675,679 ****

!         function &find_exact_blog_posts($words,$offset, $maxRecords) {
            global $feature_blogs;
  	  global $user;
--- 675,679 ----

!         function find_exact_blog_posts($words,$offset, $maxRecords) {
            global $feature_blogs;
  	  global $user;
***************
*** 710,714 ****
          }

! 	function &find_exact_articles($words,$offset, $maxRecords) {
  	  global $feature_articles;
  	  global $user;
--- 710,714 ----
          }

! 	function find_exact_articles($words,$offset, $maxRecords) {
  	  global $feature_articles;
  	  global $user;
***************
*** 744,748 ****
  	}

! 	function &find_exact_wiki($words,$offset, $maxRecords) {
  	  global $feature_wiki;
  	  global $user;
--- 744,748 ----
  	}

! 	function find_exact_wiki($words,$offset, $maxRecords) {
  	  global $feature_wiki;
  	  global $user;
***************
*** 780,784 ****
          }

!         function &find_exact_directory($words,$offset, $maxRecords) {
            global $feature_directory;
  	  global $user;
--- 780,784 ----
          }

!         function find_exact_directory($words,$offset, $maxRecords) {
            global $feature_directory;
  	  global $user;
***************
*** 815,819 ****
          }

!         function &find_exact_directory_sites($words,$offset, $maxRecords) {
            global $feature_directory;
  	  global $user;
--- 815,819 ----
          }

!         function find_exact_directory_sites($words,$offset, $maxRecords) {
            global $feature_directory;
  	  global $user;
***************
*** 853,857 ****

! 	function &find_exact_faqs($words,$offset, $maxRecords) {
            global $feature_faqs;
  	  global $user;
--- 853,857 ----

! 	function find_exact_faqs($words,$offset, $maxRecords) {
            global $feature_faqs;
  	  global $user;
***************
*** 888,892 ****
          }

!         function &find_exact_faqquestions($words,$offset, $maxRecords) {
            global $feature_faqs;
  	  global $user;
--- 888,892 ----
          }

!         function find_exact_faqquestions($words,$offset, $maxRecords) {
            global $feature_faqs;
  	  global $user;
***************
*** 924,928 ****

!         function &find_exact_forums($words,$offset, $maxRecords) {
            global $feature_forums;
  	  global $user;
--- 924,928 ----

!         function find_exact_forums($words,$offset, $maxRecords) {
            global $feature_forums;
  	  global $user;
***************
*** 959,963 ****
          }

! 	function &find_exact_forumcomments($words,$offset, $maxRecords) {
  	  global $feature_forums;
  	  global $user;
--- 959,963 ----
          }

! 	function find_exact_forumcomments($words,$offset, $maxRecords) {
  	  global $feature_forums;
  	  global $user;
***************
*** 993,997 ****
  	  }
  	}
! 	function &find_exact_files($words,$offset, $maxRecords) {
  	  global $feature_file_galleries;
  	  global $user;
--- 993,997 ----
  	  }
  	}
! 	function find_exact_files($words,$offset, $maxRecords) {
  	  global $feature_file_galleries;
  	  global $user;