--- loncom/publisher/lonretrieve.pm	2001/04/01 02:58:51	1.1
+++ loncom/publisher/lonretrieve.pm	2001/04/03 21:12:39	1.3
@@ -11,7 +11,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 #
-# 03/31 Gerd Kortemeyer
+# 03/31,04/03 Gerd Kortemeyer
 
 package Apache::lonretrieve;
 
@@ -20,6 +20,54 @@ use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 
+sub phaseone {
+    my ($r,$fn,$uname,$udom)=@_;
+    my $docroot=$r->dir_config('lonDocRoot');
+
+    my $urldir='/res/'.$udom.'/'.$uname.$fn;
+    $urldir=~s/\/[^\/]+$/\//;
+
+    my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
+    my $resdir=$resfn;
+    $resdir=~s/\/[^\/]+$/\//;
+
+    $fn=~/^\/(.+)\.(\w+)$/;
+    my $main=$1;
+    my $suffix=$2;
+  
+    $r->print('<form action=/adm/retrieve method=post>'.
+	      '<input type=hidden name=filename value="'.$fn.'">'.
+              '<input type=hidden name=phase value=two>'.
+              '<table border=2><tr><th>Select</th><th>Version</th>'.
+              '<th>Became this version on ...</th>'.
+              '<th>Metadata</th></tr>');
+    my $filename;
+    opendir(DIR,$resdir);
+    while ($filename=readdir(DIR)) {
+        if ($filename=~/^$main\.(\d+)\.$suffix$/) {
+	   my $version=$1;
+           my ($rdev,$rino,$rmode,$rnlink,
+                $ruid,$rgid,$rrdev,$rsize,
+                $ratime,$rmtime,$rctime,
+                $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+           $r->print('<tr><td><input type=radio name=version value="'.
+                     $version.'"></td><th>'.$version.'</th><td>'.
+                     localtime($rmtime).'</td><td>'.
+                     '<a href="'.$urldir.$filename.'.meta" target=cat>'.
+                     'Metadata Version '.$version.'</a></td></tr>');
+        }
+    }
+    closedir(DIR);
+    my ($rdev,$rino,$rmode,$rnlink,
+        $ruid,$rgid,$rrdev,$rsize,
+        $ratime,$rmtime,$rctime,
+        $rblksize,$rblocks)=stat($resfn);
+    $r->print('<tr><td><input type=radio name=version value="new"></td>'.
+              '<th>Current</th><td>'.localtime($rmtime).
+           '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
+              'Metadata current version</a></td></tr></table><p>'.
+           '<input type=submit value="Retrieve version"></form>');
+}
 
 sub handler {
 
@@ -29,16 +77,16 @@ sub handler {
 
   if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};
-      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
-      $fn=~s/\/[^\/]+$//;
+      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)//;
   } else {
-      $fn=$r->filename();
+     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+         ' unspecified filename for retrieval', $r->filename); 
+     return HTTP_NOT_FOUND;
   }
-     
 
   unless ($fn) { 
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
-         ' trying to publish empty directory', $r->filename); 
+         ' trying to retrieve non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
 
@@ -55,26 +103,13 @@ sub handler {
   $r->print(
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
 
-  my $thisdisfn=$fn;
-  $thisdisfn=~s/^\/home\/$uname\/public_html//;
   
-  $r->print('<h1>Construction Space Directory <tt>'.$thisdisfn.'</tt></h1>');
-
-  my $docroot=$r->dir_config('lonDocRoot');
-
-  my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn;
-  my $linkdir='/~'.$uname.$thisdisfn;
-
-    my $filename;
-    opendir(DIR,$fn);
-       while ($filename=readdir(DIR)) {
-           $filename=~/\.(\w+)$/;
-           if (($1 ne 'meta') && ($1 ne 'save') && ($1 ne 'log')) {
-	      $r->print($resdir.' - '.$linkdir.' = '.$filename.'<br>');
-	   }
-       }
-    closedir(DIR);
+  $r->print('<h1>Retrieve previous versions of <tt>'.$fn.'</tt></h1>');
 
+  if ($ENV{'form.phase'} eq 'two') {
+  } else {
+      &phaseone($r,$fn,$uname,$udom);
+  }
 
   $r->print('</body></html>');
   return OK;  

Select	Version	Became this version on ...	Metadata
	'.$version.'	'. + localtime($rmtime).'	'. + ''. + 'Metadata Version '.$version.'
	Current	'.localtime($rmtime). + '	'. + 'Metadata current version