');
+ return;
+ }
}
}
if ($ENV{'form.cmd'}) {
@@ -335,7 +343,12 @@ sub editor {
}
# Store the changed version
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ $folder.'.sequence');
+ if ($fatal) {
+ $r->print('
'.$errtext.'
');
+ return;
+ }
}
# Group import/search
if ($ENV{'form.importdetail'}) {
@@ -349,21 +362,30 @@ sub editor {
}
}
# Store the changed version
- group_import($coursenum, $coursedom, $folder, @imports);
+ ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
+ @imports);
+ if ($fatal) {
+ $r->print('
'.$errtext.'
');
+ return;
+ }
}
# Loading a complete map
if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
- foreach
-(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
my $idx=$#Apache::lonratedt::resources;
$idx++;
$Apache::lonratedt::resources[$idx]=$_;
$Apache::lonratedt::order
- [$#Apache::lonratedt::order+1]=$idx;
- }
+ [$#Apache::lonratedt::order+1]=$idx;
+ }
# Store the changed version
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+ ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ $folder.'.sequence');
+ if ($fatal) {
+ $r->print('
'.$errtext.'
');
+ return;
+ }
}
}
# ---------------------------------------------------------------- End commands
@@ -425,14 +447,11 @@ END
# Figure out what kind of a resource this is
my ($extension)=($url=~/\.(\w+)$/);
my $uploaded=($url=~/^\/*uploaded\//);
- my $icon='unknown';
- if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
- $icon=$extension;
- }
+ my $icon=&Apache::loncommon::icon($url);
my $isfolder=0;
if ($uploaded) {
if ($extension eq 'sequence') {
- $icon='folder_closed';
+ $icon=$iconpath.'/folder_closed.gif';
$url=~/\/(\w+)\.sequence/;
$url='/adm/coursedocs?folder='.$1;
$isfolder=1;
@@ -454,8 +473,7 @@ END
if ($isfolder) { $url.='&foldername='.
&Apache::lonnet::escape($foldertitle); }
$line.='
'.&mt('An Error Occured while Attempting to Store your Version Settings').'
');
+ }
&changewarning($r,'');
- return;
}
- $hashtied=0;
- &tiehash();
if ($ENV{'form.timerange'} eq 'all') {
# show all documents
$header=&mt('All Documents in Course');
@@ -642,6 +697,9 @@ sub checkversions {
$header=&mt('No content modifications yet.');
}
}
+ %setversions=&Apache::lonnet::dump('resourceversions',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
my %lt=&Apache::lonlocal::texthash
('st' => 'Version changes since start of Course',
'lm' => 'Version changes since last Month',
@@ -671,42 +729,54 @@ sub checkversions {
-
$header
-
-
-
$lt{'fi'}
$lt{'md'}
$lt{'mr'}
-
$lt{'ve'}
$lt{'vu'}
$lt{'di'}
+
ENDHEADERS
foreach (sort keys %changes) {
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(
- '
In Course: '.
+ '');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
- if ($usedversion) {
+ if (($usedversion) && ($usedversion ne 'mostrecent')) {
$r->print($usedversion);
} else {
$r->print($currentversion);
}
- $r->print('
');
my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -715,11 +785,27 @@ ENDHEADERS
$lastold=$prevvers;
}
}
+ #
+ # Code to figure out how many version entries should go in
+ # each of the four columns
+ my $entries_per_col = 0;
+ my $num_entries = ($currentversion-$lastold);
+ if ($num_entries % 4 == 0) {
+ $entries_per_col = $num_entries/4;
+ } else {
+ $entries_per_col = $num_entries/4 + 1;
+ }
+ my $entries_count = 0;
+ $r->print('
');
+ my $cols_output = 1;
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print('