[LON-CAPA-cvs] cvs: loncom /interface lonquickgrades.pm lontiny.pm rat lonpageflip.pm lonsequence.pm
raeburn
raeburn at source.lon-capa.org
Wed Oct 19 14:09:04 EDT 2022
raeburn Wed Oct 19 18:09:04 2022 EDT
Modified files:
/rat lonpageflip.pm lonsequence.pm
/loncom/interface lonquickgrades.pm lontiny.pm
Log:
- Bug 6975
When checking for stale session indicates update of session needed for
supplemental content change(s) remove httpref.src entries for hidden or
deleted resources.
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.112 rat/lonpageflip.pm:1.113
--- rat/lonpageflip.pm:1.112 Wed Oct 19 00:03:12 2022
+++ rat/lonpageflip.pm Wed Oct 19 18:09:03 2022
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.112 2022/10/19 00:03:12 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.113 2022/10/19 18:09:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -545,7 +545,11 @@
}
}
if (($reinitcheck eq 'both') || ($reinitcheck eq 'supp')) {
- my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom);
+ my $possdel;
+ if ($reinitcheck eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
unless ($refs_updated) {
&Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
}
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.57 rat/lonsequence.pm:1.58
--- rat/lonsequence.pm:1.57 Wed Oct 19 00:03:12 2022
+++ rat/lonsequence.pm Wed Oct 19 18:09:03 2022
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.57 2022/10/19 00:03:12 raeburn Exp $
+# $Id: lonsequence.pm,v 1.58 2022/10/19 18:09:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -234,9 +234,13 @@
$r->send_http_header;
$r->print(&Apache::loncommon::check_release_result(@reinit));
return OK;
- } elsif (($result eq 'main') || ($result eq 'both')) {
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ }
+ my ($cnum,$cdom);
+ if ($result) {
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ }
+ if (($result eq 'main') || ($result eq 'both')) {
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
if ($ferr) {
my $requrl = $r->uri;
@@ -245,7 +249,16 @@
return HTTP_NOT_ACCEPTABLE;
}
}
-
+ if (($result eq 'both') || ($result eq 'supp')) {
+ my $possdel;
+ if ($result eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
+ unless ($refs_updated) {
+ &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+ }
+ }
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.123 loncom/interface/lonquickgrades.pm:1.124
--- loncom/interface/lonquickgrades.pm:1.123 Wed Oct 19 00:03:10 2022
+++ loncom/interface/lonquickgrades.pm Wed Oct 19 18:09:04 2022
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.123 2022/10/19 00:03:10 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.124 2022/10/19 18:09:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -166,7 +166,11 @@
return REDIRECT;
}
if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
- my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom);
+ my $possdel;
+ if ($reinitresult eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
unless ($refs_updated) {
&Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
}
Index: loncom/interface/lontiny.pm
diff -u loncom/interface/lontiny.pm:1.16 loncom/interface/lontiny.pm:1.17
--- loncom/interface/lontiny.pm:1.16 Fri Jul 8 03:05:18 2022
+++ loncom/interface/lontiny.pm Wed Oct 19 18:09:04 2022
@@ -2,7 +2,7 @@
# Extract domain, courseID, and symb from a shortened URL,
# and switch role to a role in designated course.
#
-# $Id: lontiny.pm,v 1.16 2022/07/08 03:05:18 raeburn Exp $
+# $Id: lontiny.pm,v 1.17 2022/10/19 18:09:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,14 +118,14 @@
$realuri .= '?symb='.$symb;
}
}
- my $update;
+ my ($update,$reinitresult);
# Check if course needs to be re-initialized
if ($newlauncher) {
$update = 1;
} else {
my $loncaparev = $r->dir_config('lonVersion');
- my ($result, at reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
- if ($result eq 'update') {
+ ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+ if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
$update = 1;
} elsif (!-e $env{'request.course.fn'}.'.db') {
$update = 1;
@@ -155,6 +155,16 @@
return HTTP_NOT_ACCEPTABLE;
}
}
+ if (($reinitresult eq 'both') || ($reinitresult eq 'supp')) {
+ my $possdel;
+ if ($reinitresult eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
+ unless ($refs_updated) {
+ &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+ }
+ }
my $host = $r->headers_in->get('Host');
if (!$host) {
$r->internal_redirect($realuri);
More information about the LON-CAPA-cvs
mailing list