fehler in suche gefixxt

1 files changed, 8 insertions, 17 deletions

diff --git a/library/Pbs/Search.php b/library/Pbs/Search.php
index 138ebcf..971bdab 100644
--- a/library/Pbs/Search.php
+++ b/library/Pbs/Search.php
@@ -69,7 +69,6 @@ class Pbs_Search{
 		}
 		$this->searcha = $searcha;
 		$this->searchb = $searchb;
-		#print_a($searcha,$searchb);
 	}
 	public function getSearchTerm(){
 		return $this->searchTerm;
@@ -91,33 +90,25 @@ class Pbs_Search{
 					foreach($this->searcha as $sk => $sv){
 						if($k == $sk){
 							if(stristr($v,$sv)){
-								$com1[] = $counter;
+								$com1[$counter] += 1;
 							}
 						}
 					}
 				}
-				if(count($searchb) >= 0){
-					foreach($this->searchb as $sk => $sv){							 
+				if(count($this->searchb) >= 0){
+					foreach($this->searchb as $sk => $sv){	
 						 $comm = stristr($v,$sv);
 						 if($comm != false){
-						 	$com2[] = $counter;
-						 	break;
+						 	$com2[$counter] += 1;			 	
 						 }
 					}
 				}
 			}
-								
-		}
-		if (count($this->searcha) == 0){
-			$data = $com2;
-		}
-		if (count($this->searchb) == 0){
-			$data = $com1;
-		}
-		if (count($this->searcha) > 0 && count($this->searchb) > 0){
-			$data = array_intersect($com1,$com2);
+			if($com2[$counter] >= count($this->searchb) && $com1[$counter] >= count($this->searcha)){
+				// add item in resultlist
+				$data[] = $counter;				
+			}
 		}		
-		$data = array_unique($data);
 		foreach( $data as $c)
 			$ges[] = $array[$c];
 		return $ges;