--- loncom/publisher/lonpublisher.pm	2001/08/24 13:33:37	1.44
+++ loncom/publisher/lonpublisher.pm	2001/10/08 19:00:50	1.47
@@ -11,7 +11,8 @@
 # 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
 # 05/28/2001 Scott Harrison
-# 06/23,08/07,08/11,8/13,8/17,8/18,8/24 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer
+# 10/3,10/8 Scott Harrison
 
 package Apache::lonpublisher;
 
@@ -154,7 +155,6 @@ sub urlfixup {
 }
 
 sub publish {
-
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
@@ -480,12 +480,29 @@ sub publish {
             $textonly=~s/[^a-z\s]//g;
 
             my %keywords=();
-            map {
-		unless ($nokey{$_}) {
-                   $keywords{$_}=1;
-                } 
-            } ($textonly=~m/(\w+)/g);
+            my $j=0;
+            my $word;
+            for (my $i=0; $i<length($textonly); $i++) {
+		my $ch.=substr($textonly,$i,1);
+		if ($ch=~/\s/) {
+		    if (length($word)) {
+			unless ($nokey{$word}) {
+			    $keywords{$word}=1;
+			}
+		    }
+		    $word='';
+		}
+		else {
+		    $word.=$ch;
+		}
+#		map {
+#		    unless ($nokey{$_}) {
+#			$keywords{$_}=1;
+#		    } 
+#		} ($textonly=~m/(\w+)/g);
+	    }
 
+	    my $sizkeys=scalar(keys %keywords); # use this value at some point
             map {
 		$keywords{$_}=1;
             } split(/\W+/,$metadatafields{'keywords'});
@@ -500,12 +517,13 @@ sub publish {
 		    $keywordout.="</tr><tr>\n";
                     $colcount=0;
                 }
-                $colcount++;
+		else {
+		    $colcount++;
+		}
             } sort keys %keywords;
             $keywordout.='</tr></table>';
 
         }         
-        
 	$scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');
@@ -533,6 +551,13 @@ sub publish {
 			   
 	$scrout.=&textfield('Publisher/Owner','owner',
                             $metadatafields{'owner'});
+# --------------------------------------------------- Correct copyright for rat        
+    if ($style eq 'rat') {
+       if ($metadatafields{'copyright'} eq 'public') { 
+          delete $metadatafields{'copyright'};
+       }
+       delete $cprtag{'public'};
+   }
 
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);