--- loncom/publisher/lonpublisher.pm	2001/10/16 08:53:19	1.48
+++ loncom/publisher/lonpublisher.pm	2001/12/04 15:32:57	1.53
@@ -56,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'}; 
@@ -225,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++;
@@ -261,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'};
@@ -502,13 +506,14 @@ sub publish {
                 }
                 $colcount++;
             } sort keys %keywords;
+
         } else {
-            $keywordout.='<td>File too large, scan omitted</td>';
-        }
-         
-        $keywordout.='</tr></table>';
+	    $keywordout.='<td>File too long for keyword analysis</td>';
+        }         
         
-	$scrout.=$keywordout;
+	$keywordout.='</tr></table>';
+
+        $scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');