--- trunk2/out/js/usage.js	2004/07/22 19:00:27	396
+++ trunk2/out/js/usage.js	2004/09/23 18:23:13	465
@@ -27,14 +27,15 @@
 
 function go(f)
 {
-  if(!document.search.query)
+  var form = document.getElementById('search');
+  var query = form.elements['query'].value;
+  var index_name = form.elements['index_name'].options[form.elements['index_name'].selectedIndex].value;
+
+  if(!query)
   {
     return false;
   }
 
-  var query=document.search.query.value;
-  var index_name=document.search.index_name.value;
-
   if(query == null || query == "")
   {
     alert("No search terms entered!");
@@ -58,6 +59,7 @@
   {
     if((m.nodeType == 1) &&
        (m.tagName.toLowerCase() == "div") &&
+       m.getAttribute("id") &&
        (m.getAttribute("id").toLowerCase() == id.toLowerCase() ))
     {
       return m;
@@ -85,12 +87,15 @@
   debug("printResults("+result.length+")");
 
   var d = findDiv("results");
+  var header;
 
   // Null result output
   if(result.length < 1)
   {
-    var header = (d.getElementsByTagName("h2"))[0].firstChild;
-    header.replaceData(0, 14, "Nothing Found ");
+    header = (d.getElementsByTagName("h2"))[0].firstChild;
+    try {
+      header.replaceData(0, 14, "Nothing Found ");
+    } catch(e) {}
 
     if(search_err != "")
     {
@@ -111,8 +116,8 @@
     var e = document.createElement("font");
 
     e = document.createElement("a");
-    e.setAttribute("href",result[i].link);
-    e.setAttribute("target","_blank");
+    e.setAttribute("href",result[i].link+location.search);
+//    e.setAttribute("target","_blank");
     e.appendChild(document.createTextNode(result[i].title));
     d.appendChild(e);
     d.appendChild(document.createTextNode(" "));
@@ -122,12 +127,13 @@
     e.appendChild(document.createTextNode("["+result[i].frequency+"]"));
     d.appendChild(e);
     d.appendChild(document.createElement("br"));
-    d.appendChild(document.createElement("br"));
   }
  
   // Change header
-  var header = (d.getElementsByTagName("h2"))[0].firstChild;
+  header = (d.getElementsByTagName("h2"))[0].firstChild;
 
-  header.replaceData(0, 14, "Search Results");
+  try {
+    header.replaceData(0, 14, "Search Results");
+  } catch(e) {}
 
 }