--- loncom/interface/londocs.pm 2006/11/12 06:29:33 1.248
+++ loncom/interface/londocs.pm 2006/11/15 14:33:46 1.253
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.248 2006/11/12 06:29:33 albertel Exp $
+# $Id: londocs.pm,v 1.253 2006/11/15 14:33:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -954,6 +954,7 @@ sub breadcrumbs {
}
my $folderpath;
my $cpinfo='';
+ my $plain='';
if ($env{'form.markedcopy_url'}) {
$cpinfo='&markedcopy_url='.
&escape($env{'form.markedcopy_url'}).
@@ -986,9 +987,11 @@ sub breadcrumbs {
'text'=>''.
$name.''
});
+ $plain.=$name.' > ';
}
+ $plain=~s/\>\;\s*$//;
return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
- 'LC_docs_path'),$randompick,$ishidden,$isencrypted);
+ 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain);
}
sub log_docs {
@@ -1001,6 +1004,7 @@ sub log_docs {
my $parmidx;
my %parmaction=();
my %parmvalue=();
+ my $changedflag;
sub snapshotbefore {
@oldresources=@LONCAPA::map::resources;
@@ -1008,6 +1012,7 @@ sub log_docs {
$parmidx=undef;
%parmaction=();
%parmvalue=();
+ $changedflag=0;
}
sub remember_parms {
@@ -1015,13 +1020,13 @@ sub log_docs {
$parmidx=$idx;
$parmaction{$parameter}=$action;
$parmvalue{$parameter}=$value;
+ $changedflag=1;
}
sub log_differences {
- my $r=shift;
- my %storehash=('folder' => $env{'form.folder'});
+ my ($plain)=@_;
+ my %storehash=('folder' => $plain);
if ($parmidx) {
- $storehash{'parameter_idx'}=$parmidx;
$storehash{'parameter_res'}=$oldresources[$parmidx];
foreach my $parm (keys %parmaction) {
$storehash{'parameter_action_'.$parm}=$parmaction{$parm};
@@ -1036,15 +1041,16 @@ sub log_docs {
if ($LONCAPA::map::resources[$idx] ne $oldresources[$idx]) {
$storehash{'before_resources_'.$idx}=$oldresources[$idx];
$storehash{'after_resources_'.$idx}=$LONCAPA::map::resources[$idx];
+ $changedflag=1;
}
if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
- $storehash{'before_order_'.$idx}=$oldorder[$idx];
- $storehash{'after_order_'.$idx}=$LONCAPA::map::order[$idx];
- $storehash{'before_order_res_'.$idx}=$oldresources[$idx];
- $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$idx];
+ $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+ $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+ $changedflag=1;
}
}
- &log_docs(\%storehash);
+ $storehash{'maxidx'}=$maxidx;
+ if ($changedflag) { &log_docs(\%storehash); }
}
}
@@ -1072,7 +1078,12 @@ sub docs_change_log {
&Apache::loncommon::restore_course_settings('docs_log',
\%saveable_parameters);
if (!$env{'form.show'}) { $env{'form.show'}=10; }
-
+ my %lt=&Apache::lonlocal::texthash('hiddenresource' => 'Resources hidden',
+ 'encrypturl' => 'URL hidden',
+ 'randompick' => 'Randomly pick',
+ 'set' => 'set to',
+ 'del' => 'deleted');
+
my $countselect =
&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
(&mt('all'),10,20,50,100,1000,10000));
@@ -1080,8 +1091,8 @@ sub docs_change_log {
$r->print('
'.$errtext.'
'); @@ -1177,6 +1231,12 @@ sub editor { &LONCAPA::map::delparameter($idx,'parameter_encrypturl'); &remember_parms($idx,'encrypturl','del'); } +# store the changed version + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); + if ($fatal) { + $r->print(''.$errtext.'
'); + return; + } } if ($env{'form.newpos'}) { @@ -1329,7 +1389,7 @@ sub editor { } } # Store the changed version - ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder, + ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, $container,'londocs',@imports); if ($fatal) { $r->print(''.$errtext.'
'); @@ -1356,7 +1416,7 @@ sub editor { $r->print(''.&mt('No map selected.').'
'); } } - &log_differences($r); + &log_differences($plain); } # ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen