--- inc/search.php	2001/08/30 16:35:36	1.4
+++ inc/search.php	2001/09/03 15:52:16	1.5
@@ -1,5 +1,8 @@
 <?php
 	$basic_logic = "AND";
+	function MySort($a, $b) {
+		return MyCompare($a["caption"], $b["caption"]);
+	}
 	function Search($fields, $q1_fields, $q2_fields, $def_field = "") {
 		global $go;
 		$tp = new Smarty();
@@ -62,14 +65,14 @@
 				$i = 1;
 				while (${"search_".$i}) {
 					$field = ${"field_".$i};
-					$not = ${"not_".$i} ? "NOT" : "";
+					$not = ${"not_".$i} ? " NOT" : "";
 					$qry1 = preg_split('/\s+/', ${"query_".$i});
 					$qry2 = array();
 					$qry3 = array();
 					while (list($k, $v) = each($qry1)) {
 						if (!$qry1[$k]) continue;
-						if (${"case_".$i}) $qq = "(".$fields[$field]["dbname"]." $not LIKE '%".$qry1[$k]."%')";
-							else $qq = "(UPPER(".$fields[$field]["dbname"].") $not LIKE UPPER('%".$qry1[$k]."%'))";
+						if (${"case_".$i}) $qq = "(".$fields[$field]["dbname"]."$not LIKE '%".$qry1[$k]."%')";
+							else $qq = "(UPPER(".$fields[$field]["dbname"].")$not LIKE '%".MyUpper($qry1[$k])."%')";
 						$is_q1 = false;
 						for ($j = 0; $j < count($q1_fields); $j++)
 							if ($q1_fields[$j] == $field) $is_q1 = true;
@@ -99,7 +102,7 @@
 				$q3 = array();
 				while (list($k, $v) = each($q)) {
 					if (!$q[$k]) continue;
-					$qq = "(UPPER(".$fields[$field]["dbname"].") LIKE UPPER('%".$q[$k]."%'))";
+					$qq = "(UPPER(".$fields[$field]["dbname"].") LIKE '%".MyUpper($q[$k])."%')";
 					$is_q1 = false;
 					for ($i = 0; $i < count($q1_fields); $i++)
 						if ($q1_fields[$i] == $field) $is_q1 = true;
@@ -121,12 +124,15 @@
 				"caption" => MyEscape($v["caption"])
 			));
 		}
+		usort($flds, "MySort");
 		$tp->assign("fields", $flds);
 		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&section_menu={$section_menu}&stype=$stype"));
 		$form = $tp->fetch("search.tpl");
+		global $onload;
+		$onload .= "document.forms[0].elements[".($stype?2:1)."].focus();";
 		return array($form, $qry_1, $qry_2);
 	}
 ?>