[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm

[www]

www		Tue Nov  4 11:15:56 2003 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  Bug #2350: Oops, had overcompartmentalized this.
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.142 loncom/publisher/lonpublisher.pm:1.143
--- loncom/publisher/lonpublisher.pm:1.142	Sat Nov  1 12:38:58 2003
+++ loncom/publisher/lonpublisher.pm	Tue Nov  4 11:15:56 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.142 2003/11/01 17:38:58 www Exp $
+# $Id: lonpublisher.pm,v 1.143 2003/11/04 16:15:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -816,15 +816,17 @@
 
 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);
-	my $allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
         &metaeval($allmeta);
     }
+    return $allmeta;
 }
 
 #########################################
@@ -1007,7 +1009,7 @@
     }
 # ------------------------------------------ See if anything new in file itself
  
-    &parseformeta($source,$style);
+    $allmeta=&parseformeta($source,$style);
 
 # ---------------- Find and document discrepancies in the parameters and stores