--- loncom/publisher/lonretrieve.pm	2005/12/12 21:59:12	1.28
+++ loncom/publisher/lonretrieve.pm	2006/12/06 22:22:39	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.28 2005/12/12 21:59:12 albertel Exp $
+# $Id: lonretrieve.pm,v 1.34 2006/12/06 22:22:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 # ------------------------------------ Interface for selecting previous version
 sub phaseone {
@@ -51,67 +52,91 @@ sub phaseone {
     my $resdir=$resfn;
     $resdir=~s/\/[^\/]+$/\//;
 
-    $fn=~/\/([^\/]+)\.(\w+)$/;
-    my $main=$1;
-    my $suffix=$2;
-
+    my ($main,$suffix,$is_meta) = &get_file_info($fn);
+    
     if (-e $resfn) {  
-    $r->print('<form action=/adm/retrieve method=post>'.
-	      '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.
-              '<input type=hidden name=phase value=two>'.
-              '<table border=2><tr><th>'.&mt('Select').'</th><th>'.
-	      &mt('Version').'</th>'.
-              '<th>'.&mt('Published on ...').'</th>'.
-              '<th>'.&mt('Metadata').'</th></tr>');
-
-    opendir(DIR,$resdir);
-    my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR));
-    @files = sort {
-	my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
-	my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
-	return $aver <=> $bver;
-    } (@files);
-    closedir(DIR);
-
-    foreach my $filename (@files) {
-        if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
-	   my $version=$1;
-           my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
-           $r->print('<tr><td><input type=radio name=version value="'.
-                     $version.'"></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
-                     localtime($rmtime).'</td><td>'.
-                     '<a href="'.$urldir.$filename.'.meta" target=cat>'.
-                     &mt('Metadata Version').' '.$version.'</a>');
-           if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versiontwo=priv&versionone='.$version.
-                        '">'.&mt('Diffs with Version').' '.$version.'</a>');
-           }
-           $r->print('</a></td></tr>');
-        }
+	$r->print('<form action="/adm/retrieve" method="POST">'.
+		  '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
+		  '<input type="hidden" name="phase" value="two" />'.
+		  &Apache::loncommon::start_data_table().
+		  &Apache::loncommon::start_data_table_header_row().
+		  '<th>'.&mt('Select').'</th>'.
+		  '<th>'.&mt('Version').'</th>'.
+		  '<th>'.&mt('Published on ...').'</th>');
+	if (!$is_meta) {
+	    $r->print('<th>'.&mt('Metadata').'</th>');
+	}
+	if ($is_meta
+	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+	    $r->print('<th>'.&mt('Diffs').'</th>');
+	}
+	$r->print(&Apache::loncommon::end_data_table_header_row());
+	
+	opendir(DIR,$resdir);
+	my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR));
+	@files = sort {
+	    my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
+	    my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
+	    return $aver <=> $bver;
+	} (@files);
+	closedir(DIR);
+	
+	foreach my $filename (@files) {
+	    if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
+		my $version=$1;
+		my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
+		$r->print(&Apache::loncommon::start_data_table_row().
+			  '<td><input type="radio" name="version" value="'.
+			  $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
+			  localtime($rmtime).'</td>');
+		
+		if (!$is_meta) {
+		    $r->print('<td><a href="'.$urldir.$filename.'.meta" target=cat>'.
+			      &mt('Metadata Version').' '.$version.'</a></td>');
+		}
+		if ($is_meta
+		    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+		    $r->print(
+			      '<td><a target="cat" href="/adm/diff?filename=/~'.
+			      $uname.$fn.
+			      '&amp;versiontwo=priv&amp;versionone='.$version.
+			      '">'.&mt('Diffs with Version').' '.$version.
+			      '</a></td>');
+		}
+		$r->print(&Apache::loncommon::end_data_table_row());
+	    }
+	}
+	closedir(DIR);
+	my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
+	$r->print(&Apache::loncommon::start_data_table_row().
+		  '<td><input type="radio" name="version" value="new" /></td>'.
+		  '<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime).
+		  '</td>');
+	if (!$is_meta) {
+	    $r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
+		      &mt('Metadata current version').'</a></td>');           
+	}
+	if ($is_meta 
+	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+	    $r->print(
+		      '<td><a target="cat" href="/adm/diff?filename=/~'.
+		      $uname.$fn.
+		      '&amp;versiontwo=priv'.
+		      '">'.&mt('Diffs with current Version').'</a></td>');
+	}
+	$r->print(&Apache::loncommon::end_data_table_row().
+		  &Apache::loncommon::end_data_table().
+		  '<p>'.'<span class="LC_warning">'.
+		  &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>');
+	if (!$is_meta) {
+	    $r->print('<p>'.'<span class="LC_warning">'.
+		      &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.').
+		      '</span></p>');
+	}
+	$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
+    } else {
+	$r->print('<h3>'.&mt('No previous versions published.').'</h3>');
     }
