--- rat/client/Attic/code.html	2001/03/12 17:29:02	1.19
+++ rat/client/Attic/code.html	2001/03/15 17:59:45	1.24
@@ -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,51 +1472,17 @@ function srchclear() {
 // ------------------------------------------------------- Closes search window
 
 function srchclose() {
-  srch.close();
+  if (!srch.closed) {
+    srch.close();
+  }
 }
 
 // --------------------------------------------------------- Open search window
 
 function srchopen() {
    var options="scrollbars=1,resizable=1,menubar=0";
-   srch=open("/adm/searchcat?catalogmode=editresource","srchout",options);
-   return;
-   srchclear();
-   srch.document.writeln(
-      '<html><body bgcolor="#AAFFAA"><form>'+
-      '<table width="100%">'+
-      '<tr><td><b>Resource Library Search</b></td>'+
-      '<td align=right><input type=button value="Close"'+
-      ' onClick="javascript:opener.srchclose();"></td>'+
-      '</tr></table>'+
-      '<table bgcolor="#ffffff">'+
-      '<tr><td><b>title</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="title"></td>'+
-      '</tr><tr><td><b>author</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="author"></td>'+
-      '</tr><tr><td><b>subject</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="subject"></td>'+
-      '</tr><tr><td><b>notes</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="notes"></td>'+
-      '</tr><tr><td><b>abstract</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="abstract"></td>'+
-      '</tr><tr><td><b>mime</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="mime"></td>'+
-      '</tr><tr><td><b>language</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="language"></td>'+
-      '</tr><tr><td><b>creationdate</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="creationdate"></td>'+
-      '</tr><tr><td><b>lastrevisiondate</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="lastrevisiondate"></td>'+
-      '</tr><tr><td><b>owner</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="owner"></td>'+
-      '</tr><tr><td><b>copyright</b> </td>'+
-      '<td><INPUT TYPE="TEXT" NAME="copyright"></td>'+
-      '</tr>'+
-      '</table>'+
-      '<input type="button" value="Search the global catalog"'+
-      ' onClick="javascript:opener.search()">'+
-      '</form></body></html>');
+   srch=open("/adm/searchcat?catalogmode=interactive","srchout",options);
+   srch.focus();
 }
 
 // -------------------------------------------- Interface function to searching
@@ -1526,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"
@@ -1626,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'"+'"');
@@ -2536,8 +2505,8 @@ function leave() {
    if (!inf.closed) {
       inf.close();
    }
-   if (!srch.closed) {
-      srch.close();
+   if (srch && !srch.closed) {
+      srchclose();
    }
 }
 

title
author
subject
notes
abstract
mime
language
creationdate
lastrevisiondate
owner
copyright