--- loncom/publisher/lonpublisher.pm	2004/05/21 19:27:02	1.167
+++ loncom/publisher/lonpublisher.pm	2004/06/11 02:27:27	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.167 2004/05/21 19:27:02 albertel Exp $
+# $Id: lonpublisher.pm,v 1.171 2004/06/11 02:27:27 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1102,8 +1102,13 @@ sub publish {
     }
 
             
-    foreach (split(/\W+/,$metadatafields{'keywords'})) {
-	$keywords{$_}=1;
+    foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
+	$addkey=~s/\s+/ /g;
+	$addkey=~s/^\s//;
+	$addkey=~s/\s$//;
+	if ($addkey=~/\w/) {
+	    $keywords{$addkey}=1;
+	}
     }
 # --------------------------------------------------- Now we also have keywords
 # =============================================================================
@@ -1254,6 +1259,12 @@ END
 	    $intr_scrout.=&textfield('Custom Distribution File','customdistributionfile',
 				$metadatafields{'customdistributionfile'}).
 				    $copyright_help;
+	    $intr_scrout.=&selectbox('Source Distribution','sourceavail',
+				    $defaultoption,
+				    \&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:".
@@ -1357,6 +1368,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'};
@@ -1373,8 +1385,11 @@ sub phasetwo {
             $allkeywords .= ','.$ENV{'form.keywords'};
         }
     }
-    $allkeywords=~s/\W+/\,/;
-    $allkeywords=~s/^\,//;
+    $allkeywords=~s/[\"\']//g;
+    $allkeywords=~s/\s*[\;\,]\s*/\,/g;
+    $allkeywords=~s/\s+/ /g;
+    $allkeywords=~s/^[ \,]//;
+    $allkeywords=~s/[ \,]$//;
     $metadatafields{'keywords'}=$allkeywords;
     
 # check if custom distribution file is specified