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

[matthew]

matthew		Tue Oct  7 16:30:14 2003 EDT

  Modified files:              
    /loncom/interface	groupsort.pm lonsearchcat.pm 
  Log:
  Bug 2258: Advanced search could not import into docs sequences.  The problem
  was that the "Advanced Search" link did not pass the 'mode' parameter along
  to the advanced search page, so $ENV{'form.mode'} eq ''.  The parameter
  is now passed along (lonsearchcat.pm) and groupsort.pm has been modified to
  assume a 'simple' mode if the mode is not specified.  Should go in 1.0.2.
  I do not want to consider how long this has been broken.
  
  
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.23 loncom/interface/groupsort.pm:1.24
--- loncom/interface/groupsort.pm:1.23	Mon Sep 22 20:26:10 2003
+++ loncom/interface/groupsort.pm	Tue Oct  7 16:30:13 2003
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.23 2003/09/23 00:26:10 www Exp $
+# $Id: groupsort.pm,v 1.24 2003/10/07 20:30:13 matthew Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@
 
 # finish_import looks different for graphical or "simple" RAT
     my $finishimport='';
-    if ($ENV{'form.mode'} eq 'simple') {
+    if ($ENV{'form.mode'} eq 'simple' || $ENV{'form.mode'} eq '') {
         $finishimport=(<<ENDSMP);
 function finish_import() {
     opener.document.forms.simpleedit.importdetail.value='';
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.189 loncom/interface/lonsearchcat.pm:1.190
--- loncom/interface/lonsearchcat.pm:1.189	Mon Sep 29 12:09:20 2003
+++ loncom/interface/lonsearchcat.pm	Tue Oct  7 16:30:13 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.189 2003/09/29 16:09:20 www Exp $
+# $Id: lonsearchcat.pm,v 1.190 2003/10/07 20:30:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -563,7 +563,7 @@
     my $header=&mt('Advanced Search');
     $scrout.=<<END;
 </td><td><a
-href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}"
+href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
 >$header</a></td></tr>
 <tr><td>$relatedcheckbox use related words</td>
     <td>$domaincheckbox only search domain <b>$domain</b></td></tr>