--- loncom/publisher/lonpublisher.pm	2001/08/17 16:27:08	1.39
+++ loncom/publisher/lonpublisher.pm	2001/12/04 18:10:37	1.55
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
+#
+# $Id: lonpublisher.pm,v 1.55 2001/12/04 18:10:37 sakharuk 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,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 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;
 
@@ -71,7 +96,8 @@ sub metaeval {
               } @{$token->[3]};
               if ($metadatafields{$unikey}) {
 		  my $newentry=$parser->get_text('/'.$entry);
-                  unless ($metadatafields{$unikey}=~/$newentry/) {
+                  unless (($metadatafields{$unikey}=~/$newentry/) ||
+                          ($newentry eq '')) {
                      $metadatafields{$unikey}.=', '.$newentry;
 		  }
 	      } else {
@@ -143,6 +169,7 @@ sub urlfixup {
             $url=~s/^$host//;
         }
     } values %Apache::lonnet::hostname;
+    if ($url=~/^http\:\/\//) { return $url; }
     $url=~s/\~$cuname/res\/$cudom\/$cuname/;
     if ($target) {
 	$target=~s/\/[^\/]+$//;
@@ -223,14 +250,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=~s/[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++;
@@ -257,9 +288,9 @@ sub publish {
 			  }
                           $allow{$newurl}=1;
                       }
-                  } ('src','href');
+                  } ('src','href','background');
 
-                  if ($tag eq 'applet') {
+                  if ($lctag eq 'applet') {
 		      my $codebase='';
                       if (defined($parms{'codebase'})) {
 		         my $oldcodebase=$parms{'codebase'};
@@ -307,7 +338,7 @@ sub publish {
 		 }
               } elsif ($token->[0] eq 'E') {
                   unless ($token->[1] eq 'allow') {
-                     $outstring.=$token->[2];
+                     $outstring.='</'.$token->[1].'>';
 		  }
               } else {
                   $outstring.=$token->[1];
@@ -315,9 +346,18 @@ sub publish {
           }
 # ------------------------------------------------------------ Construct Allows
      unless ($style eq 'rat') {
+	$scrout.='<h3>Dependencies</h3>';
 	my $allowstr="\n";
         map {
            $allowstr.='<allow src="'.$_.'" />'."\n";
+           $scrout.='<br>';
+           unless ($_=~/\*/) {
+	       $scrout.='<a href="'.$_.'">';
+           }
+           $scrout.='<tt>'.$_.'</tt>';
+           unless ($_=~/\*/) {
+	       $scrout.='</a>';
+           }
         } keys %allow;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
     }
@@ -350,6 +390,8 @@ sub publish {
      %metadatakeys=();
      
      my %oldparmstores=();
+     
+     $scrout.='<h3>Metadata Information</h3>';
 
 # ------------------------------------------------ First, check out environment
      unless (-e $source.'.meta') {
@@ -400,7 +442,11 @@ sub publish {
 
 # -------------------------------------------------- Parse content for metadata
     if ($style eq 'ssi') {
+        my $oldenv=$ENV{'request.uri'};
+
+        $ENV{'request.uri'}=$target;
         $allmeta=Apache::lonxml::xmlparse('meta',$content);
+        $ENV{'request.uri'}=$oldenv;
 
         &metaeval($allmeta);
     }
@@ -453,7 +499,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;
@@ -485,11 +531,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','');
 
@@ -516,6 +565,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);
@@ -831,6 +887,20 @@ sub handler {
      return OK;
   }
 
+# Get query string for limited number of parameters
+
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if ($name eq 'filename') {
+           unless ($ENV{'form.'.$name}) {
+              $ENV{'form.'.$name}=$value;
+	   }
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+
 # -------------------------------------------------------------- Check filename
 
   my $fn=$ENV{'form.filename'};
@@ -862,7 +932,8 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+  $fn=~s/^http\:\/\/[^\/]+//;
+  $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
 
   my $targetdir='';
   $docroot=$r->dir_config('lonDocRoot');