--- loncom/homework/lonhomework.pm 2023/09/07 16:35:29 1.344.2.10.4.3
+++ loncom/homework/lonhomework.pm 2025/01/17 15:05:47 1.394
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.344.2.10.4.3 2023/09/07 16:35:29 raeburn Exp $
+# $Id: lonhomework.pm,v 1.394 2025/01/17 15:05:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,6 +49,7 @@ use Apache::matchresponse();
use Apache::chemresponse();
use Apache::functionplotresponse();
use Apache::drawimage();
+use Apache::loncapamath();
use Apache::loncourseuser();
use Apache::grades();
use Apache::Constants qw(:common);
@@ -162,9 +163,19 @@ sub get_target {
return ('web','answer');
} elsif (($env{'form.problemmode'} eq 'saveedit') ||
($env{'form.problemmode'} eq 'undo')) {
- return ('modified','no_output_web','edit');
+ my %editors = &Apache::loncommon::permitted_editors();
+ if ($editors{'edit'}) {
+ return ('modified','no_output_web','edit');
+ } else {
+ return ('web');
+ }
} elsif ($env{'form.problemmode'} eq 'edit') {
- return ('no_output_web','edit');
+ my %editors = &Apache::loncommon::permitted_editors();
+ if ($editors{'edit'}) {
+ return ('no_output_web','edit');
+ } else {
+ return ('web');
+ }
} else {
return ('web');
}
@@ -225,8 +236,42 @@ sub check_slot_access {
return ($status,$datemsg);
}
- if ($status eq 'SHOW_ANSWER' ||
- $status eq 'CLOSED' ||
+ my $checkin = 'resource.0.checkedin';
+ my $version;
+ if ($type eq 'Task') {
+ $version=$Apache::lonhomework::history{'resource.version'};
+ $checkin = "resource.$version.0.checkedin";
+ }
+ my $checkedin = $Apache::lonhomework::history{$checkin};
+ my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip,
+ $consumed_uniq);
+ $now = time;
+ $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'};
+
+ if ($checkedin) {
+ $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
+ my %slot=&Apache::lonnet::get_slot($checkinslot);
+ $consumed_uniq = $slot{'uniqueperiod'};
+ if ($slot{'iptied'}) {
+ $ipused = $Apache::lonhomework::history{"$checkin.ip"};
+ unless (($ip ne '') &&
+ (($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) {
+ $blockip = $slot{'iptied'};
+ $slot_name = $checkinslot;
+ $returned_slot = \%slot;
+ }
+ }
+ }
+
+ if ($status eq 'SHOW_ANSWER') {
+ if ($blockip eq 'answer') {
+ return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+ } else {
+ return ($status,$datemsg);
+ }
+ }
+
+ if ($status eq 'CLOSED' ||
$status eq 'INVALID_ACCESS' ||
$status eq 'UNAVAILABLE') {
return ($status,$datemsg);
@@ -234,13 +279,16 @@ sub check_slot_access {
if ($env{'request.state'} eq "construct") {
return ($status,$datemsg);
}
-
+
if ($type eq 'Task') {
- my $version=$Apache::lonhomework::history{'resource.version'};
- if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+ if ($checkedin &&
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
- return ('SHOW_ANSWER');
- }
+ if ($blockip eq 'answer') {
+ return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+ } else {
+ return ('SHOW_ANSWER');
+ }
+ }
} elsif (($type eq 'problem') &&
($Apache::lonhomework::browse eq 'F') &&
($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&
@@ -256,11 +304,11 @@ sub check_slot_access {
# if (!@slots) {
# return ($status,$datemsg);
# }
+ undef($returned_slot);
+ undef($slot_name);
my $slotstatus='NOT_IN_A_SLOT';
- my ($returned_slot,$slot_name);
- my $now = time;
my $num_usable_slots = 0;
- unless ($symb) {
+ if (!$symb) {
($symb) = &Apache::lonnet::whichuser();
}
foreach my $slot (@slots) {
@@ -273,12 +321,41 @@ sub check_slot_access {
if ($slot{'starttime'} < $now &&
$slot{'endtime'} > $now &&
&Apache::loncommon::check_ip_acc($slot{'ip'})) {
- &Apache::lonxml::debug("$slot is good");
- $slotstatus='NEEDS_CHECKIN';
- $returned_slot=\%slot;
- $slot_name=$slot;
- last;
- }
+ if ($slot{'iptied'}) {
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($slot eq $checkinslot) {
+ if ($ip eq $ipused) {
+ &Apache::lonxml::debug("$slot is good");
+ $slotstatus ='NEEDS_CHECKIN';
+ } else {
+ $slotstatus = 'NEED_DIFFERENT_IP';
+ $slot_name = $slot;
+ $returned_slot = \%slot;
+ last;
+ }
+ } elsif ($ip) {
+ my $uniqkey = "$slot\0$symb\0$ip";
+ my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum);
+ if ($used_ip{$uniqkey}) {
+ $slotstatus = 'NEED_DIFFERENT_IP';
+ } else {
+ &Apache::lonxml::debug("$slot is good");
+ $slotstatus ='NEEDS_CHECKIN';
+ }
+ }
+ }
+ } else {
+ &Apache::lonxml::debug("$slot is good");
+ $slotstatus='NEEDS_CHECKIN';
+ }
+ if ($slotstatus eq 'NEEDS_CHECKIN') {
+ $returned_slot=\%slot;
+ $slot_name=$slot;
+ last;
+ }
+ }
}
if ($slotstatus eq 'NEEDS_CHECKIN' &&
&proctor_checked_in($slot_name,$returned_slot,$type)) {
@@ -286,28 +363,16 @@ sub check_slot_access {
$slotstatus=$status;
}
- my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq);
+ my ($is_correct,$got_grade);
if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};
- $checkin = "resource.$version.0.checkedin";
$got_grade =
($Apache::lonhomework::history{"resource.$version.0.status"}
=~ /^(?:pass|fail)$/);
$is_correct =
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
- $checkedin =
- $Apache::lonhomework::history{"resource.$version.0.checkedin"};
} elsif (($type eq 'problem') || ($type eq 'tool')) {
- $checkin = 'resource.0.checkedin';
- $checkedin = $Apache::lonhomework::history{$checkin};
- }
- if ($checkedin) {
- $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
- my %slot=&Apache::lonnet::get_slot($checkinslot);
- $consumed_uniq = $slot{'uniqueperiod'};
- }
- if (($type eq 'problem') || ($type eq 'tool')) {
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
my ($numcorrect,$numgraded) = (0,0);
foreach my $part (@{$partlist}) {
@@ -371,70 +436,8 @@ sub check_slot_access {
if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) {
if ($slotstatus eq 'NOT_IN_A_SLOT') {
if (!$num_usable_slots) {
- if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- $slotstatus = 'NOTRESERVABLE';
- my ($reservable_now_order,$reservable_now,$reservable_future_order,
- $reservable_future) =
- &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
- if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
- if (@{$reservable_now_order} > 0) {
- if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
- $slotstatus = 'RESERVABLE';
- $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
- } else {
- my ($uniqstart,$uniqend,$useslot);
- if (ref($consumed_uniq) eq 'ARRAY') {
- ($uniqstart,$uniqend)=@{$consumed_uniq};
- }
- foreach my $slot (reverse(@{$reservable_now_order})) {
- if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
- my ($new_uniq_start,$new_uniq_end) = ($1,$2);
- next if (!
- ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
- ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
- }
- $useslot = $slot;
- last;
- }
- if ($useslot) {
- $slotstatus = 'RESERVABLE';
- $datemsg = $reservable_now->{$useslot}{'endreserve'};
- }
- }
- }
- }
- unless ($slotstatus eq 'RESERVABLE') {
- if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
- if (@{$reservable_future_order} > 0) {
- if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
- $slotstatus = 'RESERVABLE_LATER';
- $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
- } else {
- my ($uniqstart,$uniqend,$useslot);
- if (ref($consumed_uniq) eq 'ARRAY') {
- ($uniqstart,$uniqend)=@{$consumed_uniq};
- }
- foreach my $slot (@{$reservable_future_order}) {
- if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
- my ($new_uniq_start,$new_uniq_end) = ($1,$2);
- next if (!
- ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
- ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
- }
- $useslot = $slot;
- last;
- }
- if ($useslot) {
- $slotstatus = 'RESERVABLE_LATER';
- $datemsg = $reservable_future->{$useslot}{'startreserve'};
- }
- }
- }
- }
- }
- }
+ ($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
+ $consumed_uniq);
}
}
return ($slotstatus,$datemsg);
@@ -444,14 +447,18 @@ sub check_slot_access {
&& $checkedin ) {
if ($got_grade) {
- return ('SHOW_ANSWER');
+ if ($blockip eq 'answer') {
+ return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
+ } else {
+ return ('SHOW_ANSWER');
+ }
} else {
return ('WAITING_FOR_GRADE');
}
}
- if ( $is_correct) {
+ if (($is_correct) && ($blockip ne 'answer')) {
if (($type eq 'problem') || ($type eq 'tool')) {
return ($status);
}
@@ -459,11 +466,86 @@ sub check_slot_access {
}
if ( $status eq 'CANNOT_ANSWER' &&
- ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
+ ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' &&
+ $slotstatus ne 'NEED_DIFFERENT_IP') ) {
return ($status,$datemsg);
}
+ return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
+}
- return ($slotstatus,$datemsg,$slot_name,$returned_slot);
+sub check_reservable_slot {
+ my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_;
+ my $datemsg;
+ if ($slotstatus eq 'NOT_IN_A_SLOT') {
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ unless ($symb) {
+ ($symb)=&Apache::lonnet::whichuser();
+ }
+ $slotstatus = 'NOTRESERVABLE';
+ my ($reservable_now_order,$reservable_now,$reservable_future_order,
+ $reservable_future) =
+ &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
+ if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
+ if (@{$reservable_now_order} > 0) {
+ if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+ $slotstatus = 'RESERVABLE';
+ $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+ } else {
+ my ($uniqstart,$uniqend,$useslot);
+ if (ref($consumed_uniq) eq 'ARRAY') {
+ ($uniqstart,$uniqend)=@{$consumed_uniq};
+ }
+ foreach my $slot (reverse(@{$reservable_now_order})) {
+ if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
+ my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+ next if (!
+ ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+ ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
+ }
+ $useslot = $slot;
+ last;
+ }
+ if ($useslot) {
+ $slotstatus = 'RESERVABLE';
+ $datemsg = $reservable_now->{$useslot}{'endreserve'};
+ }
+ }
+ }
+ }
+ unless ($slotstatus eq 'RESERVABLE') {
+ if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
+ if (@{$reservable_future_order} > 0) {
+ if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+ $slotstatus = 'RESERVABLE_LATER';
+ $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+ } else {
+ my ($uniqstart,$uniqend,$useslot);
+ if (ref($consumed_uniq) eq 'ARRAY') {
+ ($uniqstart,$uniqend)=@{$consumed_uniq};
+ }
+ foreach my $slot (@{$reservable_future_order}) {
+ if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+ my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+ next if (!
+ ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+ ($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
+ }
+ $useslot = $slot;
+ last;
+ }
+ if ($useslot) {
+ $slotstatus = 'RESERVABLE_LATER';
+ $datemsg = $reservable_future->{$useslot}{'startreserve'};
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return ($slotstatus,$datemsg);
}
# JB, 9/24/2002: Any changes in this function may require a change
@@ -595,15 +677,16 @@ sub check_access {
if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
&Apache::lonxml::debug("looking for interval @interval");
- if ($interval[0]) {
+ if ($interval[0]=~ /^\d+/) {
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
&Apache::lonxml::debug("looking for accesstime $first_access");
if (!$first_access) {
$status='NOT_YET_VIEWED';
my $due_date = &due_date($id,$symb);
my $seconds_left = $due_date - time;
- if ($seconds_left > $interval[0] || $due_date eq '') {
- $seconds_left = $interval[0];
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($seconds_left > $timelimit || $due_date eq '') {
+ $seconds_left = $timelimit;
}
$datemsg=&seconds_to_human_length($seconds_left);
}
@@ -638,7 +721,8 @@ sub due_date {
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
if (defined($first_access)) {
- my $interval = $first_access+$interval[0];
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ my $interval = $first_access+$timelimit;
$date = (!$due_date || $interval < $due_date) ? $interval
: $due_date;
} else {
@@ -865,11 +949,20 @@ STATE
sub analyze_header {
my ($request) = @_;
- my $js = &Apache::structuretags::setmode_javascript();
+ my $js = &Apache::lonxml::setmode_javascript();
# Breadcrumbs
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ my $brcrum = [{'href' => $href,
+ 'text' => $text},
{'href' => '',
'text' => 'Problem Testing'},
{'href' => '',
@@ -881,24 +974,32 @@ sub analyze_header {
{'bread_crumbs' => $brcrum,})
.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());
+ my %lt = &Apache::lonlocal::texthash(
+ edit => 'Edit',
+ editxml => 'EditXML',
+ );
$result .=
- '<form name="lonhomework" method="post" action="'.
+ '<form name="lonhomework" method="post" action="'.
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
'<input type="hidden" name="problemmode" value="'.
$env{'form.problemmode'}.'" />'.
&Apache::structuretags::remember_problem_state().'
- <div class="LC_edit_problem_analyze_header">
- <input type="button" name="submitmode" value="'.&mt("EditXML").'" '.
- 'onclick="javascript:setmode(this.form,'."'editxml'".')" />
- <input type="button" name="submitmode" value="'.&mt('Edit').'" '.
- 'onclick="javascript:setmode(this.form,'."'edit'".')" />
- <hr />
+ <div class="LC_edit_problem_analyze_header">';
+ my %editors = &Apache::loncommon::permitted_editors();
+ foreach my $item ('editxml','edit') {
+ next unless ($editors{$item});
+ $result .= '<input type="button" name="submitmode" value="'.$lt{$item}.'" '.
+ 'onclick="javascript:setmode(this.form,'."'$item'".')" />'.
+ "\n";
+ }
+ $result .=
+ '<hr />
<input type="button" name="submitmode" value="'.&mt("View").'" '.
'onclick="javascript:setmode(this.form,'."'view'".')" />
<hr />
</div>'
- .&Apache::lonxml::message_location().'
- </form>';
+ .&Apache::lonxml::message_location().
+ '</form>';
&Apache::lonxml::add_messages(\$result);
$request->print($result);
$request->rflush();
@@ -1097,12 +1198,21 @@ sub editxmlmode {
my $js =
&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js().
- &Apache::structuretags::setmode_javascript().
+ &Apache::lonxml::setmode_javascript().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
# Breadcrumbs
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ my $brcrum = [{'href' => $href,
+ 'text' => $text},
{'href' => '',
'text' => 'Problem Editing'}];
@@ -1127,7 +1237,7 @@ sub editxmlmode {
<div class="LC_edit_problem_header">
<div class="LC_edit_problem_header_title">'.
&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
- '</div><div class="LC_edit_actionbar" id="actionbar">';
+ '</div><div class="LC_edit_actionbar" id="actionbar">';
$result.='<input type="hidden" name="problemmode" value="saveedit" />'.
&Apache::structuretags::problem_edit_buttons('editxml');
@@ -1135,7 +1245,8 @@ sub editxmlmode {
$result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';
- unless ($env{'environment.nocodemirror'}) {
+ my $nocodemirror = &Apache::loncommon::nocodemirror();
+ unless ($nocodemirror) {
# dropdown menus
$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Problem Templates"), template_dropdown_datastructure());
@@ -1167,7 +1278,7 @@ sub editxmlmode {
'</textarea> <div id="LC_aftertextarea"> </div> </form>';
my $resource = $env{'request.ambiguous'};
- unless($env{'environment.nocodemirror'}){
+ unless ($nocodemirror) {
$result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
<script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
<script>
@@ -1240,8 +1351,10 @@ sub renderpage {
$problem='';
my $filename=(split('/',$file))[-1];
my $error =
- &mt('Unable to find [_1]',
- '<span class="LC_filename">'.$filename.'</span>');
+ '<p class="LC_error">'
+ .&mt('Unable to find [_1]',
+ '<span class="LC_filename">'.$filename.'</span>')
+ ."</p>";
$result.=
&Apache::loncommon::simple_error_page($request,'Not available',
$error,{'no_auto_mt_msg' => 1});
@@ -1269,12 +1382,12 @@ sub renderpage {
if ($target eq 'analyze') {
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
undef(%Apache::lonhomework::analyze);
- } elsif ($target eq 'web') {
+ } elsif ($target eq 'web') {
if ($donebuttonmsg) {
$result =~ s{</body>}{};
$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>";
}
- }
+ }
#my $td=&tv_interval($t0);
#if ( $Apache::lonxml::debug) {
#$result =~ s:</body>::;
@@ -1297,7 +1410,7 @@ sub renderpage {
}
if (!$return_string) {
&Apache::lonxml::add_messages(\$overall_result);
- $request->print($overall_result);
+ $request->print($overall_result);
$request->rflush();
} else {
return $overall_result;
@@ -1315,14 +1428,14 @@ sub finished_parsing {
# value 1: title
# value 2: category
# value 3: name of help topic ???
-sub get_template_list {
+sub get_template_list{
my ($extension) = @_;
my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
- '/templates/*.'.$extension);
+ '/templates/*.'.$extension);
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
- &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
+ &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
return @files;
}
@@ -1334,7 +1447,7 @@ sub get_template_html {
&Apache::lonxml::debug("Looking for :$extension:");
my $glob_extension = $extension;
if ($extension eq 'survey' || $extension eq 'exam') {
- $glob_extension = 'problem';
+ $glob_extension = 'problem';
}
my @files = &get_template_list($extension);
my ($midpoint,$seconddiv,$numfiles);
@@ -1421,10 +1534,10 @@ sub newproblem {
}
}
if ($file) {
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy($file,$dest);
- &renderpage($request,$dest);
- return;
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ &File::Copy::copy($file,$dest);
+ &renderpage($request,$dest);
+ return;
} else {
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>';
}
@@ -1448,8 +1561,17 @@ sub newproblem {
my $url=&HTML::Entities::encode($request->uri,'<>&"');
my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $instructions;
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ my $brcrum = [{'href' => $href,
+ 'text' => $text},
{'href' => '',
'text' => "Create New $extension"}];
my $start_page =
@@ -1564,11 +1686,16 @@ sub zero_timer {
sub handler {
#my $t0 = [&gettimeofday()];
my $request=$_[0];
+
$Apache::lonxml::request=$request;
$Apache::lonxml::debug=$env{'user.debug'};
$env{'request.uri'}=$request->uri;
&setuppermissions();
+# -------------------------------------- Flag and buffer for registered cleanup
+ $registered_cleanup=0;
+ undef(@Apache::lonhomework::ltipassback);
+
my $file=&Apache::lonnet::filelocation("",$request->uri);
#check if we know where we are
@@ -1603,7 +1730,13 @@ sub handler {
($env{'form.problemmode'} eq 'saveeditxml') ||
($env{'form.problemmode'} eq 'saveviewxml') ||
($env{'form.problemmode'} eq 'undoxml')) {
- &editxmlmode($request,$file);
+ my %editors = &Apache::loncommon::permitted_editors();
+ if (($editors{'xml'}) || ($env{'form.problemmode'} eq 'saveviewxml') || ($env{'form.problemmode'} eq 'undoxml')) {
+ &editxmlmode($request,$file);
+ } else {
+ &update_construct_style();
+ &renderpage($request,$file);
+ }
} elsif ($env{'form.problemmode'} eq 'calcanswers') {
&analyze($request,$file);
} else {
@@ -1611,8 +1744,8 @@ sub handler {
&renderpage($request,$file);
}
} else {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['mode']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['mode']);
# requested file doesn't exist in contruction space
&newproblem($request);
}
@@ -1620,7 +1753,7 @@ sub handler {
# Set the event timer to zero if the "done button" was clicked. The button is
# part of the doneButton form created in lonmenu.pm
my ($donebuttonresult,$donemsg,$viewasuser);
- if ($symb && $env{'form.LC_interval_done'} eq 'true') {
+ if ($symb && $env{'form.LC_interval_done'} eq 'true') {
($donebuttonresult,$donemsg) = &zero_timer($symb);
undef($env{'form.LC_interval_done'});
undef($env{'form.LC_interval_done_proctorpass'});
@@ -1651,13 +1784,13 @@ sub handler {
}
# just render the page normally outside of construction space
&Apache::lonxml::debug("not construct");
- undef(@Apache::lonhomework::ltipassback);
&renderpage($request,$file,undef,undef,$donemsg,$viewasuser,$symb);
if (@Apache::lonhomework::ltipassback) {
unless ($registered_cleanup) {
my $handlers = $request->get_handlers('PerlCleanupHandler');
$request->set_handlers('PerlCleanupHandler' =>
[\&do_ltipassback,@{$handlers}]);
+ $registered_cleanup=1;
}
}
}
@@ -1677,7 +1810,7 @@ sub template_dropdown_datastructure {
my %tmplthash = ();
# template title => path
my %tmpltcontent = ();
-
+
foreach my $template (@templates){
# put in hash if the template is not empty
unless ($template->[1] eq ''){
@@ -1686,9 +1819,9 @@ sub template_dropdown_datastructure {
}
}
- my $catList = [];
+ my $catList = [];
foreach my $cat (sort keys %tmplthash) {
- my $catItems = [];
+ my $catItems = [];
foreach my $title (sort @{$tmplthash{$cat}}) {
my $path = $tmpltcontent{$title}->[0];
my $code;
@@ -1698,62 +1831,62 @@ sub template_dropdown_datastructure {
}
close(FH);
- if ($code ne '') {
+ if ($code ne '') {
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
- my $currItem = [$href, $title, undef];
- push @{$catItems}, $currItem;
- }
+ my $currItem = [$href, $title, undef];
+ push @{$catItems}, $currItem;
+ }
}
- push @{$catList}, [$catItems, $cat, undef];
+ push @{$catList}, [$catItems, $cat, undef];
}
return $catList;
}
sub responseblock_dropdown_datastructure {
+
+ my $mathCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
+ ],
+ &mt("Math"),
+ undef
+ ];
- my $mathCat = [
- [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
- ],
- &mt("Math"),
- undef
- ];
-
- my $miscCat = [
- [
+ my $miscCat = [
+ [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
- ],
- &mt("Miscellaneous"),
- undef
- ];
-
- my $chemCat = [
- [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
- ],
- &mt("Chemistry"),
- undef
- ];
-
- my $textCat = [
- [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
- ],
- &mt("Text"),
- undef
- ];
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
+ ],
+ &mt("Miscellaneous"),
+ undef
+ ];
+
+ my $chemCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
+ ],
+ &mt("Chemistry"),
+ undef
+ ];
+
+ my $textCat = [
+ [
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
+ ],
+ &mt("Text"),
+ undef
+ ];
return [$mathCat, $miscCat, $chemCat, $textCat];
}
@@ -1768,18 +1901,18 @@ sub conditional_scripting_datastructure
#TODO translated is currently temporarily here, another solution should be found where the
# needed string can be retrieved
- my $translatedTag = '
+ my $translatedTag = '
<translated>
<lang which="en"></lang>
<lang which="default"></lang>
</translated>';
return [
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
- ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
+ ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
];
}
@@ -1798,101 +1931,217 @@ sub misc_datastructure {
# helper routine for the datastructure building subroutines
sub default_xml_tag {
- my ($tag) = @_;
- return "\n<$tag></$tag>";
+ my ($tag) = @_;
+ return "\n<$tag></$tag>";
}
+
sub helpmenu_datastructure {
- # filename, title, width, height
- my $helpers = [
- ['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
- ['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
- ['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
- ['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
- ['Authoring_Multilingual_Problems.hlp', &mt('Languages'), 800, 600],
- ];
-
- my $help_structure = [];
-
- foreach my $count (0..(scalar(@{$helpers})-1)) {
- my $filename = $helpers->[$count]->[0];
- my $title = $helpers->[$count]->[1];
- my $width = $helpers->[$count]->[2];
- my $height = $helpers->[$count]->[3];
- if ($width eq '') {
- $width = 500;
- }
- if ($height eq '') {
- $height = 600;
- }
- my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
- push @{$help_structure}, [$href, $title, undef];
- }
+ # filename, title, width, height
+ my $helpers = [
+ ['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
+ ['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
+ ['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
+ ['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
+ ['Authoring_Multilingual_Problems.hlp',
+ &mt('How to create problems in different languages'), 800, 600],
+ ['loncapa.html', &mt('Language reference'), 800, 600],
+ ];
+
+ my $help_structure = [];
+
+ foreach my $count (0..(scalar(@{$helpers})-1)) {
+ my $filename = $helpers->[$count]->[0];
+ my $title = $helpers->[$count]->[1];
+ my $width = $helpers->[$count]->[2];
+ my $height = $helpers->[$count]->[3];
+ if ($width eq '') {
+ $width = 500;
+ }
+ if ($height eq '') {
+ $height = 600;
+ }
+ my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
+ push @{$help_structure}, [$href, $title, undef];
+ }
- return $help_structure;
+ return $help_structure;
}
# we need substitution to not break javascript code
sub convert_for_js {
my $return = shift;
- $return =~ s|script|ESCAPEDSCRIPT|g;
- $return =~ s|\\|\\\\|g;
- $return =~ s|\n|\\r\\n|g;
- $return =~ s|'|\\'|g;
- $return =~ s|'|\\'|g;
+ $return =~ s|script|ESCAPEDSCRIPT|g;
+ $return =~ s|\\|\\\\|g;
+ $return =~ s|\n|\\r\\n|g;
+ $return =~ s|'|\\'|g;
+ $return =~ s|'|\\'|g;
return $return;
}
sub do_ltipassback {
if (@Apache::lonhomework::ltipassback) {
+ my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+ my $ip = &Apache::lonnet::get_host_ip($lonhost);
foreach my $item (@Apache::lonhomework::ltipassback) {
- if (ref($item) eq 'HASH') {
- if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) {
- my ($cdom,$cnum) = ($1,$2);
- my $msgformat = $item->{'lti'}->{'passbackformat'};
- my $sigmethod = 'HMAC-SHA1';
- my $ltinum = $item->{'ltinum'};
- my $id = $item->{'pbid'};
- my $url = $item->{'pburl'};
- my $type = $item->{'pbtype'};
- my $scope = $item->{'scope'};
- my $map = $item->{'ltimap'};
- my $symb = $item->{'ltisymb'};
- my $uname = $item->{'uname'};
- my $udom = $item->{'udom'};
- my $keynum = $item->{'lti'}->{'cipher'};
- my $crsdef = $item->{'crsdef'};
- my $scoretype = $item->{'format'};
- my ($total,$possible);
- if ($scope eq 'resource') {
+ &Apache::lonhomework::run_passback($item,$lonhost,$ip);
+ }
+ undef(@Apache::lonhomework::ltipassback);
+ }
+ return OK;
+}
+
+sub run_passback {
+ my ($item,$lonhost,$ip) = @_;
+ if (ref($item) eq 'HASH') {
+ if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) {
+ my ($cdom,$cnum) = ($1,$2);
+ my $msgformat = $item->{'lti'}->{'passbackformat'};
+ my $sigmethod = 'HMAC-SHA1';
+ my $ltinum = $item->{'ltinum'};
+ my $id = $item->{'pbid'};
+ my $url = $item->{'pburl'};
+ my $type = $item->{'pbtype'};
+ my $pbscope = $item->{'pbscope'};
+ my $map = $item->{'pbmap'};
+ my $symb = $item->{'pbsymb'};
+ my $uname = $item->{'uname'};
+ my $udom = $item->{'udom'};
+ my $uhome = $item->{'uhome'};
+ my $usec = $item->{'usec'};
+ my $keynum = $item->{'lti'}->{'cipher'};
+ my $crsdef = $item->{'crsdef'};
+ my $scoretype = $item->{'format'};
+ my $scope = $item->{'scope'};
+ my $clientip = $item->{'clientip'};
+ my ($total,$possible,%total_by_symb,%possible_by_symb);
+ if ((exists($item->{'total_s'})) && (ref($item->{'total_s'}) eq 'HASH')) {
+ %total_by_symb = %{$item->{'total_s'}};
+ if ($pbscope eq 'resource') {
+ if (exists($total_by_symb{$symb})) {
+ $total = $total_by_symb{$symb};
+ } else {
$total = $item->{'total'};
+ }
+ }
+ } elsif ($pbscope eq 'resource') {
+ $total = $item->{'total'};
+ }
+ if ((exists($item->{'possible_s'})) && (ref($item->{'possible_s'}) eq 'HASH')) {
+ %possible_by_symb = %{$item->{'possible_s'}};
+ if ($pbscope eq 'resource') {
+ if (exists($possible_by_symb{$symb})) {
+ $possible = $possible_by_symb{$symb};
+ } else {
$possible = $item->{'possible'};
- } elsif ($scope eq 'map') {
- ($total,$possible) = &get_lti_score($uname,$udom,$map);
- } elsif ($scope eq 'course') {
- ($total,$possible) = &get_lti_score($uname,$udom);
}
- if (($id ne '') && ($url ne '') && ($possible)) {
- &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible);
+ }
+ } elsif ($pbscope eq 'resource') {
+ $possible = $item->{'possible'};
+ }
+ if (($pbscope eq 'map') || ($pbscope eq 'nonrec')) {
+ if ((keys(%total_by_symb)) && (keys(%possible_by_symb))) {
+ ($total,$possible) =
+ &get_lti_score($uname,$udom,$usec,$map,$pbscope,\%total_by_symb,\%possible_by_symb);
+ } else {
+ ($total,$possible) = &get_lti_score($uname,$udom,$usec,$map,$pbscope);
+ }
+ } elsif ($pbscope eq 'course') {
+ ($total,$possible) = &get_lti_score($uname,$udom,$usec);
+ }
+ $item->{'total'} = $total;
+ $item->{'possible'} = $possible;
+ if (($id ne '') && ($url ne '') && ($possible)) {
+ my ($sent,$score,$code,$result) =
+ &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,
+ $url,$scoretype,$sigmethod,$msgformat,$total,$possible);
+ $item->{'score'} = $score;
+ my ($linkprotector,$linkuri,$no_passback,$appname);
+ if ($item->{'linkprot'}) {
+ ($linkprotector,$linkuri) = split(/:/,$item->{'linkprot'});
+ }
+ if ($sent) {
+ if ($code == 200) {
+ if ($item->{'linkprot'}) {
+ my $skey = join("\0",($linkuri,$linkprotector,$scope));
+ my $namespace = $cdom.'_'.$cnum.'_lp_passback';
+ my $store = {
+ 'score' => $score,
+ 'ip' => $ip,
+ 'host' => $Apache::lonnet::perlvar{'lonHostID'},
+ 'protector' => $linkprotector,
+ 'deeplink' => $linkuri,
+ 'scope' => $scope,
+ 'url' => $url,
+ 'id' => $id,
+ 'clientip' => $clientip,
+ 'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'},
+ };
+ my $value='';
+ foreach my $key (keys(%{$store})) {
+ $value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&';
+ }
+ $value=~s/\&$//;
+ &Apache::lonnet::courselog(&escape($linkuri).':'.$uname.':'.$udom.':EXPORT:'.$value);
+ &Apache::lonnet::store_userdata({'score' => $score},$skey,$namespace,$udom,$uname,$ip);
+ }
+ } else {
+ if ($item->{'linkprot'}) {
+ $no_passback = "Passback response was $code ($result).";
+ }
+ }
+ } else {
+ if ($item->{'linkprot'}) {
+ $no_passback = 'No passback of scores.';
+ }
+ }
+ if ($no_passback) {
+ if ($item->{'linkprot'}) {
+ my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/);
+ if ($ltitype eq 'c') {
+ my %lti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
+ if (ref($lti{$ltinum}) eq 'HASH') {
+ $appname = $lti{$ltinum}{'name'};
+ }
+ } elsif ($ltitype eq 'd') {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
+ if (ref($lti{$ltinum}) eq 'HASH') {
+ $appname = $lti{$ltinum}{'name'};
+ }
+ }
+ $no_passback .= " LTI launcher $linkprotector ($appname) for $linkuri (${cdom}_${cnum})";
+ &Apache::lonnet::logthis($no_passback." for $uname:$udom");
+ &Apache::lonnet::log($udom,$uname,$uhome,"$no_passback score=$score total=$total poss=$possible");
+ if ($item->{'linkprot'}) {
+ my $pendingkey = &Time::HiRes::time().':'.$uname.':'.$udom.':'.
+ "$linkuri\0$linkprotector\0$scope";
+ &Apache::lonnet::put('linkprot_passback_pending',{$pendingkey => $item},$cdom,$cnum);
+ }
}
}
}
}
- undef(@Apache::lonhomework::ltipassback);
}
+ return;
}
sub get_lti_score {
- my ($uname,$udom,$mapurl) = @_;
- my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+ my ($uname,$udom,$usec,$mapurl,$pbscope,$totals,$possibles) = @_;
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
if (ref($navmap)) {
my $iterator;
if ($mapurl ne '') {
my $map = $navmap->getResourceByUrl($mapurl);
- my $firstres = $map->map_start();
- my $finishres = $map->map_finish();
- $iterator = $navmap->getIterator($firstres,$finishres,undef,1);
+ if (ref($map)) {
+ my $firstres = $map->map_start();
+ my $finishres = $map->map_finish();
+ my $recursive = 1;
+ if ($pbscope eq 'nonrec') {
+ $recursive = 0;
+ }
+ $iterator = $navmap->getIterator($firstres,$finishres,undef,$recursive);
+ }
} else {
$iterator = $navmap->getIterator(undef,undef,undef,1);
}
@@ -1900,17 +2149,31 @@ sub get_lti_score {
my $depth = 1;
my $total = 0;
my $possible = 0;
+ my (%totals_by_symb,%possibles_by_symb);
+ if (ref($totals) eq 'HASH') {
+ %totals_by_symb = %{$totals};
+ }
+ if (ref($possibles) eq 'HASH') {
+ %possibles_by_symb = %{$possibles};
+ }
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();
while ( $depth > 0 ) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout) {
- my $parts = $curRes->parts();
- foreach my $part (@{$parts}) {
- next if ($curRes->solved($part) eq 'excused');
- $total += $curRes->weight($part) * $curRes->awarded($part);
- $possible += $curRes->weight($part);
+ my $currsymb = $curRes->symb();
+ if (($currsymb) && (exists($totals_by_symb{$currsymb})) &&
+ (exists($possibles_by_symb{$currsymb}))) {
+ $total += $totals_by_symb{$currsymb};
+ $possible += $possibles_by_symb{$currsymb};
+ } else {
+ my $parts = $curRes->parts();
+ foreach my $part (@{$parts}) {
+ next if ($curRes->solved($part) eq 'excused');
+ $total += $curRes->weight($part) * $curRes->awarded($part);
+ $possible += $curRes->weight($part);
+ }
}
}
$curRes = $iterator->next();