--- loncom/publisher/lonpublisher.pm	2003/12/22 22:09:06	1.149
+++ loncom/publisher/lonpublisher.pm	2003/12/27 14:42:57	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.149 2003/12/22 22:09:06 www Exp $
+# $Id: lonpublisher.pm,v 1.154 2003/12/27 14:42:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -767,7 +767,7 @@ Returns: (error,status).  error is undef
 #########################################
 #########################################
 sub store_metadata {
-    my %metadata = %{shift()};
+    my %metadata = @_;
     my $error;
     # Determine if the table exists
     my $status = &Apache::lonmysql::check_table('metadata');
@@ -784,17 +784,19 @@ sub store_metadata {
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
-    # Remove old value from table
-    $status = &Apache::lonmysql::remove_from_table
-        ('metadata','url',$metadata{'url'});
-    if (! defined($status)) {
-        $error = '<font color="red">Error when removing old values from '.
-            'metadata table in LON-CAPA database.</font>';
-        &Apache::lonnet::logthis($error);
-        return ($error,undef);
+    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
+	($metadata{'copyright'} eq 'custom')) {
+# remove this entry
+	$status=&Apache::lonmysql::remove_from_table
+	    ('metadata','url',$metadata{'url'});
+    } else {
+# store new data
+	$metadata{'creationdate'}=
+	    &Apache::lonmysql::sqltime($metadata{'creationdate'}); 
+	$metadata{'lastrevisiondate'}=
+	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'}); 
+	$status = &Apache::lonmysql::store_row('metadata',\%metadata);
     }
-    # Store data in table.
-    $status = &Apache::lonmysql::store_row('metadata',\%metadata);
     if (! defined($status)) {
         $error='<font color="red">Error occured storing new values in '.
             'metadata table in LON-CAPA database</font>';
@@ -958,9 +960,6 @@ sub publish {
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
         $metadatafields{'owner'}=$cuname.'@'.$cudom;
-	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
-	                                 $ENV{'user.domain'};
-	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -1144,6 +1143,21 @@ END
 
 	$source=~/\.(\w+)$/;
 
+
+	$scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    uc(&mt('Lowest Grade Level:')).
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	    uc(&mt('Highest Grade Level:')).
+           "</b></font></p><br />".
+	   &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+           &textfield('Standards','standards',$metadatafields{'standards'});
+
+
+
+
 	$scrout.=&hiddenfield('mime',$1);
 
 	my $defaultlanguage=$metadatafields{'language'};
@@ -1161,7 +1175,7 @@ END
 	    $metadatafields{'creationdate'}=time;
 	}
 	$scrout.=&hiddenfield('creationdate',
-			      &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+			      &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
 
 	$scrout.=&hiddenfield('lastrevisiondate',time);
 
@@ -1319,12 +1333,18 @@ sub phasetwo {
     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+    $metadatafields{'standards'}=$ENV{'form.standards'};
+    $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
+    $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
     $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
     $metadatafields{'obsoletereplacement'}=
 	                        $ENV{'form.obsoletereplacement'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
+    $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+	                                 $ENV{'user.domain'};
+    $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
     
     my $allkeywords=$ENV{'form.addkey'};
     if (exists($ENV{'form.keywords'})) {
@@ -1380,21 +1400,16 @@ sub phasetwo {
 
     $metadatafields{'url'} = $distarget;
     $metadatafields{'version'} = 'current';
-    unless ($metadatafields{'copyright'} eq 'priv') {
-        my ($error,$success) = &store_metadata(\%metadatafields);
-        if ($success) {
-            $r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
-            print $logfile "\nSynchronized SQL metadata database";
-        } else {
-            $r->print($error);
-            print $logfile "\n".$error;
-        }
+
+    my ($error,$success) = &store_metadata(%metadatafields);
+    if ($success) {
+	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
+	print $logfile "\nSynchronized SQL metadata database";
     } else {
-        $r->print('<p>'.
-	     &mt('Private Publication - did not synchronize database').'</p>');
-        print $logfile "\nPrivate: Did not synchronize data into ".
-            "SQL metadata database";
+	$r->print($error);
+	print $logfile "\n".$error;
     }
+
 # ----------------------------------------------------------- Copy old versions
    
     if (-e $target) {