$title:
".
@@ -184,8 +278,19 @@ sub selectbox {
return $selout.'';
}
-# -------------------------------------------------------- Publication Step One
+#########################################
+#########################################
+
+=pod
+
+=item urlfixup
+
+Fix up a url? First step of publication
+=cut
+
+#########################################
+#########################################
sub urlfixup {
my ($url,$target)=@_;
unless ($url) { return ''; }
@@ -206,7 +311,19 @@ sub urlfixup {
return $url;
}
+#########################################
+#########################################
+
+=pod
+=item absoluteurl
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
sub absoluteurl {
my ($url,$target)=@_;
unless ($url) { return ''; }
@@ -217,6 +334,19 @@ sub absoluteurl {
return $url;
}
+#########################################
+#########################################
+
+=pod
+
+=item set_allow
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
sub set_allow {
my ($allow,$logfile,$target,$tag,$oldurl)=@_;
my $newurl=&urlfixup($oldurl,$target);
@@ -235,6 +365,19 @@ sub set_allow {
return $return_url
}
+#########################################
+#########################################
+
+=pod
+
+=item get_subscribed_hosts
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
sub get_subscribed_hosts {
my ($target)=@_;
my @subscribed;
@@ -268,6 +411,19 @@ sub get_subscribed_hosts {
}
+#########################################
+#########################################
+
+=pod
+
+=item get_max_ids_indices
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
sub get_max_ids_indices {
my ($content)=@_;
my $maxindex=10;
@@ -299,7 +455,62 @@ sub get_max_ids_indices {
return ($needsfixup,$maxid,$maxindex);
}
-#Arguably this should all be done as an lonnet::ssi instead
+#########################################
+#########################################
+
+=pod
+
+=item get_all_text_unbalanced
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
+sub get_all_text_unbalanced {
+ #there is a copy of this in lonxml.pm
+ my($tag,$pars)= @_;
+ my $token;
+ my $result='';
+ $tag='<'.$tag.'>';
+ while ($token = $$pars[-1]->get_token) {
+ if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+ $result.=$token->[1];
+ } elsif ($token->[0] eq 'PI') {
+ $result.=$token->[2];
+ } elsif ($token->[0] eq 'S') {
+ $result.=$token->[4];
+ } elsif ($token->[0] eq 'E') {
+ $result.=$token->[2];
+ }
+ if ($result =~ /(.*)$tag(.*)/) {
+ #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
+ #&Apache::lonnet::logthis('Result is :'.$1);
+ $result=$1;
+ my $redo=$tag.$2;
+ push (@$pars,HTML::LCParser->new(\$redo));
+ $$pars[-1]->xml_mode('1');
+ last;
+ }
+ }
+ return $result
+}
+
+#########################################
+#########################################
+
+=pod
+
+=item fix_ids_and_indices
+
+Currently undocumented
+
+=cut
+
+#########################################
+#########################################
+#Arguably this should all be done as a lonnet::ssi instead
sub fix_ids_and_indices {
my ($logfile,$source,$target)=@_;
@@ -352,9 +563,7 @@ sub fix_ids_and_indices {
}
foreach my $type ('src','href','background','bgimg') {
foreach my $key (keys(%parms)) {
- print $logfile "for $type, and $key\n";
if ($key =~ /^$type$/i) {
- print $logfile "calling set_allow\n";
$parms{$key}=&set_allow(\%allow,$logfile,
$target,$tag,
$parms{$key});
@@ -413,6 +622,9 @@ sub fix_ids_and_indices {
}
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
$outstring.='<'.$tag.$newparmstring.$endtag.'>';
+ if ($lctag eq 'm') {
+ $outstring.=&get_all_text_unbalanced('/m',\@parser);
+ }
} elsif ($token->[0] eq 'E') {
if ($token->[2]) {
unless ($token->[1] eq 'allow') {
@@ -437,6 +649,75 @@ sub fix_ids_and_indices {
return ($outstring,%allow);
}
+#########################################
+#########################################
+
+=pod
+
+=item store_metadata
+
+Store the metadata in the metadata table in the loncapa database.
+Uses lonmysql to access the database.
+
+Inputs: \%metadata
+
+Returns: (error,status). error is undef on success, status is undef on error.
+
+=cut
+
+#########################################
+#########################################
+sub store_metadata {
+ my %metadata = %{shift()};
+ my $error;
+ # Determine if the table exists
+ my $status = &Apache::lonmysql::check_table('metadata');
+ if (! defined($status)) {
+ $error='WARNING: Cannot connect to '.
+ 'database!';
+ &Apache::lonnet::logthis($error);
+ return ($error,undef);
+ }
+ if ($status == 0) {
+ # It would be nice to actually create the table....
+ $error ='WARNING: The metadata table does not '.
+ 'exist in the LON-CAPA database.';
+ &Apache::lonnet::logthis($error);
+ return ($error,undef);
+ }
+ # Remove old value from table
+ $status = &Apache::lonmysql::remove_from_table
+ ('metadata','url',$metadata{'url'});
+ if (! defined($status)) {
+ $error = 'Error when removing old values from '.
+ 'metadata table in LON-CAPA database.';
+ &Apache::lonnet::logthis($error);
+ return ($error,undef);
+ }
+ # Store data in table.
+ $status = &Apache::lonmysql::store_row('metadata',\%metadata);
+ if (! defined($status)) {
+ $error='Error occured storing new values in '.
+ 'metadata table in LON-CAPA database';
+ &Apache::lonnet::logthis($error);
+ return ($error,undef);
+ }
+ return (undef,$status);
+}
+
+#########################################
+#########################################
+
+=pod
+
+=item publish
+
+Currently undocumented. This is the workhorse function of this module.
+
+=cut
+
+#########################################
+#########################################
sub publish {
my ($source,$target,$style)=@_;
@@ -496,7 +777,8 @@ sub publish {
=> time);
$thisdep=~/^\/res\/(\w+)\/(\w+)\//;
if ((defined($1)) && (defined($2))) {
- &Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
+ &Apache::lonnet::put('nohist_resevaldata',\%temphash,
+ $1,$2);
}
}
}
@@ -756,8 +1038,20 @@ END
'
Synchronized SQL metadata database'; - print $logfile "\nSynchronized SQL metadata database"; - } + my $warning; + $metadatafields{'url'} = $distarget; + $metadatafields{'version'} = 'current'; + unless ($metadatafields{'copyright'} eq 'priv') { + my ($error,$success) = &store_metadata(\%metadatafields); + if ($success) { + $scrout.='
Synchronized SQL metadata database'; + print $logfile "\nSynchronized SQL metadata database"; + } else { + $warning.=$error; + print $logfile "\n".$error; + } + } else { + $scrout.='
Private Publication - did not synchronize database'; + print $logfile "\nPrivate: Did not synchronize data into ". + "SQL metadata database"; } - -} else { - $scrout.='
Private Publication - did not synchronize database';
- print $logfile "\nPrivate: Did not synchronize data into ".
- "SQL metadata database";
-}
# ----------------------------------------------------------- Copy old versions
if (-e $target) {
@@ -1022,8 +1277,36 @@ if (-e $target) {
}
-# ================================================================ Main Handler
+#########################################
+#########################################
+
+=pod
+
+=item handler
+
+A basic outline of the handler subroutine follows.
+
+=over 4
+
+=item Get query string for limited number of parameters
+
+=item Check filename
+
+=item File is there and owned, init lookup tables
+
+=item Start page output
+
+=item Individual file
+
+=item publish from $thisfn to $thistarget with $thisembstyle
+
+=back
+
+=cut
+
+#########################################
+#########################################
sub handler {
my $r=shift;
@@ -1180,107 +1463,9 @@ unless ($ENV{'form.phase'} eq 'two') {
1;
__END__
-=head1 NAME
-
-Apache::lonpublisher - Publication Handler
-
-=head1 SYNOPSIS
-
-Invoked by /etc/httpd/conf/srm.conf:
-
-