--- loncom/publisher/lonpublisher.pm 2000/12/01 12:08:01 1.8 +++ loncom/publisher/lonpublisher.pm 2000/12/02 20:55:16 1.11 @@ -5,7 +5,7 @@ # # 05/29/00,05/30,10/11 Gerd Kortemeyer) # -# 11/28,11/29,11/30,12/01 Gerd Kortemeyer +# 11/28,11/29,11/30,12/01,12/02 Gerd Kortemeyer package Apache::lonpublisher; @@ -14,10 +14,13 @@ use Apache::File; use Apache::Constants qw(:common :http :methods); use HTML::TokeParser; use Apache::lonxml; -use Apache::lonhomework; +use Apache::structuretags; +use Apache::response; my %addid; my %nokey; +my %language; +my %cprtag; my %metadatafields; my %metadatakeys; @@ -74,9 +77,25 @@ sub metaread { } sub textfield { - my ($title,$value)=@_; + 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:
".'';
}
sub publish {
@@ -90,7 +109,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
@@ -223,6 +242,7 @@ sub publish {
$ENV{'environment.generation'};
$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;
+ $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
# ------------------------------------------------ Check out directory hierachy
@@ -263,12 +283,7 @@ sub publish {
# -------------------------------------------------- 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
@@ -307,11 +322,12 @@ sub publish {
$scrout.=
'
'); - + # ------------ We are publishing from $thisfn to $thistarget with $thisembstyle - $r->print('