--- rat/client/Attic/code.html	2001/03/13 14:10:09	1.20
+++ rat/client/Attic/code.html	2001/03/15 18:08:44	1.27
@@ -1286,6 +1286,8 @@ function infoclear() {
   }
   inf.document.writeln('</tr></table></body></html>');
   inf.document.close();
+  srchclose();
+
   parent.top.focus();
   parent.mapout.focus();
   notclear=1;
@@ -1470,7 +1472,9 @@ function srchclear() {
 // ------------------------------------------------------- Closes search window
 
 function srchclose() {
-  srch.close();
+  if (srch && !srch.closed) {
+    srch.close();
+  }
 }
 
 // --------------------------------------------------------- Open search window
@@ -1478,6 +1482,7 @@ function srchclose() {
 function srchopen() {
    var options="scrollbars=1,resizable=1,menubar=0";
    srch=open("/adm/searchcat?catalogmode=interactive","srchout",options);
+   srch.focus();
 }
 
 // -------------------------------------------- Interface function to searching
@@ -1489,9 +1494,10 @@ function search() {
 // ------------------------------------------------------- Do srch status check
 
 function srchcheck() {
-   if (srch.closed) {
+   if (!srch || srch.closed) {
       srchopen();
    }
+   srch.focus();
 }
 
 // ---------------------------------------------------- Handles "click to edit"
@@ -1589,7 +1595,7 @@ function handler(infostr) {
         +'<input type=text name=u size=30 value="'+data2[1]+'"></td></tr>'
         +'<tr><td>External:</td><td><input type=checkbox name=e');
         if (data2[2]=='true') { inf.document.write(' checked'); }
-        inf.document.write('></td><td align=right><a href="javascript:opener.srchopen()">Search</a></td></tr>'
+        inf.document.write('></td><td align=right><a href="javascript:opener.srchcheck()">Search</a></td></tr>'
         +'<tr><td colspan=3>'
         +'<input type=radio name=y value=normal '+
  'onClick="self.document.forms.resinfo.elements.h.value='+"'normal'"+'"');
@@ -2484,6 +2490,8 @@ function togglemode() {
 function main() {
 
    if (mainrun==0) {
+      srchopen();
+//      srchclose();
       infopen();
       infoclear();
       load();
@@ -2499,8 +2507,8 @@ function leave() {
    if (!inf.closed) {
       inf.close();
    }
-   if (!srch.closed) {
-      srch.close();
+   if (srch && !srch.closed) {
+      srchclose();
    }
 }