-    closedir(DIR);
-    my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
-    $r->print('<tr><td><input type=radio name=version value="new"></td>'.
-              '<th>'.&mt('Currently public version').'</th><td>'.localtime($rmtime).
-           '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
-              &mt('Metadata current version').'</a>');           
-           if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versiontwo=priv'.
-                        '">'.&mt('Diffs with current Version').'</a>');
-           }
-           $r->print('</td></tr></table><p>'.
-           '<font size=+1 color=red>'.
-&mt('Retrieval of an old version will overwrite the file currently in construction space').'</font><p>'.
-           '<input type=submit value="'.&mt('Retrieve version').'"></form>');
-} else {
-    $r->print('<h3>'.&mt('No previous versions published.').'</h3>');
-}
     $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
 	      '</a></p>'); 
 }
@@ -126,14 +151,21 @@ sub phasetwo {
         } else {
             $r->print('<h3>'.&mt('Retrieving old version').' '.$version.'</h3>');
         }
+	my ($main,$suffix,$is_meta) = &get_file_info($fn);
+
         my $logfile;
         my $ctarget='/home/'.$uname.'/public_html'.$fn;
         my $vfn=$fn;
         if ($version ne 'new') {
-	    $vfn=~s/\.(\w+)$/\.$version\.$1/;
+	    $vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/;
         }
+
         my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
-        unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {
+
+	my $logname = $ctarget;
+	if ($is_meta) { $logname =~ s/\.meta$//; }
+	$logname = $ctarget.'.log';
+        unless ($logfile=Apache::File->new('>>'.$logname)) {
 	  $r->print(
          '<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>');
         }
@@ -141,7 +173,7 @@ sub phasetwo {
 "\n\n================= Retrieve ".localtime()." ================\n".
 "Version: $version\nSource: $csource\nTarget: $ctarget\n";
         $r->print('<p>'.&mt('Copying file').': ');
-        if (copy($csource,$ctarget)) {
+	if (copy($csource,$ctarget)) {
 	    $r->print('ok<p>');
             print $logfile "Copied sucessfully.\n\n";
         } else {
@@ -152,12 +184,23 @@ sub phasetwo {
         $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
                   '">'.&mt('Back to').' '.$fn.'</a></font>'); 
     } else {
-       $r->print(
-   '<font size=+1 color=red>'.&mt('Please pick a version to retrieve').'</font><p>');
+       $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');
        &phaseone($r,$fn,$uname,$udom);
     }
 }
 
+sub get_file_info {
+    my ($fn) = @_;
+    my ($main,$suffix) = ($fn=~/\/([^\/]+)\.(\w+)$/);
+    my $is_meta=0;
+    if ($suffix eq 'meta') {
+	$is_meta = 1;
+	($main,$suffix) = ($main=~/(.+)\.(\w+)$/);	    
+	$suffix .= '.meta';
+    }
+    return ($main,$suffix,$is_meta);
+}
+
 # ---------------------------------------------------------------- Main Handler
 sub handler {
 
@@ -200,22 +243,20 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/\/\~(\w+)//;
+  $fn=~s{/~($LONCAPA::username_re)}{};
 
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
-  $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-  $r->print(&Apache::loncommon::bodytag('Retrieve Published Resources'));
+  $r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));
 
   
   $r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>');
   
   if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-          $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
+          $r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.
 		    &mt(' at ').$udom.
-               '</font></h3>');
+               '</span></h3>');
   }
 
 
@@ -225,7 +266,7 @@ sub handler {
       &phaseone($r,$fn,$uname,$udom);
   }
 
-  $r->print('</body></html>');
+  $r->print(&Apache::loncommon::end_page());
   return OK;  
 }