--- loncom/publisher/lonpublisher.pm	2001/10/08 19:00:50	1.47
+++ loncom/publisher/lonpublisher.pm	2001/10/16 08:53:19	1.48
@@ -11,8 +11,7 @@
 # 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,9/26 Gerd Kortemeyer
-# 10/3,10/8 Scott Harrison
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -57,7 +56,7 @@ sub metaeval {
                  $unikey.='_'.$token->[2]->{'part'}; 
 	      }
               if (defined($token->[2]->{'id'})) { 
-                  $unikey.='_'.$token->[2]->{'id'};
+                  $unikey.='.'.$token->[2]->{'id'};
               } 
               if (defined($token->[2]->{'name'})) { 
                  $unikey.='_'.$token->[2]->{'name'}; 
@@ -155,6 +154,7 @@ sub urlfixup {
 }
 
 sub publish {
+
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
@@ -470,7 +470,7 @@ sub publish {
 	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
         my $colcount=0;
         
-	{
+	if (length($content)<500000) {
 	    my $textonly=$content;
             $textonly=~s/\<script[^\<]+\<\/script\>//g;
             $textonly=~s/\<m\>[^\<]+\<\/m\>//g;
@@ -480,29 +480,12 @@ sub publish {
             $textonly=~s/[^a-z\s]//g;
 
             my %keywords=();
-            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);
-	    }
+            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'});
@@ -517,13 +500,14 @@ sub publish {
 		    $keywordout.="</tr><tr>\n";
                     $colcount=0;
                 }
-		else {
-		    $colcount++;
-		}
+                $colcount++;
             } sort keys %keywords;
-            $keywordout.='</tr></table>';
-
-        }         
+        } else {
+            $keywordout.='<td>File too large, scan omitted</td>';
+        }
+         
+        $keywordout.='</tr></table>';
+        
 	$scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');