--- loncom/publisher/lonpublisher.pm	2001/12/17 01:50:54	1.66
+++ loncom/publisher/lonpublisher.pm	2002/01/16 19:09:31	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.66 2001/12/17 01:50:54 harris41 Exp $
+# $Id: lonpublisher.pm,v 1.70 2002/01/16 19:09:31 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@
 # 12/05 Guy Albertelli
 # 12/06,12/07 Gerd Kortemeyer
 # 12/15,12/16 Scott Harrison
+# 12/25 Gerd Kortemeyer
 #
 ###
 
@@ -145,8 +146,9 @@ sub metaread {
 
 # ---------------------------- convert 'time' format into a datetime sql format
 sub sqltime {
+    my $timef=shift @_;
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime(@_[0]);
+	localtime($timef);
     $mon++; $year+=1900;
     return "$year-$mon-$mday $hour:$min:$sec";
 }
@@ -184,6 +186,11 @@ sub selectbox {
 sub urlfixup {
     my ($url,$target)=@_;
     unless ($url) { return ''; }
+    #javascript code needs no fixing
+    if ($url =~ /^javascript:/i) { return $url; }
+    if ($url =~ /^mailto:/i) { return $url; }
+    #internal document links need no fixing
+    if ($url =~ /^\#/) { return $url; } 
     my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
     foreach (values %Apache::lonnet::hostname) {
 	if ($_ eq $host) {
@@ -509,7 +516,7 @@ sub publish {
                      $chparms;
         }
 
-        my $chparms='';
+        $chparms='';
         foreach (sort keys %oldparmstores) {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
                 unless (($metadatafields{$_.'.name'}) ||
@@ -541,6 +548,7 @@ sub publish {
 
 	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
         my $colcount=0;
+        my %keywords=();
         
 	if (length($content)<500000) {
 	    my $textonly=$content;
@@ -551,22 +559,27 @@ sub publish {
             $textonly=~s/[\$\&][a-z]\w*//g;
             $textonly=~s/[^a-z\s]//g;
 
-            my %keywords=();
             foreach ($textonly=~m/(\w+)/g) {
 		unless ($nokey{$_}) {
                    $keywords{$_}=1;
                 } 
             }
+        }
 
+            
             foreach (split(/\W+/,$metadatafields{'keywords'})) {
 		$keywords{$_}=1;
             }
 
             foreach (sort keys %keywords) {
                 $keywordout.='<td><input type=checkbox name="key.'.$_.'"';
-                if ($metadatafields{'keywords'}=~/$_/) { 
-                   $keywordout.=' checked'; 
-                }
+                if ($metadatafields{'keywords'}) {
+                   if ($metadatafields{'keywords'}=~/$_/) { 
+                      $keywordout.=' checked'; 
+                   }
+	        } elsif (&Apache::loncommon::keyword($_)) {
+		    $keywordout.=' checked';
+                } 
                 $keywordout.='>'.$_.'</td>';
                 if ($colcount>10) {
 		    $keywordout.="</tr><tr>\n";
@@ -574,10 +587,6 @@ sub publish {
                 }
                 $colcount++;
             }
-
-        } else {
-	    $keywordout.='<td>File too long for keyword analysis</td>';
-        }         
         
 	$keywordout.='</tr></table>';
 
@@ -597,7 +606,7 @@ sub publish {
 
         $scrout.=&selectbox('Language','language',
                             $metadatafields{'language'},
-			    \&{Apache::loncommon::languagedescription},
+			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
 			     );
 
@@ -618,13 +627,13 @@ sub publish {
 	}
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
     }
     else {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 			     (&Apache::loncommon::copyrightids));
     }
     return $scrout.