--- rat/lonratedt.pm	2002/05/16 21:10:05	1.20
+++ rat/lonratedt.pm	2002/05/22 13:31:22	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.20 2002/05/16 21:10:05 www Exp $
+# $Id: lonratedt.pm,v 1.26 2002/05/22 13:31:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,8 +37,8 @@ use Apache::Constants qw(:common);
 use Apache::lonnet;
 use Apache::lonratsrv;
 
-my @order=();
-my @resources=();
+my @order;
+my @resources;
 
 
 # Mapread read maps into global arrays @links and @resources, determines status
@@ -52,6 +52,8 @@ sub mapread {
     undef @links;
     undef @resources;
     undef @order;
+    @resources=('');
+    @order=();
 
     my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
     if ($errtext) { return ($errtext,2); }
@@ -88,7 +90,7 @@ sub mapread {
 	}
 
     }
-    for (my $i=0; $i<=$#resources; $i++) {
+    for (my $i=1; $i<=$#resources; $i++) {
         if (defined($resources[$i])) {
 	    unless (($starters[$i]) || ($endings[$i])) {
                 return
@@ -261,6 +263,7 @@ ENDDOCUMENT
 # ---------------------------------------------------------------- Make buttons
 
 sub buttons {
+    if ($ENV{'form.forceselect'}) { return ''; }
     my $adv=shift;
     my $output='<form method=post>';     
     if ($adv==1) {
@@ -283,26 +286,66 @@ sub pastetarget {
     foreach (@which) {
         if (defined($_)) {
 	    my ($name,$url)=split(/\=/,$_);
-	    my $idx=$#resources+1;
-            $insertorder[$#insertorder+1]=$idx;
-            my $ext='false';
-            if ($url=~/^http\:\/\//) { $ext='true'; }
-            $resources[$idx]=$name.':'.$url.':normal:'.$ext.':res';
+            $name=&Apache::lonnet::unescape($name);
+            $url=&Apache::lonnet::unescape($url);
+            if ($url) {
+	       my $idx=$#resources+1;
+               $insertorder[$#insertorder+1]=$idx;
+               my $ext='false';
+               if ($url=~/^http\:\/\//) { $ext='true'; }
+               $url=~s/\:/\&colon;/g;
+               $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
+	   }
         }
     }
-    print "insertorder:".join(',',@insertorder).'<br>';
-    print "order:".join(',',@order).'<br>';
-    my @oldorder=splice(@order,$after,$#insertorder+1,@insertorder);
-    print "oldorder:".join(',',@oldorder).'<br>';
-    print "order:".join(',',@order).'<br>';
-    @order=push(@order,@oldorder);
-    print "order:".join(',',@order).'<br>';
+    my @oldorder=splice(@order,$after);
+    @order=(@order,@insertorder,@oldorder);
+}
+
+# ------------------------------------------------ Get start and finish correct
+# modifies @resources
+
+sub startfinish {
+    foreach (@order) {
+	my ($name,$url,$ext)=split(/\:/,$resources[$_]);
+        if ($url=~/http\&colon\:\/\//) { $ext='true'; }
+        $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
+    }
+   my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
+   $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
+   my ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
+   $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
+}
+
+# ------------------------------------------------------------------- Store map
+
+sub storemap {
+    my $fn=shift;
+    &startfinish();
+    my $output='graphdef<:>no';
+    my $k=1;
+    for (my $i=0; $i<=$#order; $i++) {
+        if (defined($resources[$order[$i]])) {
+	    $output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
+        }
+        if (defined($order[$i+1])) {
+	    if (defined($resources[$order[$i+1]])) {
+               $output.='<&>objlinks<:>'.$k.'<:>'.
+		   $order[$i].':'.$order[$i+1].':0';
+	       $k++;
+            }
+        }
+    }
+    $output=~s/http\&colon\;\/\///g;
+    $ENV{'form.output'}=$output;
+    return 
+     &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
 }
 
 # ------------------------------------------------------- Simple edit processor
 
 sub smpedt {
-   my ($r,$errtext)=@_;
+   my ($r,$url,$errtext)=@_;
    my $buttons=&buttons(2);
 
 # ---------------------------------------------------------- Process form input
@@ -313,14 +356,14 @@ sub smpedt {
    undef @targetselect;
    if (defined($ENV{'form.import'})) {
        if (ref($ENV{'form.import'})) {
-	   @importselect=sort($ENV->{'form.import'});
+	   @importselect=sort(@{$ENV{'form.import'}});
        } else {
            @importselect=($ENV{'form.import'});
        }
    }
    if (defined($ENV{'form.target'})) {
        if (ref($ENV{'form.target'})) {
-	   @targetselect=sort($ENV->{'form.target'});
+	   @targetselect=sort(@{$ENV{'form.target'}});
        } else {
            @targetselect=($ENV{'form.target'});
        }
@@ -419,17 +462,78 @@ sub smpedt {
 # ------------------------------------------------ Groupimport/search to target
    } elsif ($ENV{'form.importdetail'}) {
        my $lastsel;
-
        if (defined($targetselect[-1])) {
 	   $lastsel=$targetselect[-1];
        } else {
-           $lastsel=$#order;
+           $lastsel=$#order+1;
        }
-       &pastetarget($lastsel,split(/\&/,$ENV{'form.importdata'}));
+       &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
+       &storemap(&Apache::lonnet::filelocation('',$url));
 # ------------------------------------------------------------------------- Cut
-   } elsif ($ENV{'form.cut'}) {
+   } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) {
+       $importdetail='';
+       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+
+       my $lastsel;
+
+       if (defined($importselect[-1])) {
+	   $lastsel=$importselect[-1];
+       } else {
+           $lastsel=$#curimport;
+       }
+
+       for (my $i=0;$i<=$lastsel;$i++) {
+           my ($name,$url)=split(/\=/,$curimport[$i]);
+           if ($url) {
+              $importdetail.='&'.$name.'='.$url;
+	   }
+       }
+
+       foreach (@targetselect) {
+	   my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
+           if ($url) {
+              $importdetail.='&'.&Apache::lonnet::escape($name).'='.
+		 	         &Apache::lonnet::escape($url);
+	  }
+       }
+
+       for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
+           my ($name,$url)=split(/\=/,$curimport[$i]);
+           if ($url) {
+              $importdetail.='&'.$name.'='.$url;
+	  }
+       }
+       $importdetail=~s/\&+/\&/g;
+       $importdetail=~s/^\&//;
+
+       if ($ENV{'form.cut'}) {
+           my @neworder=();
+           for (my $i=0;$i<=$#order;$i++) {
+               my $include=1;
+               foreach (@targetselect) {
+		   if ($_-1==$i) { $include=0; }
+               }
+               if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+           }
+           @order=@neworder;
+           &storemap(&Apache::lonnet::filelocation('',$url));      
+       }
+
 # ----------------------------------------------------------------------- Paste
    } elsif ($ENV{'form.paste'}) {
+       my $lastsel;
+       if (defined($targetselect[-1])) {
+	   $lastsel=$targetselect[-1];
+       } else {
+           $lastsel=$#order+1;
+       }
+       my @newsequence;
+       my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+       foreach (@importselect) {
+          $newsequence[$#newsequence+1]=$curimport[$_];
+       }
+       &pastetarget($lastsel,@newsequence);
+       &storemap(&Apache::lonnet::filelocation('',$url));
 # ------------------------------------------------ 
    }
 # ------------------------------------------------------------ Assemble windows
@@ -625,8 +729,11 @@ $importwindow
 Cut selected<br>
 <input type=submit name=cut value='<<<'><p>
 <hr>
+Copy selected<br>
+<input type=submit name=copy value='<--'><p>
+<hr>
 Paste after selected<br>
-<input type=submit name=paste value='>>>'>
+<input type=submit name=paste value='-->'>
 </td>
 <td bgcolor="#FFFFCC"><select name="target" multiple>
 $targetwindow
@@ -658,23 +765,73 @@ ENDNODIR
 
 sub viewmap {
     my ($r,$url,$adv,$errtext)=@_;
-    $r->print('<html><body bgcolor="#FFFFFF">'.&buttons($adv));
+    $r->print('<html>');
+    if ($ENV{'form.forceselect'}) { $r->print(<<ENDSCRIPT);
+<script>
+
+function select_group() {
+    window.location="/adm/groupsort?catalogmode=groupimport&mode=rat&acts="+document.forms.fileattr.acts.value;
+}
+
+function queue(val) {
+    if (eval("document.forms."+val+".filelink.checked")) {
+	var l=val.length;
+	var v=val.substring(4,l);
+	document.forms.fileattr.acts.value+='1a'+v+'b';
+    }
+    else {
+	var l=val.length;
+	var v=val.substring(4,l);
+	document.forms.fileattr.acts.value+='0a'+v+'b';
+    }
+}
+
+
+
+</script>
+ENDSCRIPT
+    }
+    $r->print('<body bgcolor="#FFFFFF">'.&buttons($adv));
+    if ($ENV{'form.forceselect'}) { $r->print(<<ENDSELECT);
+<form name=fileattr><input type=hidden name=acts value=''>
+<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="groupimport" value='GROUP IMPORT'
+onClick="javascript:select_group()">
+</form>   
+ENDSELECT
+    }
     if ($errtext) {
 	$r->print($errtext.'<hr>');
     }
+    my $idx=0;
     foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
 	if (defined($_)) {
+            $idx++;
+            if ($ENV{'form.forceselect'}) { 
+		$r->print('<form name="form'.$idx.'">');
+            }
 	    my ($title,$url)=split(/\:/,$_);
             $title=~s/\&colon\;/\:/g;
             $url=~s/\&colon\;/\:/g;
             unless ($title) { $title=(split(/\//,$url))[-1] };
             unless ($title) { $title='<i>Empty</i>'; }
             if ($url) {
+		if ($ENV{'form.forceselect'}) {
+		    $r->print(<<ENDCHECKBOX);
+<input type='checkbox' name='filelink' 
+value='$url' onClick='javascript:queue("form$idx")' >
+<input type='hidden' name='title' value='$title'>
+ENDCHECKBOX
+                }
 		$r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
             }
             $r->print(&Apache::lonratsrv::qtescape($title));
             if ($url) { $r->print('</a>'); }
-            $r->print('<br>');
+            if ($ENV{'form.forceselect'}) {
+		$r->print('</form>');
+            } else {
+		$r->print('<br>');
+            }
         }
     }
     $r->print('</body></html>');
@@ -688,6 +845,9 @@ sub handler {
   $r->send_http_header;
 
   return OK if $r->header_only;
+ 
+  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                          ['forceselect']);
 
   my $url=$r->uri;
   my $fn=&Apache::lonnet::filelocation('',$url);
@@ -723,7 +883,7 @@ sub handler {
   if ($ENV{'form.forceadv'}) {
       &ratedt($r,$url);
   } elsif ($ENV{'form.forcesmp'}) {
-      &smpedt($r,$errtext);
+      &smpedt($r,$url,$errtext);
   } else {
       &viewmap($r,$url,$adv,$errtext);
   }