--- inc/search.php	2001/08/22 11:43:59	1.2
+++ inc/search.php	2001/08/27 09:17:40	1.3
@@ -1,10 +1,11 @@
 <?php
-	$basic_logic = "OR";
+	$basic_logic = "AND";
 	function myCmp($a, $b) {
 		if ($a["caption"] == $b["caption"]) return 0;
 		return ($a["caption"] < $b["caption"]) ? -1 : 1;
 	}
 	function Search($fields, $q1_fields, $q2_fields) {
+		global $go;
 		$tp = new Smarty();
 		$qry_1 = "";
 		$qry_2 = "";
@@ -20,9 +21,9 @@
 					${"field_".$i}, ${"not_".$i},
 					${"query_".$i}, ${"logic_".$i},
 					${"concat_".$i}, ${"case_".$i};
-				if (${"delete_".$i}) { $i++; continue; }
-				if (${"and_".$i}) ${"logic_".$i} = "AND";
-				if (${"or_".$i}) ${"logic_".$i} = "OR";
+				if (${"delete_".$i}) { $go = false; $i++; continue; }
+				if (${"and_".$i}) { $go = false; ${"logic_".$i} = "AND"; }
+				if (${"or_".$i}) { $go = false; ${"logic_".$i} = "OR"; }
 				array_push($search, array(
 					"field" => ${"field_".$i},
 					"not" => ${"not_".$i},
@@ -35,6 +36,7 @@
 			}
 			global ${"and_".($i - 1)}, ${"or_".($i - 1)};
 			if (count($search) == 0 || ${"and_".($i - 1)} || ${"or_".($i - 1)}) {
+				$go = false;
 				$log = "";
 				if (${"and_".($i - 1)}) $log = "AND";
 				if (${"or_".($i - 1)}) $log = "OR";
@@ -57,7 +59,6 @@
 		}
 		if (!$stype) $stype = 0;
 		$tp->assign("stype", $stype);
-		global $go;
 		if ($go) {
 			if ($stype) {
 				$qry = "";
@@ -114,6 +115,7 @@
 					if ($is_q1) $q2[$k] = $qq;
 					if ($is_q2) $q3[$k] = $qq;
 				}
+				global $basic_logic;
 				$qry_1 = implode(" ".$basic_logic." ", $q2);
 				$qry_2 = implode(" ".$basic_logic." ", $q3);
 			}
@@ -130,7 +132,7 @@
 		global $PHP_SELF, $section, $section_menu;
 		$tp->assign("section", $section);
 		$tp->assign("section_menu", $section_menu);
-		$tp->assign("FORM_ACTION", $PHP_SELF.HTMLSpecialChars("?section=$section&stype=$stype"));
+		$tp->assign("FORM_ACTION", $PHP_SELF.HTMLSpecialChars("?section=$section&section_menu={$section_menu}&stype=$stype"));
 		$form = $tp->fetch("search.tpl");
 		return array($form, $qry_1, $qry_2);
 	}