--- loncom/publisher/lonpublisher.pm 2000/11/30 23:01:41 1.7
+++ loncom/publisher/lonpublisher.pm 2001/01/04 16:21:46 1.16
@@ -5,23 +5,32 @@
#
# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#
-# 11/28,11/29,11/30 Gerd Kortemeyer
+# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
package Apache::lonpublisher;
use strict;
use Apache::File;
+use File::Copy;
use Apache::Constants qw(:common :http :methods);
use HTML::TokeParser;
use Apache::lonxml;
-use Apache::lonhomework;
+use Apache::structuretags;
+use Apache::inputtags;
+use Apache::response;
my %addid;
my %nokey;
+my %language;
+my %cprtag;
my %metadatafields;
my %metadatakeys;
+my $docroot;
+
+# ----------------------------------------------- Evaluate string with metadata
+
sub metaeval {
my $metastring=shift;
@@ -46,7 +55,10 @@ sub metaeval {
}
} @{$token->[3]};
if ($metadatafields{$unikey}) {
- $metadatafields{$unikey}.=','.$parser->get_text('/'.$entry);
+ my $newentry=$parser->get_text('/'.$entry);
+ unless ($metadatafields{$unikey}=~/$newentry/) {
+ $metadatafields{$unikey}.=', '.$newentry;
+ }
} else {
$metadatafields{$unikey}=$parser->get_text('/'.$entry);
}
@@ -54,6 +66,8 @@ sub metaeval {
}
}
+# -------------------------------------------------------- Read a metadata file
+
sub metaread {
my ($logfile,$fn)=@_;
unless (-e $fn) {
@@ -70,6 +84,32 @@ 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 {
+ my ($title,$name,$value,%options)=@_;
+ my $selout="\n
$title:
".'';
+}
+
+# -------------------------------------------------------- Publication Step One
+
sub publish {
my ($source,$target,$style)=@_;
@@ -81,23 +121,18 @@ 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
# ----------------------------------------------------------------- Backup Copy
my $copyfile=$source.'.save';
- {
- my $org=Apache::File->new($source);
- my $cop=Apache::File->new('>'.$copyfile);
- while (my $line=<$org>) { print $cop $line; }
- }
- if (-e $copyfile) {
+ if (copy($source,$copyfile)) {
print $logfile "Copied original file to ".$copyfile."\n";
} else {
- print $logfile "Unable to write backup ".$copyfile."\n";
- return "Failed to write backup copy, FAIL";
+ print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
+ return "Failed to write backup copy, $!,FAIL";
}
# ------------------------------------------------------------- IDs and indices
@@ -201,15 +236,20 @@ sub publish {
# ---------------------------------------- Storage for metadata keys and fields
- %metadatafields=();
- %metadatakeys=();
+ %metadatafields=();
+ %metadatakeys=();
+
+ my %oldparmstores=();
# ------------------------------------------------ First, check out environment
-
+ unless (-e $source.'.meta') {
$metadatafields{'author'}=$ENV{'environment.firstname'}.' '.
$ENV{'environment.middlename'}.' '.
$ENV{'environment.lastname'}.' '.
$ENV{'environment.generation'};
+ $metadatafields{'author'}=~s/\s+/ /g;
+ $metadatafields{'author'}=~s/\s+$//;
+ $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
# ------------------------------------------------ Check out directory hierachy
@@ -234,10 +274,10 @@ sub publish {
}
} keys %metadatafields;
+ } else {
# ---------------------- Read previous metafile, remember parameters and stores
$scrout.=&metaread($logfile,$source.'.meta');
- my %oldparmstores=();
map {
if (($_=~/^parameter/) || ($_=~/^stores/)) {
@@ -246,16 +286,11 @@ sub publish {
}
} keys %metadatafields;
-
+ }
# -------------------------------------------------- Parse content for metadata
- my $allmeta='';
- if ($source=~/\.problem$/) {
- $allmeta=Apache::lonhomework::subhandler('meta',$content);
- } else {
- $allmeta=Apache::lonxml::xmlparse('meta',$content);
- }
+ my $allmeta=Apache::lonxml::xmlparse('meta',$content);
&metaeval($allmeta);
# ---------------- Find and document discrepancies in the parameters and stores
@@ -279,7 +314,7 @@ sub publish {
my $chparms='';
map {
if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless (($metadatafields{$_}) || ($_=~/\.\w+$/)) {
+ unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) {
print $logfile 'Obsolete: '.$_."\n";
$chparms.=$_.' ';
}
@@ -290,13 +325,20 @@ sub publish {
$chparms;
}
-# DEBUG:
+# ------------------------------------------------------- Now have all metadata
- $scrout.=$allmeta;
+ $scrout.=
+ '