--- loncom/interface/londocs.pm 2003/10/29 21:21:55 1.92
+++ loncom/interface/londocs.pm 2003/12/09 19:48:51 1.96
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.92 2003/10/29 21:21:55 www Exp $
+# $Id: londocs.pm,v 1.96 2003/12/09 19:48:51 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -510,6 +510,7 @@ sub checkonthis {
&Apache::lonxml::xmlparse($r,'web',
&Apache::lonnet::getfile(
&Apache::lonnet::filelocation('',$url)));
+ undef($Apache::lonhomework::parsing_a_problem);
$ENV{'request.filename'}=$oldpath;
if (($Apache::lonxml::errorcount) ||
($Apache::lonxml::warningcount)) {
@@ -596,14 +597,17 @@ sub checkversions {
$haschanged=1;
foreach (keys %hash) {
if ($_=~/^ids\_(\/res\/.+)$/) {
- my $src=$1;
+ $newsetversions{$1}='mostrecent';
}
}
} elsif ($ENV{'form.setcurrent'}) {
$haschanged=1;
foreach (keys %hash) {
if ($_=~/^ids\_(\/res\/.+)$/) {
- my $src=$1;
+ my $getvers=&Apache::lonnet::getversion($1);
+ if ($getvers>0) {
+ $newsetversions{$1}=$getvers;
+ }
}
}
} elsif ($ENV{'form.setversions'}) {
@@ -714,6 +718,9 @@ ENDHEADERS
if ($changes{$_}>$starttime) {
my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
my $currentversion=&Apache::lonnet::getversion($_);
+ if ($currentversion<0) {
+ $currentversion=&mt('Could not be determined.');
+ }
my $linkurl=&Apache::lonnet::clutter($_);
$r->print(
'
'.
@@ -725,7 +732,7 @@ ENDHEADERS
$currentversion.' | ');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
- if ($usedversion) {
+ if (($usedversion) && ($usedversion ne 'mostrecent')) {
$r->print($usedversion);
} else {
$r->print($currentversion);
@@ -735,7 +742,7 @@ ENDHEADERS
$r->print(&Apache::loncommon::select_form($setversions{$linkurl},
'set_version_'.$linkurl,
('' => '',
- 'current' => 'most recent',
+ 'mostrecent' => 'most recent',
map {$_,$_} (1..$currentversion))));
$r->print(' | ');
my $lastold=1;
@@ -789,7 +796,6 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
- &Apache::lonlocal::clearreroutetrans();
# --------------------------------------------- Initialize help topics for this
foreach ('Adding_Course_Doc','Main_Course_Documents',
'Adding_External_Resource','Navigate_Content',
@@ -981,7 +987,10 @@ ENDNEWSCRIPT
'sipr' => 'Simple Problem',
'scuf' => 'Score Upload Form',
'bull' => 'Bulletin Board',
- 'mypi' => 'My Personal Info'
+ 'mypi' => 'My Personal Info',
+ 'file' => 'File',
+ 'title' => 'Title',
+ 'comment' => 'Comment'
);
# -----------------------------------------------------------------------------
if ($allowed) {
@@ -1011,7 +1020,7 @@ $dumpbut
ENDCOURSEVERIFY
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
- 'Editing the Table of Contents for your Course'));
+ &mt('Editing the Table of Contents for your Course')));
}
# --------------------------------------------------------- Standard documents
$r->print('');
@@ -1040,11 +1049,11 @@ ENDCOURSEVERIFY
$lt{'spec'} |
-File:
+$lt{'file'}:
| ');
}
}
- $r->print(&Apache::lonlocal::endreroutetrans().' |