--- loncom/publisher/lonpublisher.pm 2000/12/02 12:40:27 1.10
+++ loncom/publisher/lonpublisher.pm 2000/12/04 12:27:58 1.12
@@ -5,7 +5,7 @@
#
# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#
-# 11/28,11/29,11/30,12/01,12/02 Gerd Kortemeyer
+# 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer
package Apache::lonpublisher;
@@ -15,6 +15,7 @@ use Apache::Constants qw(:common :http :
use HTML::TokeParser;
use Apache::lonxml;
use Apache::structuretags;
+use Apache::inputtags;
use Apache::response;
my %addid;
@@ -25,6 +26,10 @@ my %cprtag;
my %metadatafields;
my %metadatakeys;
+my $docroot;
+
+# ----------------------------------------------- Evaluate string with metadata
+
sub metaeval {
my $metastring=shift;
@@ -60,6 +65,8 @@ sub metaeval {
}
}
+# -------------------------------------------------------- Read a metadata file
+
sub metaread {
my ($logfile,$fn)=@_;
unless (-e $fn) {
@@ -76,10 +83,17 @@ sub metaread {
return '
Processed file: '.$fn.'';
}
+# --------------------------------------------------------- Various form fields
+
sub textfield {
my ($title,$name,$value)=@_;
return "\n
$title:
".
- '';
+ '';
+}
+
+sub hiddenfield {
+ my ($name,$value)=@_;
+ return "\n".'';
}
sub selectbox {
@@ -93,6 +107,8 @@ sub selectbox {
return $selout.'';
}
+# -------------------------------------------------------- Publication Step One
+
sub publish {
my ($source,$target,$style)=@_;
@@ -104,7 +120,7 @@ sub publish {
'No write permission to user directory, FAIL';
}
print $logfile
-"\n\n================== Publish ".localtime()." =================\n";
+"\n\n================= Publish ".localtime()." Phase One ================\n";
if (($style eq 'ssi') || ($style eq 'rat')) {
# ------------------------------------------------------- This needs processing
@@ -302,7 +318,7 @@ sub publish {
my $chparms='';
map {
if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless (($metadatafields{$_}) || ($_=~/\.\w+$/)) {
+ unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) {
print $logfile 'Obsolete: '.$_."\n";
$chparms.=$_.' ';
}
@@ -317,8 +333,9 @@ sub publish {
$scrout.=
'