--- loncom/publisher/lonpublisher.pm	2000/11/30 23:01:41	1.7
+++ loncom/publisher/lonpublisher.pm	2000/12/02 12:40:27	1.10
@@ -5,7 +5,7 @@
 #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
-# 11/28,11/29,11/30 Gerd Kortemeyer
+# 11/28,11/29,11/30,12/01,12/02 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -14,10 +14,13 @@ 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;
@@ -46,7 +49,10 @@ sub metaeval {
                   }
               } @{$token->[3]};
               if ($metadatafields{$unikey}) {
-                 $metadatafields{$unikey}.=','.$parser->get_text('/'.$entry);
+		  my $newentry=$parser->get_text('/'.$entry);
+                  unless ($metadatafields{$unikey}=~/$newentry/) {
+                     $metadatafields{$unikey}.=', '.$newentry;
+		  }
 	      } else {
                  $metadatafields{$unikey}=$parser->get_text('/'.$entry);
               }
@@ -70,6 +76,23 @@ sub metaread {
     return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
 }
 
+sub textfield {
+    my ($title,$name,$value)=@_;
+    return "\n<p><b>$title:</b><br>".
+           '<input type=text size=80 value="'.$value.'">';
+}
+
+sub selectbox {
+    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 {
 
     my ($source,$target,$style)=@_;
@@ -201,15 +224,20 @@ sub publish {
 
 # ---------------------------------------- Storage for metadata keys and fields
 
-        %metadatafields=();
-        %metadatakeys=();
+     %metadatafields=();
+     %metadatakeys=();
+     
+     my %oldparmstores=();
 
 # ------------------------------------------------ First, check out environment
-
+     unless (-e $source.'.meta') {
         $metadatafields{'author'}=$ENV{'environment.firstname'}.' '.
 	                          $ENV{'environment.middlename'}.' '.
 		                  $ENV{'environment.lastname'}.' '.
 		                  $ENV{'environment.generation'};
+        $metadatafields{'author'}=~s/\s+/ /g;
+        $metadatafields{'author'}=~s/\s+$//;
+        $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -234,10 +262,10 @@ sub publish {
             }
         } keys %metadatafields;
 
+    } else {
 # ---------------------- Read previous metafile, remember parameters and stores
 
         $scrout.=&metaread($logfile,$source.'.meta');
-        my %oldparmstores=();
 
         map {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
@@ -246,16 +274,11 @@ sub publish {
             }
         } keys %metadatafields;
         
-
+    }
 
 # -------------------------------------------------- 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
@@ -290,13 +313,19 @@ sub publish {
                      $chparms;
         }
 
-# DEBUG:
+# ------------------------------------------------------- Now have all metadata
 
-        $scrout.=$allmeta;
+        $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','title',$metadatafields{'title'}).
+          &textfield('Author(s)','author',$metadatafields{'author'}).
+	  &textfield('Subject','subject',$metadatafields{'subject'});
 
 # --------------------------------------------------- Scan content for keywords
 
-	my $keywordout='<table border=2><tr>';
+	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
         my $colcount=0;
         
 	{
@@ -317,8 +346,11 @@ sub publish {
 
 
             map {
-                $keywordout.='<td><input type=checkbox name="'.$_.'">'.$_.
-                             '</td>';
+                $keywordout.='<td><input type=checkbox name="'.$_.'"';
+                if ($metadatafields{'keywords'}=~/$_/) { 
+                   $keywordout.=' checked'; 
+                }
+                $keywordout.='>'.$_.'</td>';
                 if ($colcount>10) {
 		    $keywordout.="</tr><tr>\n";
                     $colcount=0;
@@ -329,11 +361,26 @@ sub publish {
 
         }         
         
-# DEGUG
- 
 	$scrout.=$keywordout;
+
+        $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','language',
+                            $metadatafields{'language'},%language);
+			   
+	$scrout.=&textfield('Publisher/Owner','owner',
+                            $metadatafields{'owner'});
+
+        $scrout.=&selectbox('Copyright/Distribution','copyright',
+                            $metadatafields{'copyright'},%cprtag);
+
     }
-    return $scrout;
+    return $scrout.
+      '<p><input type="submit" value="Finalize Publication"></form>';
 }
 
 # ================================================================ Main Handler
@@ -409,6 +456,26 @@ sub handler {
           $nokey{$word}=1;
       } <$fh>;
   }
+
+  %language=();
+
+  {
+     my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab');
+      map {
+          $_=~/(\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');