[LON-CAPA-cvs] cvs: loncom(version_2_0_X) /interface londocs.pm lonfeedback.pm lonmenu.pm lonnavmaps.pm /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 20 Sep 2005 07:52:05 -0000
albertel Tue Sep 20 03:52:05 2005 EDT
Modified files: (Branch: version_2_0_X)
/loncom/interface londocs.pm lonfeedback.pm lonmenu.pm
lonnavmaps.pm
/loncom/lonnet/perl lonnet.pm
Log:
- bringing tasks more generally into Lon-CAPA
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.205 loncom/interface/londocs.pm:1.206
--- loncom/interface/londocs.pm:1.205 Thu Sep 1 19:20:05 2005
+++ loncom/interface/londocs.pm Tue Sep 20 03:52:03 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.205 2005/09/01 23:20:05 albertel Exp $
+# $Id: londocs.pm,v 1.206 2005/09/20 07:52:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1114,7 +1114,7 @@
if ($cmd eq 'del') {
my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/)) {
+ ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
&Apache::lonnet::removeuploadedurl($url);
} else {
&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.167 loncom/interface/lonfeedback.pm:1.168
--- loncom/interface/lonfeedback.pm:1.167 Mon Jun 6 16:40:01 2005
+++ loncom/interface/lonfeedback.pm Tue Sep 20 03:52:03 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.167 2005/06/06 20:40:01 www Exp $
+# $Id: lonfeedback.pm,v 1.168 2005/09/20 07:52:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -97,7 +97,7 @@
$ressymb=&wrap_symb($ressymb);
my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
- && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+ && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
my %usernamesort = ();
my %namesort =();
@@ -3257,7 +3257,7 @@
my $mode='board';
my $status='OPEN';
my $previous=$env{'form.previous'};
- if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
$mode='problem';
$status=$Apache::inputtags::status[-1];
}
@@ -3296,7 +3296,7 @@
}
&Apache::lonenc::check_decrypt(\$symb);
my $goahead=1;
- if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
unless ($symb) { $goahead=0; }
}
# backward compatibility (bulletin boards used to be 'wrapped')
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.160 loncom/interface/lonmenu.pm:1.161
--- loncom/interface/lonmenu.pm:1.160 Fri Aug 26 14:44:21 2005
+++ loncom/interface/lonmenu.pm Tue Sep 20 03:52:03 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.160 2005/08/26 18:44:21 albertel Exp $
+# $Id: lonmenu.pm,v 1.161 2005/09/20 07:52:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -363,7 +363,7 @@
my $hwkadd='';
if ($env{'request.symb'} ne '' &&
- $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
if (&Apache::lonnet::allowed('mgr',$crs)) {
$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
"gocmd('/adm/grades','gradingmenu')",
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.336 loncom/interface/lonnavmaps.pm:1.337
--- loncom/interface/lonnavmaps.pm:1.336 Tue Aug 2 17:15:51 2005
+++ loncom/interface/lonnavmaps.pm Tue Sep 20 03:52:03 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.336 2005/08/02 21:15:51 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.337 2005/09/20 07:52:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3639,7 +3639,7 @@
sub is_problem {
my $self=shift;
my $src = $self->src();
- return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/)
+ return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/)
}
sub contains_problem {
my $self=shift;
@@ -4143,7 +4143,8 @@
return;
}
foreach (split(/\,/,$metadata)) {
- if ($_ =~ /^part_(.*)$/) {
+ if ($_ =~ /^(?:part|Task)_(.*)$/) {
+ &Apache::lonnet::logthis($self->src()." part -> ".$1);
my $part = $1;
# This floods the logs if it blows up
if (defined($parts{$part})) {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.651.2.3 loncom/lonnet/perl/lonnet.pm:1.651.2.4
--- loncom/lonnet/perl/lonnet.pm:1.651.2.3 Tue Sep 13 15:45:11 2005
+++ loncom/lonnet/perl/lonnet.pm Tue Sep 20 03:52:03 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.651.2.3 2005/09/13 19:45:11 albertel Exp $
+# $Id: lonnet.pm,v 1.651.2.4 2005/09/20 07:52:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1636,7 +1636,7 @@
my $fnsymb=shift;
unless ($env{'request.course.id'}) { return ''; }
my $what=$fnsymb.':'.$env{'user.name'}.':'.$env{'user.domain'};
- if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|page)$/) {
+ if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) {
$what.=':POST';
# FIXME: Probably ought to escape things....
foreach (keys %env) {