--- loncom/publisher/lonpublisher.pm	2004/05/21 20:17:56	1.169
+++ loncom/publisher/lonpublisher.pm	2004/07/03 03:32:30	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.169 2004/05/21 20:17:56 www Exp $
+# $Id: lonpublisher.pm,v 1.175 2004/07/03 03:32:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,8 @@ sub metaeval {
 		}
 	    }
 	    my $newentry=$parser->get_text('/'.$entry);
-	    if ($entry eq 'customdistributionfile') {
+	    if (($entry eq 'customdistributionfile') ||
+		($entry eq 'sourcerights')) {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
@@ -801,49 +802,21 @@ sub store_metadata {
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
+    my $dbh = &Apache::lonmysql::get_dbh();
     if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
 	($metadata{'copyright'} eq 'custom')) {
-# remove this entry
-	$status=&Apache::lonmysql::remove_from_table
-	    ('metadata','url',$metadata{'url'});
+        # remove this entry
+	$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,
+                                                       $metadata{'url'});
     } else {
-# store new data
-# adjust some values to metadatadatabase (e.g., "usage" is a reserved word)
-	$metadata{'creationdate'}=
-	    &Apache::lonmysql::sqltime($metadata{'creationdate'}); 
-	$metadata{'lastrevisiondate'}=
-	    &Apache::lonmysql::sqltime($metadata{'lastrevisiondate'});
-	$metadata{'sequsage'}=$metadata{'usage'};
-	$metadata{'sequsage_list'}=$metadata{'usage_list'};
-	my %newmetadata=();
-# see if we have old entries
-	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
-						"url LIKE BINARY '".
-						$metadata{'url'}."'");
-	if ($#oldmeta==0) {
-# yes, there is one old entry, transfer to newmetadata
-	    %newmetadata=&LONCAPA::lonmetadata::metadata_col_to_hash(@{$oldmeta[0]});
-# remove old entry
-	    $status=&Apache::lonmysql::remove_from_table
-		('metadata','url',$metadata{'url'});
-	} elsif ($#oldmeta>0) {
-# more than one entry fit - how did that happen?
-	    $error='<font color="red">Error occured retrieving old values in '.
-	      'metadata table in LON-CAPA database: '.$#oldmeta.
-	      ' matches</font>';
-	    &Apache::lonnet::logthis($error);
-	    return ($error,undef);
-	}
-# store new data on top of it
-	foreach (keys %metadata) {
-	    $newmetadata{$_}=$metadata{$_};
-	}
-	$status = &Apache::lonmysql::store_row('metadata',\%newmetadata);
+        $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,
+                                                         \%metadata);
     }
-    if (! defined($status)) {
+    if (defined($status) && $status ne '') {
         $error='<font color="red">Error occured storing new values in '.
             'metadata table in LON-CAPA database</font>';
         &Apache::lonnet::logthis($error);
+        &Apache::lonnet::logthis($status);
         return ($error,undef);
     }
     return (undef,$status);
@@ -956,7 +929,7 @@ sub publish {
 	       }
            }
         }
-        $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+        $outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
 
 # ------------------------------------------------------------- Write modified.
 
@@ -1233,11 +1206,20 @@ END
     $intr_scrout.=&textfield('Publisher/Owner','owner',
 			     $metadatafields{'owner'});
 
-# -------------------------------------------------- Correct copyright for rat.
+# ---------------------------------------------- Retrofix for unused copyright
+    if ($metadatafields{'copyright'} eq 'free') {
+	$metadatafields{'copyright'}='default';
+	$metadatafields{'sourceavail'}='open';
+    }
+# ------------------------------------------------ Dial in reasonable defaults
     my $defaultoption=$metadatafields{'copyright'};
     unless ($defaultoption) { $defaultoption='default'; }
+    my $defaultsourceoption=$metadatafields{'sourceavail'};
+    unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
     unless ($style eq 'prv') {
+# -------------------------------------------------- Correct copyright for rat.
 	if ($style eq 'rat') {
+# -------------------------------------- Retrofix for non-applicable copyright
 	    if ($metadatafields{'copyright'} eq 'public') { 
 		delete $metadatafields{'copyright'};
 		$defaultoption='default';
@@ -1246,33 +1228,38 @@ END
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
 				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-	    } else {
-		$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
-				    $defaultoption,
-				    \&Apache::loncommon::copyrightdescription,
-				    (&Apache::loncommon::copyrightids));
-	    }
-    
-	    my $copyright_help =
-		Apache::loncommon::help_open_topic('Publishing_Copyright');
-	    $intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-	    $intr_scrout.=&textfield('Custom Distribution File','customdistributionfile',
-				$metadatafields{'customdistributionfile'}).
-				    $copyright_help;
-	    my $uctitle=&mt('Obsolete');
-            $intr_scrout.=
-		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-		'</b></font> <input type="checkbox" name="obsolete" ';
-	    if ($metadatafields{'obsolete'}) {
-		$intr_scrout.=' checked="1" ';
-	    }
-	    $intr_scrout.='/ ></p>'.
-		&textfield('Suggested Replacement for Obsolete File',
-				    'obsoletereplacement',
-				    $metadatafields{'obsoletereplacement'});
 	} else {
-	    $intr_scrout.=&hiddenfield('copyright','private');
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
+				     (&Apache::loncommon::copyrightids));
+	}
+	my $copyright_help =
+	    Apache::loncommon::help_open_topic('Publishing_Copyright');
+	$intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+	$intr_scrout.=&textfield('Custom Distribution File','customdistributionfile',
+				 $metadatafields{'customdistributionfile'}).
+				     $copyright_help;
+	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
+				 $defaultsourceoption,
+				 \&Apache::loncommon::source_copyrightdescription,
+				 (&Apache::loncommon::source_copyrightids));
+		 $intr_scrout.=&textfield('Source Custom Distribution File','sourcerights',
+					  $metadatafields{'sourcerights'});
+	my $uctitle=&mt('Obsolete');
+	$intr_scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+	    '</b></font> <input type="checkbox" name="obsolete" ';
+	if ($metadatafields{'obsolete'}) {
+	    $intr_scrout.=' checked="1" ';
 	}
+	$intr_scrout.='/ ></p>'.
+	    &textfield('Suggested Replacement for Obsolete File',
+		       'obsoletereplacement',
+		       $metadatafields{'obsoletereplacement'});
+    } else {
+	$intr_scrout.=&hiddenfield('copyright','private');
+    }
     if (!$batch) {
 	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
 	    &mt('Finalize Publication').'" /></p></form>';
@@ -1362,6 +1349,7 @@ sub phasetwo {
     $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
+    $metadatafields{'sourceavail'}=$ENV{'form.sourceavail'};
     $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
     $metadatafields{'obsoletereplacement'}=
 	                        $ENV{'form.obsoletereplacement'};
@@ -1379,7 +1367,7 @@ sub phasetwo {
         }
     }
     $allkeywords=~s/[\"\']//g;
-    $allkeywords=~s/\s*[\;\,]\s*/\,/;
+    $allkeywords=~s/\s*[\;\,]\s*/\,/g;
     $allkeywords=~s/\s+/ /g;
     $allkeywords=~s/^[ \,]//;
     $allkeywords=~s/[ \,]$//;