--- loncom/publisher/lonpublisher.pm	2003/10/21 20:18:45	1.140
+++ loncom/publisher/lonpublisher.pm	2004/02/10 19:23:11	1.145.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.140 2003/10/21 20:18:45 albertel Exp $
+# $Id: lonpublisher.pm,v 1.145.2.2 2004/02/10 19:23:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,6 +143,7 @@ use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
+use Apache::loncfile;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -180,6 +181,10 @@ nothing
 
 #########################################
 #########################################
+#
+# Modifies global %metadatafields %metadatakeys 
+#
+
 sub metaeval {
     my ($metastring,$prefix)=@_;
    
@@ -214,11 +219,9 @@ sub metaeval {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
-	    if ($metadatafields{$unikey}) {
-		unless (($metadatafields{$unikey}=~/\Q$newentry\E/) ||
-			($newentry eq '')) {
-		    $metadatafields{$unikey}.=', '.$newentry;
-		}
+# actually store
+	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
+		$metadatafields{$unikey}.=','.$newentry;
 	    } else {
 		$metadatafields{$unikey}=$newentry;
 	    }
@@ -267,7 +270,8 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br /><b>No file:</b> <tt>'.$fn.'</tt>';
+        return '<br /><b>No file:</b> <tt>'.
+	    &Apache::loncfile::display($fn).'</tt>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -276,7 +280,8 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<br /><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    return '<br /><b>Processed file:</b> <tt>'.
+	&Apache::loncfile::display($fn).'</tt>';
 }
 
 #########################################
@@ -329,6 +334,9 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
     $title=&mt($title);
     my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
@@ -812,6 +820,26 @@ sub store_metadata {
     return (undef,$status);
 }
 
+
+# ============================================== Parse file itself for metadata
+#
+# parses a file with target meta, sets global %metadatafields %metadatakeys 
+
+sub parseformeta {
+    my ($source,$style)=@_;
+    my $allmeta='';
+    if (($style eq 'ssi') || ($style eq 'prv')) {
+	my $dir=$source;
+	$dir=~s-/[^/]*$--;
+	my $file=$source;
+	$file=(split('/',$file))[-1];
+        $source=&Apache::lonnet::hreflocation($dir,$file);
+	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+        &metaeval($allmeta);
+    }
+    return $allmeta;
+}
+
 #########################################
 #########################################
 
@@ -924,7 +952,8 @@ sub publish {
 # -------------------------------------------- Initial step done, now metadata.
 
 # --------------------------------------- Storage for metadata keys and fields.
-
+# these are globals
+#
      %metadatafields=();
      %metadatakeys=();
      
@@ -949,6 +978,10 @@ sub publish {
 	                                 $ENV{'user.domain'};
 	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
+# ----------------------------------------------------------- Parse file itself
+# read %metadatafields from file itself
+ 
+	$allmeta=&parseformeta($source,$style);
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
@@ -985,20 +1018,12 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
-
-# -------------------------------------------------- Parse content for metadata
-    if (($style eq 'ssi') || ($style eq 'prv')) {
-	my $dir=$source;
-	$dir=~s-/[^/]*$--;
-	my $file=$source;
-	$file=(split('/',$file))[-1];
-        $source=&Apache::lonnet::hreflocation($dir,$file);
-	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+# ------------------------------------------ See if anything new in file itself
+ 
+	$allmeta=&parseformeta($source,$style);
+   }
 
-        &metaeval($allmeta);
-    }
+       
 # ---------------- Find and document discrepancies in the parameters and stores
 
     my $chparms='';
@@ -1029,7 +1054,9 @@ sub publish {
     }
     if ($chparms) {
 	$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
-	    $chparms.'</p>';
+	    $chparms.'</p><h1><font color="red">'.&mt('Warning!').
+	    '</font></h1><p><font color="red" size="+1">'.
+	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />';
     }
 
 # ------------------------------------------------------- Now have all metadata
@@ -1704,12 +1731,14 @@ sub handler {
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    unless (&Apache::lonnet::homeserver($cuname,$cudom) 
-	    eq $r->dir_config('lonHostID')) {
+    my $home=&Apache::lonnet::homeserver($cuname,$cudom);
+    my $allowed=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
+    unless ($allowed) {
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish file '.$ENV{'form.filename'}.
-		       ' ('.$fn.') - not homeserver ('.
-		       &Apache::lonnet::homeserver($cuname,$cudom).')', 
+		       ' ('.$fn.') - not homeserver ('.$home.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
     }