version 1.27, 2001/05/08 01:26:48
|
version 1.36, 2001/08/11 19:06:54
|
Line 10
|
Line 10
|
# 03/24,03/29,04/03 Gerd Kortemeyer |
# 03/24,03/29,04/03 Gerd Kortemeyer |
# 04/16/2001 Scott Harrison |
# 04/16/2001 Scott Harrison |
# 05/03,05/05,05/07 Gerd Kortemeyer |
# 05/03,05/05,05/07 Gerd Kortemeyer |
|
# 05/28/2001 Scott Harrison |
|
# 06/23,08/07,08/11 Gerd Kortemeyer |
|
|
package Apache::lonpublisher; |
package Apache::lonpublisher; |
|
|
Line 47 sub metaeval {
|
Line 49 sub metaeval {
|
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $entry=$token->[1]; |
my $entry=$token->[1]; |
my $unikey=$entry; |
my $unikey=$entry; |
|
if (defined($token->[2]->{'package'})) { |
|
$unikey.='_package_'.$token->[2]->{'package'}; |
|
} |
if (defined($token->[2]->{'part'})) { |
if (defined($token->[2]->{'part'})) { |
$unikey.='_'.$token->[2]->{'part'}; |
$unikey.='_'.$token->[2]->{'part'}; |
} |
} |
|
if (defined($token->[2]->{'id'})) { |
|
$unikey.='_'.$token->[2]->{'id'}; |
|
} |
if (defined($token->[2]->{'name'})) { |
if (defined($token->[2]->{'name'})) { |
$unikey.='_'.$token->[2]->{'name'}; |
$unikey.='_'.$token->[2]->{'name'}; |
} |
} |
Line 125 sub selectbox {
|
Line 133 sub selectbox {
|
|
|
# -------------------------------------------------------- Publication Step One |
# -------------------------------------------------------- Publication Step One |
|
|
|
sub urlfixup { |
|
my ($url,$target)=@_; |
|
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); |
|
map { |
|
if ($_ eq $host) { |
|
$url=~s/^http\:\/\///; |
|
$url=~s/^$host//; |
|
} |
|
} values %Apache::lonnet::hostname; |
|
$url=~s/\~$cuname/res\/$cudom\/$cuname/; |
|
if ($target) { |
|
$target=~s/\/[^\/]+$//; |
|
$url=&Apache::lonnet::hreflocation($target,$url); |
|
} |
|
return $url; |
|
} |
|
|
sub publish { |
sub publish { |
|
|
my ($source,$target,$style)=@_; |
my ($source,$target,$style)=@_; |
Line 132 sub publish {
|
Line 157 sub publish {
|
my $scrout=''; |
my $scrout=''; |
my $allmeta=''; |
my $allmeta=''; |
my $content=''; |
my $content=''; |
|
my %allow=(); |
|
undef %allow; |
|
|
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
return |
return |
Line 192 sub publish {
|
Line 219 sub publish {
|
print $logfile "Needs ID and/or index fixup\n". |
print $logfile "Needs ID and/or index fixup\n". |
"Max ID : $maxid (min 10)\n". |
"Max ID : $maxid (min 10)\n". |
"Max Index: $maxindex (min 10)\n"; |
"Max Index: $maxindex (min 10)\n"; |
|
} |
my $outstring=''; |
my $outstring=''; |
my $parser=HTML::TokeParser->new(\$content); |
my $parser=HTML::TokeParser->new(\$content); |
my $token; |
my $token; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $counter; |
my $counter; |
if ($counter=$addid{$token->[1]}) { |
my $tag=$token->[1]; |
|
unless ($tag eq 'allow') { |
|
my %parms=%{$token->[2]}; |
|
if ($counter=$addid{$tag}) { |
if ($counter eq 'id') { |
if ($counter eq 'id') { |
if (defined($token->[2]->{'id'})) { |
unless (defined($parms{'id'})) { |
$outstring.=$token->[4]; |
|
} else { |
|
$maxid++; |
$maxid++; |
my $thisid=' id="'.$maxid.'"'; |
$parms{'id'}=$maxid; |
my $fixup=$token->[4]; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
$fixup=~s/(\<\w+)/$1$thisid/; |
|
$outstring.=$fixup; |
|
print $logfile 'ID: '.$fixup."\n"; |
|
} |
} |
} else { |
} elsif ($counter eq 'index') { |
if (defined($token->[2]->{'index'})) { |
unless (defined($parms{'index'})) { |
$outstring.=$token->[4]; |
|
} else { |
|
$maxindex++; |
$maxindex++; |
my $thisindex=' index="'.$maxindex.'"'; |
$parms{'index'}=$maxindex; |
my $fixup=$token->[4]; |
print $logfile 'Index: '.$tag.':'.$maxindex."\n"; |
$fixup=~s/(\<\w+)/$1$thisindex/; |
|
$outstring.=$fixup; |
|
print $logfile 'Index: '.$fixup."\n"; |
|
} |
} |
} |
} |
} else { |
} |
$outstring.=$token->[4]; |
|
} |
map { |
|
if (defined($parms{$_})) { |
|
my $oldurl=$parms{$_}; |
|
my $newurl=&urlfixup($oldurl,$target); |
|
if ($newurl ne $oldurl) { |
|
$parms{$_}=$newurl; |
|
print $logfile 'URL: '.$tag.':'.$oldurl.' - '. |
|
$newurl."\n"; |
|
} |
|
$allow{$newurl}=1; |
|
} |
|
} ('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.'>'; |
|
} else { |
|
$allow{$token->[2]->{'src'}}=1; |
|
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$outstring.=$token->[2]; |
unless ($token->[1] eq 'allow') { |
|
$outstring.=$token->[2]; |
|
} |
} else { |
} else { |
$outstring.=$token->[1]; |
$outstring.=$token->[1]; |
} |
} |
} |
} |
|
# ------------------------------------------------------------ Construct Allows |
|
my $allowstr="\n"; |
|
map { |
|
$allowstr.='<allow src="'.$_.'" />'."\n"; |
|
} keys %allow; |
|
$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s; |
|
|
{ |
{ |
my $org; |
my $org; |
unless ($org=Apache::File->new('>'.$source)) { |
unless ($org=Apache::File->new('>'.$source)) { |
Line 242 sub publish {
|
Line 298 sub publish {
|
print $org $outstring; |
print $org $outstring; |
} |
} |
$content=$outstring; |
$content=$outstring; |
|
|
|
if ($needsfixup) { |
print $logfile "End of ID and/or index fixup\n". |
print $logfile "End of ID and/or index fixup\n". |
"Max ID : $maxid (min 10)\n". |
"Max ID : $maxid (min 10)\n". |
"Max Index: $maxindex (min 10)\n"; |
"Max Index: $maxindex (min 10)\n"; |
Line 308 sub publish {
|
Line 366 sub publish {
|
# -------------------------------------------------- Parse content for metadata |
# -------------------------------------------------- Parse content for metadata |
|
|
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
|
|
&metaeval($allmeta); |
&metaeval($allmeta); |
|
|
# ---------------- Find and document discrepancies in the parameters and stores |
# ---------------- Find and document discrepancies in the parameters and stores |
Line 331 sub publish {
|
Line 390 sub publish {
|
my $chparms=''; |
my $chparms=''; |
map { |
map { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) { |
unless (($metadatafields{$_.'.name'}) || |
|
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
print $logfile 'Obsolete: '.$_."\n"; |
print $logfile 'Obsolete: '.$_."\n"; |
$chparms.=$_.' '; |
$chparms.=$_.' '; |
} |
} |
Line 510 sub phasetwo {
|
Line 570 sub phasetwo {
|
} |
} |
close(CONFIG); |
close(CONFIG); |
|
|
|
my $warning; |
my $dbh; |
my $dbh; |
{ |
{ |
unless ( |
unless ( |
$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0}) |
$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0}) |
) { |
) { |
return '<font color=red>Cannot connect to database!</font>'; |
$warning='<font color=red>WARNING: Cannot connect to '. |
|
'database!</font>'; |
|
} |
|
else { |
|
my %sqldatafields; |
|
$sqldatafields{'url'}=$distarget; |
|
my $sth=$dbh->prepare( |
|
'delete from metadata where url like binary'. |
|
'"'.$sqldatafields{'url'}.'"'); |
|
$sth->execute(); |
|
map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g; |
|
$sqldatafields{$_}=$field;} |
|
('title','author','subject','keywords','notes','abstract', |
|
'mime','language','creationdate','lastrevisiondate','owner', |
|
'copyright'); |
|
|
|
$sth=$dbh->prepare('insert into metadata values ('. |
|
'"'.delete($sqldatafields{'title'}).'"'.','. |
|
'"'.delete($sqldatafields{'author'}).'"'.','. |
|
'"'.delete($sqldatafields{'subject'}).'"'.','. |
|
'"'.delete($sqldatafields{'url'}).'"'.','. |
|
'"'.delete($sqldatafields{'keywords'}).'"'.','. |
|
'"'.'current'.'"'.','. |
|
'"'.delete($sqldatafields{'notes'}).'"'.','. |
|
'"'.delete($sqldatafields{'abstract'}).'"'.','. |
|
'"'.delete($sqldatafields{'mime'}).'"'.','. |
|
'"'.delete($sqldatafields{'language'}).'"'.','. |
|
'"'. |
|
sqltime(delete($sqldatafields{'creationdate'})) |
|
.'"'.','. |
|
'"'. |
|
sqltime(delete( |
|
$sqldatafields{'lastrevisiondate'})).'"'.','. |
|
'"'.delete($sqldatafields{'owner'}).'"'.','. |
|
'"'.delete( |
|
$sqldatafields{'copyright'}).'"'.')'); |
|
$sth->execute(); |
|
$dbh->disconnect; |
|
$scrout.='<p>Synchronized SQL metadata database'; |
|
print $logfile "\nSynchronized SQL metadata database"; |
} |
} |
} |
} |
|
|
my %sqldatafields; |
|
$sqldatafields{'url'}=$distarget; |
|
my $sth=$dbh->prepare("delete from metadata where url like binary \"". |
|
$sqldatafields{'url'}."\""); |
|
$sth->execute(); |
|
map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g; |
|
$sqldatafields{$_}=$field;} |
|
('title','author','subject','keywords','notes','abstract', |
|
'mime','language','creationdate','lastrevisiondate','owner','copyright'); |
|
|
|
$sth=$dbh->prepare('insert into metadata values ('. |
|
'"'.delete($sqldatafields{'title'}).'"'.','. |
|
'"'.delete($sqldatafields{'author'}).'"'.','. |
|
'"'.delete($sqldatafields{'subject'}).'"'.','. |
|
'"'.delete($sqldatafields{'url'}).'"'.','. |
|
'"'.delete($sqldatafields{'keywords'}).'"'.','. |
|
'"'.'current'.'"'.','. |
|
'"'.delete($sqldatafields{'notes'}).'"'.','. |
|
'"'.delete($sqldatafields{'abstract'}).'"'.','. |
|
'"'.delete($sqldatafields{'mime'}).'"'.','. |
|
'"'.delete($sqldatafields{'language'}).'"'.','. |
|
'"'.sqltime(delete($sqldatafields{'creationdate'})).'"'.','. |
|
'"'.sqltime(delete($sqldatafields{'lastrevisiondate'})).'"'.','. |
|
'"'.delete($sqldatafields{'owner'}).'"'.','. |
|
'"'.delete($sqldatafields{'copyright'}).'"'.')'); |
|
$sth->execute(); |
|
$dbh->disconnect; |
|
$scrout.='<p>Synchronized SQL metadata database'; |
|
print $logfile "\nSynchronized SQL metadata database"; |
|
|
|
# ----------------------------------------------------------- Copy old versions |
# ----------------------------------------------------------- Copy old versions |
|
|
Line 706 if (-e $target) {
|
Line 777 if (-e $target) {
|
$thissrcdir=~s/\/[^\/]+$/\//; |
$thissrcdir=~s/\/[^\/]+$/\//; |
|
|
|
|
return $scrout. |
return $warning.$scrout. |
'<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'. |
'<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'. |
'<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'. |
'<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'. |
'<p><a href="'.$thissrcdir. |
'<p><a href="'.$thissrcdir. |
Line 736 sub handler {
|
Line 807 sub handler {
|
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless (($cuname,$cudom)= |
($cuname,$cudom)= |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) { |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
|
unless (($cuname) && ($cudom)) { |
$r->log_reason($cuname.' at '.$cudom. |
$r->log_reason($cuname.' at '.$cudom. |
' trying to publish file '.$ENV{'form.filename'}. |
' trying to publish file '.$ENV{'form.filename'}. |
' ('.$fn.') - not authorized', |
' ('.$fn.') - not authorized', |
Line 861 unless ($ENV{'form.phase'} eq 'two') {
|
Line 933 unless ($ENV{'form.phase'} eq 'two') {
|
} |
} |
|
|
if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') { |
if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') { |
$r->print('<br><a href="/adm/diff?filename='.$thisdisfn. |
$r->print('<br><a href="/adm/diff?filename=/~'.$cuname.'/'. |
|
$thisdisfn. |
'&versionone=priv" target=cat>Diffs with Current Version</a><p>'); |
'&versionone=priv" target=cat>Diffs with Current Version</a><p>'); |
} |
} |
|
|