--- inc/pgKnjiznica-leksikon.php	2001/09/03 15:52:16	1.2
+++ inc/pgKnjiznica-leksikon.php	2001/09/28 23:34:37	1.4
@@ -1,17 +1,19 @@
 <?php
-	include_once("inc/conn.php");
+	include("inc/conn.php");
 	include_once("inc/search.php");
 	$fields = array(
 		"pojam" => array("dbname" => "pojam", "caption" => "Pojam"),
 		"opis" => array("dbname" => "opis", "caption" => "Opis")
 	);
-	list($srch, $qry_1, $qry_2) = Search($fields, array("pojam", "opis"), array(), "pojam");
-	# Win1250 -> ISO8859-2
-	if ($qry_1) $qry_1 = strtr($qry_1, "ŠÐÈÆŽšðèæž", "©ÐÈÆ®¹ðèæ¾");
-	if ($qry_2) $qry_2 = strtr($qry_2, "ŠÐÈÆŽšðèæž", "©ÐÈÆ®¹ðèæ¾");
-	$tpl->assign("index", $index);
-	$tpl->assign("srch", ($qry_1 || $qry_2) ? true : false);
-	$tpl->assign("SEARCH", $srch);
+	if (!$id) {
+		list($srch, $qry_1, $qry_2) = Search($fields, array("pojam", "opis"), array(), "pojam");
+		# Win1250 -> ISO8859-2
+		if ($qry_1) $qry_1 = strtr($qry_1, "ŠÐÈÆŽšðèæž", "©ÐÈÆ®¹ðèæ¾");
+		if ($qry_2) $qry_2 = strtr($qry_2, "ŠÐÈÆŽšðèæž", "©ÐÈÆ®¹ðèæ¾");
+		$tpl->assign("index", $index);
+		$tpl->assign("srch", ($qry_1 || $qry_2) ? true : false);
+		$tpl->assign("SEARCH", $srch);
+	}
 	$letters = Slova();
 	if (!$id && ($index || ($qry_1 || $qry_2))) {
 		$prvo_slovo = "UPPER(SUBSTRING(pojam FROM 1 FOR 1))";
@@ -42,9 +44,9 @@
 			array_push($pojmovi, array("id" => $id2, "pojam" => MyEscape($pojam)));
 		}
 		$sth->finish();
-		if (isset($staro_slovo)) array_push($slova, array("l" => $staro_slovo, "pojmovi" => $pojmovi));
+		if (count($pojmovi) > 0) array_push($slova, array("l" => $staro_slovo, "pojmovi" => $pojmovi));
 		$records = 0;
-		for ($i = 0; $i < count($slova); $i++) $records += count($slova[$i]["ustanove"]);
+		for ($i = 0; $i < count($slova); $i++) $records += count($slova[$i]["pojmovi"]);
 		$tpl->assign("records", $records);
 		$tpl->assign("slova", $slova);
 		$tpl->assign("stype", $stype);