--- loncom/homework/structuretags.pm	2023/09/11 12:08:18	1.512.2.24.2.6
+++ loncom/homework/structuretags.pm	2024/01/13 17:48:57	1.512.2.24.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.24.2.6 2023/09/11 12:08:18 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.24.2.9 2024/01/13 17:48:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,7 +273,7 @@ sub homework_js {
     }
     return &Apache::loncommon::resize_textarea_js().
            &Apache::loncommon::colorfuleditor_js().
-           &setmode_javascript().
+           &Apache::lonxml::setmode_javascript().
 	<<"JS";
 <script type="text/javascript">
 // <![CDATA[
@@ -385,21 +385,6 @@ var postsubmit = '$postsubmit';
 JS
 }
 
-sub setmode_javascript {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function setmode(form,probmode) {
-    var initial = form.problemmode.value;
-    form.problemmode.value = probmode;
-    form.submit();
-    form.problemmode.value = initial;
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
 	$extra_head)=@_;
@@ -1383,20 +1368,30 @@ sub needs_linkprot_passback {
                             $lti_in_use = $domlti{$itemnum};
                         }
                         my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
-                        my $passback;
-                        if ($scope eq 'resource') {
+                        my ($passback,$pbscope);
+                        if ($scope eq 'res') {
                             if ($deeplink_symb eq $symb) {
                                 $passback = 1;
+                                $pbscope = 'resource';
                             }
                         } elsif ($scope eq 'map') {
                             if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
                                 $passback = 1;
+                                $pbscope = 'nonrec';
+                            }
+                        } elsif ($scope eq 'rec') {
+                            if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
+                                $passback = 1;
+                                $pbscope = 'map';
+                            } else {
+                                my @recurseup = &Apache::lonnet::get_map_hierarchy($map,$env{'request.course.id'});
+                                if (grep(/^\Q$deeplink_map\E$/,@recurseup)) {
+                                    $passback = 1;
+                                    $pbscope = 'map';
+                                }
                             }
-                        } elsif ($scope eq 'recurse') {
-#FIXME check if $deeplink_map contains $map
-                            $passback = 1;
                         }
-                        return ($passback,$scope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
+                        return ($passback,$pbscope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
                     }
                 }
             }