--- trunk2/eurovoc/abecedno.html	2004/10/24 23:03:35	543
+++ trunk2/eurovoc/abecedno.html	2004/10/30 23:59:06	564
@@ -5,11 +5,14 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2"/>
 	<link rel="stylesheet" href="eurovoc.css" type="text/css">
 
-<script type="text/javascript" src="js/bfilter.js"></script>
-<script type="text/javascript" src="js/popup.js"></script>
-<script type="text/javascript" src="js/load_js.js"></script>
-<script type="text/javascript" src="js/cookies.js"></script>
-<script type="text/javascript">
+	<script type="text/javascript" src="js/bfilter.js"></script>
+	<script type="text/javascript" src="js/popup.js"></script>
+	<script type="text/javascript" src="js/load_js.js"></script>
+	<script type="text/javascript" src="js/cookies.js"></script>
+	<script type="text/javascript" src="js/l2_unescape.js"></script>
+	<script type="text/javascript" src="js/unac.js"></script>
+	<script type="text/javascript" src="js/clear_last_search.js"></script>
+	<script type="text/javascript">
 // <!--
 
 var lang2thes = {
@@ -30,6 +33,20 @@
 //	self.document.getElementById('textfilter').select();
 	self.document.myfilter = new BFilter(headlines);
 
+	// define some regexps
+	self.document.myfilter.star_regex = new RegExp(/ *#C# */i);
+	self.document.myfilter.htmlent_regex = new RegExp(/(&[a-z][a-z]*;)/i);
+
+	self.document.myfilter.text_ent = function (str) {
+		if (str.match(this.htmlent_regex)) {
+			var e = self.document.createElement("span");
+			e.innerHTML = str;
+			return e;
+		} else {
+			return self.document.createTextNode(str);
+		}
+	}
+
 	self.document.myfilter.result = function (arr) {
 		var r_div = element_id('results');
 		if (r_div) {
@@ -38,15 +55,14 @@
 			var pic = null;
 			
 			e.setAttribute("href","hijerarhija.html?o="+arr[1]+"#mfn"+arr[1]);
-			var regex = new RegExp(/ *\* */);
-			if (arr[0].match(regex)) {
-				e.appendChild(self.document.createTextNode(arr[0].replace(regex,' ')));
+			if (arr[0].match(this.star_regex)) {
+				e.appendChild(this.text_ent(arr[2].replace(this.star_regex,' ')));
 				pic = self.document.createElement("img");
 				pic.src = 'img/crovoc.png';
 				pic.border = 0;
 				e.appendChild(pic);
 			} else {
-				e.appendChild(self.document.createTextNode(arr[0]));
+				e.appendChild(this.text_ent(arr[2]));
 			}
 			li.appendChild(e);
 
@@ -101,6 +117,9 @@
 		var el = this.element_id("status");
 		el.innerHTML = html+status+"\n";
 	}
+
+	// time timeout to 500ms
+	self.document.myfilter.timeout = 500;
 }
 
 function load_lang(lang) {
@@ -125,8 +144,13 @@
 }
 
 function do_filter(filter) {
-	element_id('status').innerHTML = "Pretraživanje u tijeku...";
-	if (self.document.myfilter) self.document.myfilter.filter(filter);
+	set_cookie('w2_lastsearch', filter);
+	var f = l2_unescape(filter);
+	f = f.substr(0,2) + unac(f.substr(2,f.length-2));
+	if (self.document.myfilter) {
+		element_id('status').innerHTML = "Pretraživanje u tijeku...";
+		self.document.myfilter.filter(f);
+	}
 }
 
 function load_lang_finished() {
@@ -135,7 +159,12 @@
 	self.document.myfilter.arr=headlines;
 	element_id('lang').disabled = false;
 	element_id('textfilter').disabled = false;
-	do_filter(element_id('textfilter').value);
+	var q = element_id('textfilter').value;
+	if (q && q.length >= self.document.myfilter.min_len) {
+		do_filter(q);
+	} else {
+		self.document.myfilter.show_status();
+	}
 	return false;
 }
 
@@ -198,7 +227,7 @@
 	</td>
 
 	<td colspan="2" class="hMenu">	
-<table border="0" cellspacing="0" cellpadding="0" align="right" width="520">
+<table border="0" cellspacing="0" cellpadding="0" align="left" width="520">
   <tr>
   	<td width="10">&nbsp;</td>
 	<td>
@@ -272,7 +301,7 @@
 		<td class="topRsv"></td>
 	  </tr>
 	  <tr>
-		<td colspan="3" class="menuItem2">Upute za prikaz abecednih kazala</td>
+		<td colspan="3" class="menuItem2">Upute za prikaz <br>abecednih kazala</td>
 	  </tr>
 	  <tr>
 		<td colspan="3" class="menuItem">
@@ -313,7 +342,7 @@
  </div>
 </div>
 
-<form method="get" onsubmit="return false;" action="?">
+<form id="filterform" method="get" onsubmit="return false;" action="?" >
 <div class="filters">
   <script type="text/javascript">
 	// <!--
@@ -323,12 +352,13 @@
 	select_option("fr","Francuski",lang);
 	select_option("ge","Njemački",lang);
 	document.write('</select>');
+
+	document.write('<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="do_filter(this.value);" value="'+get_cookie('w2_lastsearch')+'"/>');
 	// -->
   </script>
-
-	<input autocomplete="off" class="filters" id="textfilter" title="enter a regular expression to filter by" onkeyup="do_filter(this.value);" />
 	<!-- this button is strictly for looks -->
 	<input class="filters" value="filter" type="button" disabled="true"/>
+	<input class="submit" type="button" value="Obriši !" onClick="javascript:element_id('results').innerHTML = ''; self.document.myfilter.show_status(); return clear_last_search('filterform','textfilter');"/><br/>
 </div>
 </form>