--- loncom/publisher/lonpublisher.pm	2000/12/01 16:17:46	1.9
+++ loncom/publisher/lonpublisher.pm	2000/12/02 20:55:16	1.11
@@ -5,7 +5,7 @@
 #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
-# 11/28,11/29,11/30,12/01 Gerd Kortemeyer
+# 11/28,11/29,11/30,12/01,12/02 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -14,11 +14,14 @@ use Apache::File;
 use Apache::Constants qw(:common :http :methods);
 use HTML::TokeParser;
 use Apache::lonxml;
-use Apache::lonhomework;
+use Apache::structuretags;
+use Apache::response;
 
 my %addid;
 my %nokey;
 my %language;
+my %cprtag;
+
 my %metadatafields;
 my %metadatakeys;
 
@@ -74,13 +77,25 @@ sub metaread {
 }
 
 sub textfield {
-    my ($title,$value)=@_;
+    my ($title,$name,$value)=@_;
     return "\n<p><b>$title:</b><br>".
-           '<input type=text size=80 value="'.$value.'">';
+           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+}
+
+sub hiddenfield {
+    my ($name,$value)=@_;
+    return "\n".'<input type=hidden name="'.$name.'" value="'.$value.'">';
 }
 
 sub selectbox {
-    my ($title,$value,%options)=@_;
+    my ($title,$name,$value,%options)=@_;
+    my $selout="\n<p><b>$title:</b><br>".'<select name="'.$name.'">';
+    map {
+        $selout.='<option value="'.$_.'"';
+        if ($_ eq $value) { $selout.=' selected'; }
+        $selout.='>'.$options{$_}.'</option>';
+    } sort keys %options;
+    return $selout.'</select>';
 }
 
 sub publish {
@@ -94,7 +109,7 @@ sub publish {
          '<font color=red>No write permission to user directory, FAIL</font>';
     }
     print $logfile 
-"\n\n================== Publish ".localtime()." =================\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n";
 
     if (($style eq 'ssi') || ($style eq 'rat')) {
 # ------------------------------------------------------- This needs processing
@@ -227,6 +242,7 @@ sub publish {
 		                  $ENV{'environment.generation'};
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
+        $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -267,12 +283,7 @@ sub publish {
 
 # -------------------------------------------------- Parse content for metadata
 
-	my $allmeta='';
-        if ($source=~/\.problem$/) {
-	    $allmeta=Apache::lonhomework::subhandler('meta',$content);
-        } else {
-            $allmeta=Apache::lonxml::xmlparse('meta',$content);
-	}
+        my $allmeta=Apache::lonxml::xmlparse('meta',$content);
         &metaeval($allmeta);
 
 # ---------------- Find and document discrepancies in the parameters and stores
@@ -311,11 +322,12 @@ sub publish {
 
         $scrout.=
      '<form action="/adm/publish" method="post">'.
-     '<input type="hidden" name="phase" value="two">'.
-     '<input type="hidden" name="filename" value="'.$ENV{'form.filename'}.'">'.
-          &textfield('Title',$metadatafields{'title'}).
-          &textfield('Author(s)',$metadatafields{'author'}).
-	  &textfield('Subject',$metadatafields{'subject'});
+          &hiddenfield('phase','two').
+          &hiddenfield('filename',$ENV{'form.filename'}).
+	  &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+          &textfield('Title','title',$metadatafields{'title'}).
+          &textfield('Author(s)','author',$metadatafields{'author'}).
+	  &textfield('Subject','subject',$metadatafields{'subject'});
 
 # --------------------------------------------------- Scan content for keywords
 
@@ -357,21 +369,77 @@ sub publish {
         
 	$scrout.=$keywordout;
 
-        $scrout.=&textfield('Notes',$metadatafields{'notes'});
+        $scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
         $scrout.=
              '<p><b>Abstract:</b><br><textarea cols=80 rows=5 name=abstract>'.
               $metadatafields{'abstract'}.'</textarea>';
 
-        $scrout.=&selectbox('Language',$metadatafields{'language'},%language);
+	$source=~/\.(\w+)$/;
+
+	$scrout.=&hiddenfield('mime',$1);
+
+        $scrout.=&selectbox('Language','language',
+                            $metadatafields{'language'},%language);
+
+        unless ($metadatafields{'creationdate'}) {
+	    $metadatafields{'creationdate'}=time;
+        }
+        $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'});
+
+        $scrout.=&hiddenfield('lastrevisiondate',time);
+
 			   
-	$scrout.=&textfield('Publisher/Owner',$metadatafields{'owner'});
+	$scrout.=&textfield('Publisher/Owner','owner',
+                            $metadatafields{'owner'});
+
+        $scrout.=&selectbox('Copyright/Distribution','copyright',
+                            $metadatafields{'copyright'},%cprtag);
 
     }
     return $scrout.
       '<p><input type="submit" value="Finalize Publication"></form>';
 }
 
+sub phasetwo {
+
+    my ($source,$target,$style)=@_;
+    my $logfile;
+    my $scrout='';
+
+    unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
+	return 
+         '<font color=red>No write permission to user directory, FAIL</font>';
+    }
+    print $logfile 
+"\n================= Publish ".localtime()." Phase Two  ================\n";
+
+     %metadatafields=();
+     %metadatakeys=();
+
+     &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+
+     $metadatafields{'title'}=$ENV{'form.title'};
+     $metadatafields{'author'}=$ENV{'form.author'};
+     $metadatafields{'subject'}=$ENV{'form.subject'};
+     $metadatafields{'keywords'}=$ENV{'form.keywords'};
+     $metadatafields{'notes'}=$ENV{'form.notes'};
+     $metadatafields{'abstract'}=$ENV{'form.abstract'};
+     $metadatafields{'mime'}=$ENV{'form.mime'};
+     $metadatafields{'language'}=$ENV{'form.language'};
+     $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
+     $metadatafields{'owner'}=$ENV{'form.owner'};
+     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+     
+     map {
+         print $logfile "\n".$_.': '.$metadatafields{$_}.
+	           "\n".$_.'.keys: '.$metadatakeys{$_};
+     } sort keys %metadatafields;
+
+
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -424,6 +492,8 @@ sub handler {
      return HTTP_NOT_FOUND;
   } 
 
+unless ($ENV{'form.phase'} eq 'two') {
+
 # --------------------------------- File is there and owned, init lookup tables
 
   %addid=();
@@ -451,10 +521,23 @@ sub handler {
   {
      my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab');
       map {
-          $_=~/(\w+)\s+([\w\s]+)/;
+          $_=~/(\w+)\s+([\w\s\-]+)/;
           $language{$1}=$2;
       } <$fh>;
   }
+
+  %cprtag=();
+
+  {
+     my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab');
+      map {
+          $_=~/(\w+)\s+([\w\s\-]+)/;
+          $cprtag{$1}=$2;
+      } <$fh>;
+  }
+
+}
+
 # ----------------------------------------------------------- Start page output
 
   $r->content_type('text/html');
@@ -484,13 +567,16 @@ sub handler {
       $r->print('<h2>Publishing '.
         &Apache::lonnet::filedescription($thistype).' <tt>'.
         $thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
-
+  
 # ------------ We are publishing from $thisfn to $thistarget with $thisembstyle
 
-      $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
-      
-  }  
+       unless ($ENV{'form.phase'} eq 'two') {
+          $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
+       } else {
+          $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle));      
+       }  
 
+  }
   $r->print('</body></html>');
 
   return OK;