--- loncom/publisher/lonpublisher.pm	2004/05/21 19:27:02	1.167
+++ loncom/publisher/lonpublisher.pm	2004/05/21 20:01:15	1.168
@@ -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.168 2004/05/21 20:01:15 www 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
 # =============================================================================
@@ -1373,8 +1378,11 @@ sub phasetwo {
             $allkeywords .= ','.$ENV{'form.keywords'};
         }
     }
-    $allkeywords=~s/\W+/\,/;
-    $allkeywords=~s/^\,//;
+    $allkeywords=~s/[\;\,]/\,/;
+    $allkeywords=~s/[\"\']//g;
+    $allkeywords=~s/\s+/ /g;
+    $allkeywords=~s/^[ \,]//;
+    $allkeywords=~s/[ \,]$//;
     $metadatafields{'keywords'}=$allkeywords;
     
 # check if custom distribution file is specified