[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm

Fri, 16 Aug 2002 13:52:52 -0000

matthew		Fri Aug 16 09:52:52 2002 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
  Log:
  Fixes one of the bugs found during the demo - the 'select' buttons now work
  for search importing to the rat.  Also fixed a bug with the group import to
  the rat.  What a mess.  I hate javascript.  This version should be included
  in the new stable.
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.152 loncom/interface/lonsearchcat.pm:1.153

--- loncom/interface/lonsearchcat.pm:1.152	Wed Aug  7 08:37:16 2002
+++ loncom/interface/lonsearchcat.pm	Fri Aug 16 09:52:51 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.152 2002/08/07 12:37:16 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.153 2002/08/16 13:52:51 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1673,6 +1673,7 @@
 </head>
 <body>
 <form name="statusform" action="" method="post">
+<input type="hidden" name="Queue" value="" />
 END
 
 #<h2>Sort Results</h2>
@@ -2051,7 +2052,13 @@
     # We have run out of time or run out of servers to talk to and
     # results to get.  
     $r->print("</body></html>");
-    $r->print("<script>window.location='/adm/searchcat?phase=sort&persistent_db_id=$ENV{'form.persistent_db_id'}';</script>");
+    if ($ENV{'form.catalogmode'} ne 'groupsearch') {
+        $r->print("<script>".
+                      "window.location='/adm/searchcat?".
+                      "phase=sort&".
+                      "persistent_db_id=$ENV{'form.persistent_db_id'}';".
+                  "</script>");
+    }
     return;
 }
 
@@ -2484,13 +2491,13 @@
 	parent.close();
     }
     function changeTitle(val) {
-	if (opener.inf.document.forms.resinfo.elements.t) {
-	    opener.inf.document.forms.resinfo.elements.t.value=val;
+	if (parent.opener.inf.document.forms.resinfo.elements.t) {
+	    parent.opener.inf.document.forms.resinfo.elements.t.value=val;
 	}
     }
     function changeURL(val) {
-	if (opener.inf.document.forms.resinfo.elements.u) {
-	    opener.inf.document.forms.resinfo.elements.u.value=val;
+	if (parent.opener.inf.document.forms.resinfo.elements.u) {
+	    parent.opener.inf.document.forms.resinfo.elements.u.value=val;
 	}
     }
 </script>



