--- loncom/publisher/lonpublisher.pm	2001/10/03 11:04:57	1.46
+++ loncom/publisher/lonpublisher.pm	2001/12/05 22:00:14	1.61
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
+#
+# $Id: lonpublisher.pm,v 1.61 2001/12/05 22:00:14 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 
 # (TeX Content Handler
 #
@@ -11,7 +36,9 @@
 # 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
+# 12/04,12/05 Guy Albertelli
+# 12/05 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -154,6 +181,7 @@ sub urlfixup {
 }
 
 sub publish {
+
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
@@ -224,14 +252,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=lc($tag);
+                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 +292,7 @@ sub publish {
                       }
                   } ('src','href','background');
 
-                  if ($tag eq 'applet') {
+                  if ($lctag eq 'applet') {
 		      my $codebase='';
                       if (defined($parms{'codebase'})) {
 		         my $oldcodebase=$parms{'codebase'};
@@ -301,15 +333,17 @@ sub publish {
                       $newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
 		    }
                   } keys %parms;
-  
+		  if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		  $outstring.='<'.$tag.$newparmstring.$endtag.'>';
 	         } else {
 		   $allow{$token->[2]->{'src'}}=1;
 		 }
               } elsif ($token->[0] eq 'E') {
+		if ($token->[2]) {
                   unless ($token->[1] eq 'allow') {
                      $outstring.='</'.$token->[1].'>';
 		  }
+		}
               } else {
                   $outstring.=$token->[1];
               }
@@ -319,14 +353,29 @@ sub publish {
 	$scrout.='<h3>Dependencies</h3>';
 	my $allowstr="\n";
         map {
-           $allowstr.='<allow src="'.$_.'" />'."\n";
+	   my $thisdep=$_;
+           $allowstr.='<allow src="'.$thisdep.'" />'."\n";
            $scrout.='<br>';
-           unless ($_=~/\*/) {
-	       $scrout.='<a href="'.$_.'">';
+           unless ($thisdep=~/\*/) {
+	       $scrout.='<a href="'.$thisdep.'">';
            }
-           $scrout.='<tt>'.$_.'</tt>';
-           unless ($_=~/\*/) {
+           $scrout.='<tt>'.$thisdep.'</tt>';
+           unless ($thisdep=~/\*/) {
 	       $scrout.='</a>';
+               if (
+       &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
+                                            $thisdep.'.meta') eq '-1') {
+		   $scrout.=
+                           ' - <font color=red>Currently not available</font>';
+               } else {
+                   my %temphash=(&Apache::lonnet::declutter($target).'___'.
+                             &Apache::lonnet::declutter($thisdep).'___usage'
+                                 => time);
+                   $thisdep=~/^\/res\/(\w+)\/(\w+)\//;
+                   if ((defined($1)) && (defined($2))) {
+                      &Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
+		   }
+	       }
            }
         } keys %allow;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
@@ -457,9 +506,11 @@ sub publish {
 
         $scrout.=
      '<form action="/adm/publish" method="post">'.
+      '<p><input type="submit" value="Finalize Publication" /></p>'.
           &hiddenfield('phase','two').
           &hiddenfield('filename',$ENV{'form.filename'}).
 	  &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+          &hiddenfield('dependencies',join(',',keys %allow)).
           &textfield('Title','title',$metadatafields{'title'}).
           &textfield('Author(s)','author',$metadatafields{'author'}).
 	  &textfield('Subject','subject',$metadatafields{'subject'});
@@ -469,7 +520,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 +530,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 +552,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','');
 
@@ -560,7 +598,7 @@ sub publish {
                             $metadatafields{'copyright'},%cprtag);
 
     return $scrout.
-      '<p><input type="submit" value="Finalize Publication"></form>';
+      '<p><input type="submit" value="Finalize Publication" /></p></form>';
 }
 
 # -------------------------------------------------------- Publication Step Two
@@ -594,6 +632,7 @@ sub phasetwo {
      $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
      $metadatafields{'owner'}=$ENV{'form.owner'};
      $metadatafields{'copyright'}=$ENV{'form.copyright'};
+     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
 
      my $allkeywords=$ENV{'form.addkey'};
      map {