$title:
".
- '';
+ '';
+}
+
+sub hiddenfield {
+ my ($name,$value)=@_;
+ return "\n".'';
}
sub selectbox {
- my ($title,$value,%options)=@_;
+ my ($title,$name,$value,%options)=@_;
+ my $selout="\n
$title:
".'';
+}
+
+# -------------------------------------------------------- Publication Step One
+
+sub makeallowed {
+}
+
+sub urlfixup {
+ return shift;
}
sub publish {
@@ -88,35 +145,32 @@ sub publish {
my ($source,$target,$style)=@_;
my $logfile;
my $scrout='';
+ my $allmeta='';
+ my $content='';
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
return
'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
my $maxindex=10;
my $maxid=10;
- my $content='';
+
my $needsfixup=0;
{
@@ -153,42 +207,62 @@ sub publish {
print $logfile "Needs ID and/or index fixup\n".
"Max ID : $maxid (min 10)\n".
"Max Index: $maxindex (min 10)\n";
-
+ }
my $outstring='';
my $parser=HTML::TokeParser->new(\$content);
my $token;
while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {
- my $counter;
- if ($counter=$addid{$token->[1]}) {
+ my $counter;
+ my $tag=$token->[1];
+ unless ($tag eq 'allow') {
+ my %parms=%{$token->[2]};
+ if ($counter=$addid{$tag}) {
if ($counter eq 'id') {
- if (defined($token->[2]->{'id'})) {
- $outstring.=$token->[4];
- } else {
+ unless (defined($parms{'id'})) {
$maxid++;
- my $thisid=' id="'.$maxid.'"';
- my $fixup=$token->[4];
- $fixup=~s/(\<\w+)/$1$thisid/;
- $outstring.=$fixup;
- print $logfile 'ID: '.$fixup."\n";
+ $parms{'id'}=$maxid;
+ print $logfile 'ID: '.$tag.':'.$maxid."\n";
}
- } else {
- if (defined($token->[2]->{'index'})) {
- $outstring.=$token->[4];
- } else {
+ } elsif ($counter eq 'index') {
+ unless (defined($parms{'index'})) {
$maxindex++;
- my $thisindex=' index="'.$maxindex.'"';
- my $fixup=$token->[4];
- $fixup=~s/(\<\w+)/$1$thisindex/;
- $outstring.=$fixup;
- print $logfile 'Index: '.$fixup."\n";
+ $parms{'index'}=$maxindex;
+ print $logfile 'Index: '.$tag.':'.$maxindex."\n";
}
}
- } else {
- $outstring.=$token->[4];
- }
+ }
+
+ map {
+ if (defined($parms{$_})) {
+ my $oldurl=$parms{$_};
+ my $newurl=&urlfixup($oldurl);
+ if ($newurl ne $oldurl) {
+ $parms{$_}=$newurl;
+ print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
+ $newurl."\n";
+ }
+ &makeallowed($newurl);
+ }
+ } ('src','href','codebase');
+
+ my $newparmstring='';
+ my $endtag='';
+ map {
+ if ($_ eq '/') {
+ $endtag=' /';
+ } else {
+ my $quote=($parms{$_}=~/\"/?"'":'"');
+ $newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
+ }
+ } keys %parms;
+
+ $outstring.='<'.$tag.$newparmstring.$endtag.'>';
+ }
} elsif ($token->[0] eq 'E') {
- $outstring.=$token->[2];
+ unless ($token->[1] eq 'allow') {
+ $outstring.=$token->[2];
+ }
} else {
$outstring.=$token->[1];
}
@@ -203,6 +277,8 @@ sub publish {
print $org $outstring;
}
$content=$outstring;
+
+ if ($needsfixup) {
print $logfile "End of ID and/or index fixup\n".
"Max ID : $maxid (min 10)\n".
"Max Index: $maxindex (min 10)\n";
@@ -227,16 +303,17 @@ sub publish {
$ENV{'environment.generation'};
$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;
+ $metadatafields{'owner'}=$cuname.'@'.$cudom;
# ------------------------------------------------ Check out directory hierachy
my $thisdisfn=$source;
- $thisdisfn=~s/^\/home\/$ENV{'user.name'}\///;
+ $thisdisfn=~s/^\/home\/$cuname\///;
my @urlparts=split(/\//,$thisdisfn);
$#urlparts--;
- my $currentpath='/home/'.$ENV{'user.name'}.'/';
+ my $currentpath='/home/'.$cuname.'/';
map {
$currentpath.=$_.'/';
@@ -267,12 +344,8 @@ sub publish {
# -------------------------------------------------- Parse content for metadata
- my $allmeta='';
- if ($source=~/\.problem$/) {
- $allmeta=Apache::lonhomework::subhandler('meta',$content);
- } else {
- $allmeta=Apache::lonxml::xmlparse('meta',$content);
- }
+ $allmeta=Apache::lonxml::xmlparse('meta',$content);
+
&metaeval($allmeta);
# ---------------- Find and document discrepancies in the parameters and stores
@@ -296,7 +369,8 @@ sub publish {
my $chparms='';
map {
if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless (($metadatafields{$_}) || ($_=~/\.\w+$/)) {
+ unless (($metadatafields{$_.'.name'}) ||
+ ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
print $logfile 'Obsolete: '.$_."\n";
$chparms.=$_.' ';
}
@@ -306,16 +380,17 @@ sub publish {
$scrout.='
Obsolete parameters or stored values: '. $chparms; } - + } # ------------------------------------------------------- Now have all metadata $scrout.= '