--- loncom/publisher/lonretrieve.pm	2001/04/03 21:12:39	1.3
+++ loncom/publisher/lonretrieve.pm	2001/05/02 21:35:15	1.8
@@ -11,7 +11,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 #
-# 03/31,04/03 Gerd Kortemeyer
+# 03/31,04/03,05/02 Gerd Kortemeyer
 
 package Apache::lonretrieve;
 
@@ -31,10 +31,11 @@ sub phaseone {
     my $resdir=$resfn;
     $resdir=~s/\/[^\/]+$/\//;
 
-    $fn=~/^\/(.+)\.(\w+)$/;
+    $fn=~/\/([^\/]+)\.(\w+)$/;
     my $main=$1;
     my $suffix=$2;
-  
+
+    if (-e $resfn) {  
     $r->print('<form action=/adm/retrieve method=post>'.
 	      '<input type=hidden name=filename value="'.$fn.'">'.
               '<input type=hidden name=phase value=two>'.
@@ -54,7 +55,14 @@ sub phaseone {
                      $version.'"></td><th>'.$version.'</th><td>'.
                      localtime($rmtime).'</td><td>'.
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.
-                     'Metadata Version '.$version.'</a></td></tr>');
+                     'Metadata Version '.$version);
+           if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
+               $r->print(
+                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename='.$fn.
+                        '&versionone=priv&versiontwo='.$version.
+                        '">Diffs with Version '.$version.'</a>');
+           }
+           $r->print('</a></td></tr>');
         }
     }
     closedir(DIR);
@@ -66,7 +74,53 @@ sub phaseone {
               '<th>Current</th><td>'.localtime($rmtime).
            '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
               'Metadata current version</a></td></tr></table><p>'.
+           '<font size=+1 color=red>Retrieval of an old version will '.
+           'overwrite the file currently in construction space</font><p>'.
            '<input type=submit value="Retrieve version"></form>');
+} else {
+    $r->print('<h3>No previous versions published.</h3>');
+}
+}
+
+sub phasetwo {
+    my ($r,$fn,$uname,$udom)=@_;
+    if ($ENV{'form.version'}) {
+        my $version=$ENV{'form.version'};
+	if ($version eq 'new') {
+	    $r->print('<h3>Retrieving current (most recent) version</h3>');
+        } else {
+            $r->print('<h3>Retrieving old version '.$version.'</h3>');
+        }
+        my $logfile;
+        my $ctarget='/home/'.$uname.'/public_html'.$fn;
+        my $vfn=$fn;
+        if ($version ne 'new') {
+	    $vfn=~s/\.(\w+)$/\.$version\.$1/;
+        }
+        my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
+        unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {
+	  $r->print(
+         '<font color=red>No write permission to user directory, FAIL</font>');
+        }
+        print $logfile 
+"\n\n================= Retrieve ".localtime()." ================\n".
+"Version: $version\nSource: $csource\nTarget: $ctarget\n";
+        $r->print('<p>Copying file: ');
+        if (copy($csource,$ctarget)) {
+	    $r->print('ok<p>');
+            print $logfile "Copied sucessfully.\n\n";
+        } else {
+            my $error=$!;
+	    $r->print('fail, '.$error.'<p>');
+            print $logfile "Copy failed: $error\n\n";
+        }
+        $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
+                  '">Back to '.$fn.'</a></font>'); 
+    } else {
+       $r->print(
+   '<font size=+1 color=red>Please pick a version to retrieve</font><p>');
+       &phaseone($r,$fn,$uname,$udom);
+    }
 }
 
 sub handler {
@@ -107,6 +161,7 @@ sub handler {
   $r->print('<h1>Retrieve previous versions of <tt>'.$fn.'</tt></h1>');
 
   if ($ENV{'form.phase'} eq 'two') {
+      &phasetwo($r,$fn,$uname,$udom);
   } else {
       &phaseone($r,$fn,$uname,$udom);
   }
@@ -114,3 +169,6 @@ sub handler {
   $r->print('</body></html>');
   return OK;  
 }
+
+1;
+__END__