--- loncom/interface/londocs.pm	2006/11/13 01:57:57	1.249
+++ loncom/interface/londocs.pm	2006/11/20 17:45:11	1.254
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.249 2006/11/13 01:57:57 www Exp $
+# $Id: londocs.pm,v 1.254 2006/11/20 17:45:11 albertel 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'=>'<font size="+1">'.
 			   $name.'</font>'
 		       });
+	$plain.=$name.' &gt; ';
     }
+    $plain=~s/\&gt\;\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 {
@@ -1021,10 +1024,9 @@ sub log_docs {
     }
 
     sub log_differences {
-        my ($coursenum,$coursedom,$folder)=@_;
-        my %storehash=('folder' => '/uploaded/'.$coursedom.'/'.$coursenum.'/userfiles/'.$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};
@@ -1042,13 +1044,12 @@ sub log_docs {
               $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;
            }
         }
+	$storehash{'maxidx'}=$maxidx;
         if ($changedflag) { &log_docs(\%storehash); }
     }
 }
@@ -1061,32 +1062,37 @@ sub docs_change_log {
     my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
-                                                                                                                            
+
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
-                                                                                                                            
+
     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
-                                                                                                                            
+
     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
               '<input type="hidden" name="docslog" value="1" />');
-                                                                                                                            
+
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('docs_log',
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('docs_log',
                                                 \%saveable_parameters);
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
-                                                                                                                            
+    my %lt=('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));
-                                                                                                                            
+
     $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
               '<input type="submit" value="'.&mt('Display').'" /></form>');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
-              '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Users').'</th><th>'.
-              &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
+              '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
+              &mt('After').'</th>'.
               &Apache::loncommon::end_data_table_header_row());
     my $shown=0;
     foreach my $id (sort { $docslog{$b}{'exe_time'}<=>$docslog{$a}{'exe_time'} } (keys(%docslog))) {
@@ -1115,9 +1121,53 @@ sub docs_change_log {
                   '<br /><tt>'.$docslog{$id}{'exe_uname'}.
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
-                  &Apache::lonnet::gettitle($docslog{$id}{'logentry'}{'folder'}).'</td>');
-
-        $r->print(&Apache::loncommon::end_data_table_row());
+                  $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+# Before
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+	    if ($oldname ne $newname) {
+		$r->print(&LONCAPA::map::qtescape($oldname));
+	    }
+	}
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
+# After
+        $r->print('</td><td>');
+
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+	    if ($oldname ne $newname) {
+		$r->print(&LONCAPA::map::qtescape($newname));
+	    }
+	}        
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
+	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
+	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+		    $r->print('<li>'.
+			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+			      .'</li>');
+		}
+	    }
+	    $r->print('</ul>');
+	}
+# End
+        $r->print('</td>'.&Apache::loncommon::end_data_table_row());
         $shown++;
         if (!($env{'form.show'} eq &mt('all')
               || $shown<=$env{'form.show'})) { last; }
@@ -1148,7 +1198,7 @@ sub editor {
 	$env{'form.markedcopy_title'}=$title;
 	$env{'form.markedcopy_url'}=$url;
     }
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted)=&breadcrumbs($folder);
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
     $r->print($breadcrumbtrail);
     if ($fatal) {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
@@ -1183,6 +1233,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('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
 	    }
 
 	    if ($env{'form.newpos'}) {
@@ -1362,8 +1418,7 @@ sub editor {
                    $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
                }
            }
-           &log_differences($coursenum,$coursedom,
-                            $folder.'.'.$container);
+           &log_differences($plain);
        }
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen