--- loncom/interface/lonindexer.pm	2006/06/08 07:20:41	1.144
+++ loncom/interface/lonindexer.pm	2006/06/08 13:56:31	1.145
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.144 2006/06/08 07:20:41 www Exp $
+# $Id: lonindexer.pm,v 1.145 2006/06/08 13:56:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -179,7 +179,7 @@ ENDSUBM
 <input type="button" name="close" value='$cl' onClick="self.close()" />
 END
         }
-	elsif ($env{'form.catalogmode'} eq 'groupimport') {
+	elsif ($env{'form.catalogmode'} eq 'import') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
@@ -229,7 +229,7 @@ END
 # ------ set catalogmodefunctions to have extra needed javascript functionality
 	my $catalogmodefunctions='';
 	if ($env{'form.catalogmode'} eq 'interactive' or
-	    $env{'form.catalogmode'} eq 'groupimport') {
+	    $env{'form.catalogmode'} eq 'import') {
 	    # The if statement below sets us up to use the old version
 	    # by default (ie. if $mode is undefined).  This is the easy
 	    # way out.  Hopefully in the future I'll find a way to get 
@@ -240,7 +240,7 @@ END
 #
 #
 	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
-                my $location = "/adm/groupsort?catalogmode=groupimport&";
+                my $location = "/adm/groupsort?catalogmode=import&";
                 $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
@@ -327,7 +327,7 @@ function rep_dirpath(suffix,val) {
     eval("document.forms.dirpath"+suffix+".acts.value=val");
 }
 END
-	if ($env{'form.catalogmode'} eq 'groupimport') {
+	if ($env{'form.catalogmode'} eq 'import') {
             $catalogmodefunctions.=<<END;
 function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {
@@ -369,7 +369,7 @@ ENDHEADER
 	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
 						 {'domain' => $headerdom,}));
 # - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($env{'form.catalogmode'} eq 'groupimport') {
+        if ($env{'form.catalogmode'} eq 'import') {
 	    my $acts=$env{'form.acts'};
 	    my @Acts=split(/b/,$acts);
 	    my %ahash;
@@ -478,7 +478,7 @@ END
 	$storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
-				(($env{'form.catalogmode'} eq 'groupimport')?
+				(($env{'form.catalogmode'} eq 'import')?
 				 'document.forms.fileattr':'')).
 		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
@@ -486,7 +486,7 @@ END
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
 	    $r->print("<font size='+2'><a href='");
-	    if ($env{'form.catalogmode'} eq 'groupimport') {
+	    if ($env{'form.catalogmode'} eq 'import') {
 		$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
 	    } else {
 		$r->print($reshome);
@@ -912,7 +912,7 @@ sub display_line {
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
 	    $r->print("</td><td nowrap>");
-	} elsif ($env{'form.catalogmode'} eq 'groupimport') {
+	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -1188,9 +1188,9 @@ sub dynmetaprint {
 	$r->print("\n<br />".$fieldnames{$item}.': '.
 		  &Apache::lonmeta::prettyprint($item,
 						$dynhash{$filelink}->{$item},
-		  (($env{'form.catalogmode'} ne 'groupimport')?'preview':''),
+		  (($env{'form.catalogmode'} ne 'import')?'preview':''),
 		  '',
-		  (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));
+		  (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
     }
 }