From raeburn at source.lon-capa.org  Wed Sep 28 11:13:50 2022
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 28 Sep 2022 15:13:50 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncommon.pm
Message-ID: <cvsraeburn1664378030@cvsserver>

raeburn		Wed Sep 28 15:13:50 2022 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Copy global arrays from LONCAPA::map to scoped arrays before recursion.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1388 loncom/interface/loncommon.pm:1.1389
--- loncom/interface/loncommon.pm:1.1388	Tue Sep 13 12:22:14 2022
+++ loncom/interface/loncommon.pm	Wed Sep 28 15:13:50 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1388 2022/09/13 12:22:14 raeburn Exp $
+# $Id: loncommon.pm,v 1.1389 2022/09/28 15:13:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -18477,9 +18477,11 @@
         if ($fatal) {
             $errors ++;
         } else {
-            if ($#LONCAPA::map::resources > 0) {
-                foreach my $res (@LONCAPA::map::resources) {
-                    my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
+            my @order = @LONCAPA::map::order;
+            if (@order > 0) {
+                my @resources = @LONCAPA::map::resources;
+                foreach my $idx (@order) {
+                    my ($title,$src,$ext,$type,$status)=split(/\:/,$resources[$idx]);
                     if (($src ne '') && ($status eq 'res')) {
                         if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
                             ($numfiles,$numexttools,$errors) = &recurse_supplemental($cnum,$cdom,$1,



From raeburn at source.lon-capa.org  Wed Sep 28 23:59:29 2022
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 29 Sep 2022 03:59:29 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface londocs.pm
Message-ID: <cvsraeburn1664423969@cvsserver>

raeburn		Thu Sep 29 03:59:29 2022 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - Create "empty" sequence file when copying an empty folder from Supplemental
    to Main Content using the Course Editor if original sequence file is absent
    to avoid "Map not found" warning on Course Initialization.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.680 loncom/interface/londocs.pm:1.681
--- loncom/interface/londocs.pm:1.680	Tue Sep 13 13:54:02 2022
+++ loncom/interface/londocs.pm	Thu Sep 29 03:59:29 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.680 2022/09/13 13:54:02 raeburn Exp $
+# $Id: londocs.pm,v 1.681 2022/09/29 03:59:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1495,7 +1495,7 @@
             }
             $pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>';
             if ($nopaste) {
-                 $pasteitems .= $nopaste;   
+                 $pasteitems .= ' <span class="LC_cusr_emph">'.$nopaste.'</span>';   
             } else {
                 if ($othercrs) {
                     $pasteitems .= $othercrs;
@@ -2800,6 +2800,15 @@
             $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/;
         }
         my $mapcontent = &Apache::lonnet::getfile($key);
+        if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') &&
+            ($after{'map'} eq 'default') &&
+            ($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) {
+            $mapcontent = '<map>'."\n".
+                          '<resource id="1" src="" type="start" />'."\n".
+                          '<link from="1" to="2" index="1" />'."\n".
+                          '<resource id="2" src="" type="finish" />'."\n".
+                          '</map>';
+        }
         if ($mapcontent eq '-1') {
             if (ref($errors) eq 'HASH') {
                 $errors->{$key} = 1;