--- loncom/publisher/lonpublisher.pm	2001/10/03 11:04:57	1.46
+++ loncom/publisher/lonpublisher.pm	2001/12/04 15:32:57	1.53
@@ -11,7 +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
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -154,6 +154,7 @@ sub urlfixup {
 }
 
 sub publish {
+
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
@@ -224,14 +225,18 @@ sub publish {
       }
           my $outstring='';
           my $parser=HTML::TokeParser->new(\$content);
+          $parser->xml_mode(1);
           my $token;
           while ($token=$parser->get_token) {
               if ($token->[0] eq 'S') {
                 my $counter;
                 my $tag=$token->[1];
-                unless ($tag eq 'allow') {  
+                my $lctag=$tag;$lctag=~/[A-Z]/[a-z]/g;
+                unless ($lctag eq 'allow') {  
                   my %parms=%{$token->[2]};
-		  if ($counter=$addid{$tag}) {
+                  $counter=$addid{$tag};
+                  if (!$counter) { $counter=$addid{$lctag}; }
+                  if ($counter) {
 		      if ($counter eq 'id') {
 			  unless (defined($parms{'id'})) {
                               $maxid++;
@@ -260,7 +265,7 @@ sub publish {
                       }
                   } ('src','href','background');
 
-                  if ($tag eq 'applet') {
+                  if ($lctag eq 'applet') {
 		      my $codebase='';
                       if (defined($parms{'codebase'})) {
 		         my $oldcodebase=$parms{'codebase'};
@@ -469,7 +474,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;
@@ -479,29 +484,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'});
@@ -518,10 +506,14 @@ sub publish {
                 }
                 $colcount++;
             } sort keys %keywords;
-            $keywordout.='</tr></table>';
 
+        } else {
+	    $keywordout.='<td>File too long for keyword analysis</td>';
         }         
-	$scrout.=$keywordout;
+        
+	$keywordout.='</tr></table>';
+
+        $scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');