loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.12 and 1.28

version 1.12, 2000/12/04 12:27:58	version 1.28, 2001/05/09 17:38:13
Line 5	Line 5
#	#
# 05/29/00,05/30,10/11 Gerd Kortemeyer)	# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#	#
# 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer	# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
	# 03/23 Guy Albertelli
	# 03/24,03/29,04/03 Gerd Kortemeyer
	# 04/16/2001 Scott Harrison
	# 05/03,05/05,05/07 Gerd Kortemeyer

package Apache::lonpublisher;	package Apache::lonpublisher;

use strict;	use strict;
use Apache::File;	use Apache::File;
	use File::Copy;
use Apache::Constants qw(:common :http :methods);	use Apache::Constants qw(:common :http :methods);
use HTML::TokeParser;	use HTML::TokeParser;
use Apache::lonxml;	use Apache::lonxml;
use Apache::structuretags;	use Apache::lonhomework;
use Apache::inputtags;	use Apache::loncacc;
use Apache::response;	use DBI;

my %addid;	my %addid;
my %nokey;	my %nokey;
Line 28 my %metadatakeys;	Line 33 my %metadatakeys;

my $docroot;	my $docroot;

	my $cuname;
	my $cudom;

# ----------------------------------------------- Evaluate string with metadata	# ----------------------------------------------- Evaluate string with metadata

sub metaeval {	sub metaeval {
Line 83 sub metaread {	Line 91 sub metaread {
return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';	return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
}	}

	# ---------------------------- convert 'time' format into a datetime sql format
	sub sqltime {
	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
	localtime(@_[0]);
	$mon++; $year+=1900;
	return "$year-$mon-$mday $hour:$min:$sec";
	}

# --------------------------------------------------------- Various form fields	# --------------------------------------------------------- Various form fields

sub textfield {	sub textfield {
Line 114 sub publish {	Line 130 sub publish {
my ($source,$target,$style)=@_;	my ($source,$target,$style)=@_;
my $logfile;	my $logfile;
my $scrout='';	my $scrout='';
	my $allmeta='';
	my $content='';

unless ($logfile=Apache::File->new('>>'.$source.'.log')) {	unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
return	return
Line 127 sub publish {	Line 145 sub publish {

# ----------------------------------------------------------------- Backup Copy	# ----------------------------------------------------------------- Backup Copy
my $copyfile=$source.'.save';	my $copyfile=$source.'.save';
{	if (copy($source,$copyfile)) {
my $org=Apache::File->new($source);
my $cop=Apache::File->new('>'.$copyfile);
while (my $line=<$org>) { print $cop $line; }
}
if (-e $copyfile) {
print $logfile "Copied original file to ".$copyfile."\n";	print $logfile "Copied original file to ".$copyfile."\n";
} else {	} else {
print $logfile "Unable to write backup ".$copyfile."\n";	print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
return "<font color=red>Failed to write backup copy, FAIL</font>";	return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
}	}
# ------------------------------------------------------------- IDs and indices	# ------------------------------------------------------------- IDs and indices

my $maxindex=10;	my $maxindex=10;
my $maxid=10;	my $maxid=10;
my $content='';
my $needsfixup=0;	my $needsfixup=0;

{	{
Line 253 sub publish {	Line 266 sub publish {
$ENV{'environment.generation'};	$ENV{'environment.generation'};
$metadatafields{'author'}=~s/\s+/ /g;	$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;	$metadatafields{'author'}=~s/\s+$//;
$metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};	$metadatafields{'owner'}=$cuname.'@'.$cudom;

# ------------------------------------------------ Check out directory hierachy	# ------------------------------------------------ Check out directory hierachy

my $thisdisfn=$source;	my $thisdisfn=$source;
$thisdisfn=~s/^\/home\/$ENV{'user.name'}\///;	$thisdisfn=~s/^\/home\/$cuname\///;

my @urlparts=split(/\//,$thisdisfn);	my @urlparts=split(/\//,$thisdisfn);
$#urlparts--;	$#urlparts--;

my $currentpath='/home/'.$ENV{'user.name'}.'/';	my $currentpath='/home/'.$cuname.'/';

map {	map {
$currentpath.=$_.'/';	$currentpath.=$_.'/';
Line 294 sub publish {	Line 307 sub publish {

# -------------------------------------------------- Parse content for metadata	# -------------------------------------------------- Parse content for metadata

my $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 328 sub publish {	Line 341 sub publish {
$scrout.='<p><b>Obsolete parameters or stored values:</b> '.	$scrout.='<p><b>Obsolete parameters or stored values:</b> '.
$chparms;	$chparms;
}	}
	}
# ------------------------------------------------------- Now have all metadata	# ------------------------------------------------------- Now have all metadata

$scrout.=	$scrout.=
Line 412 sub publish {	Line 425 sub publish {
$scrout.=&selectbox('Copyright/Distribution','copyright',	$scrout.=&selectbox('Copyright/Distribution','copyright',
$metadatafields{'copyright'},%cprtag);	$metadatafields{'copyright'},%cprtag);

}
return $scrout.	return $scrout.
'<p><input type="submit" value="Finalize Publication"></form>';	'<p><input type="submit" value="Finalize Publication"></form>';
}	}
Line 421 sub publish {	Line 433 sub publish {

sub phasetwo {	sub phasetwo {

my ($source,$target,$style)=@_;	my ($source,$target,$style,$distarget)=@_;
my $logfile;	my $logfile;
my $scrout='';	my $scrout='';

Line 485 sub phasetwo {	Line 497 sub phasetwo {
print $logfile "\nWrote metadata";	print $logfile "\nWrote metadata";
}	}

	# -------------------------------- Synchronize entry with SQL metadata database
	my %perlvar;
	open (CONFIG,"/etc/httpd/conf/access.conf") \|\| die "Can't read access.conf";
	my $configline;
	while ($configline=<CONFIG>) {
	if ($configline =~ /PerlSetVar/) {
	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
	chomp($varvalue);
	$perlvar{$varname}=$varvalue;
	}
	}
	close(CONFIG);

	my $dbh;
	{
	unless (
	$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
	) {
	return '<font color=red>Cannot connect to database!</font>';
	}
	}

	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

if (-e $target) {	if (-e $target) {
Line 511 if (-e $target) {	Line 575 if (-e $target) {

my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;	my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;

{	if (copy($target,$copyfile)) {
my $org=Apache::File->new($target);
my $cop;
unless ($cop=Apache::File->new('>'.$copyfile)) {
print $logfile "Unable to open for write ".$copyfile."\n";
return "<font color=red>Failed to open '.$copyfile.
', FAIL</font>";
}
while (my $line=<$org>) { print $cop $line; }
}
if (-e $copyfile) {
print $logfile "Copied old target to ".$copyfile."\n";	print $logfile "Copied old target to ".$copyfile."\n";
$scrout.='<p>Copied old target file';	$scrout.='<p>Copied old target file';
} else {	} else {
print $logfile "Unable to write ".$copyfile."\n";	print $logfile "Unable to write ".$copyfile.':'.$!."\n";
return "<font color=red>Failed to copy old target, FAIL</font>";	return "<font color=red>Failed to copy old target, $!, FAIL</font>";
}	}

# --------------------------------------------------------------- Copy Metadata	# --------------------------------------------------------------- Copy Metadata

$copyfile=$copyfile.'.meta';	$copyfile=$copyfile.'.meta';
{
my $org=Apache::File->new($target.'.meta');	if (copy($target.'.meta',$copyfile)) {
my $cop=Apache::File->new('>'.$copyfile);	print $logfile "Copied old target metadata to ".$copyfile."\n";
while (my $line=<$org>) { print $cop $line; }
}
if (-e $copyfile) {
print $logfile "Copied old target metadata to ".$copyfile."\n";
$scrout.='<p>Copied old metadata';	$scrout.='<p>Copied old metadata';
} else {	} else {
print $logfile "Unable to write metadata ".$copyfile."\n";	print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
return	if (-e $target.'.meta') {
"<font color=red>Failed to write old metadata copy, FAIL</font>";	return
	"<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
	}
}	}


Line 568 if (-e $target) {	Line 620 if (-e $target) {
}	}
}	}

{	if (copy($source,$copyfile)) {
my $org=Apache::File->new($source);
my $cop;
unless ($cop=Apache::File->new('>'.$copyfile)) {
print $logfile "Unable to open for write ".$copyfile."\n";
return "<font color=red>Failed to open '.$copyfile.
', FAIL</font>";
}
while (my $line=<$org>) { print $cop $line; }
}
if (-e $copyfile) {
print $logfile "Copied original source to ".$copyfile."\n";	print $logfile "Copied original source to ".$copyfile."\n";
$scrout.='<p>Copied source file';	$scrout.='<p>Copied source file';
} else {	} else {
print $logfile "Unable to write ".$copyfile."\n";	print $logfile "Unable to write ".$copyfile.':'.$!."\n";
return "<font color=red>Failed to copy source, FAIL</font>";	return "<font color=red>Failed to copy source, $!, FAIL</font>";
}	}

# --------------------------------------------------------------- Copy Metadata	# --------------------------------------------------------------- Copy Metadata

my $copyfile=$target.'.meta';	$copyfile=$copyfile.'.meta';
{
my $org=Apache::File->new($source.'.meta');	if (copy($source.'.meta',$copyfile)) {
my $cop=Apache::File->new('>'.$copyfile);
while (my $line=<$org>) { print $cop $line; }
}
if (-e $copyfile) {
print $logfile "Copied original metadata to ".$copyfile."\n";	print $logfile "Copied original metadata to ".$copyfile."\n";
$scrout.='<p>Copied metadata';	$scrout.='<p>Copied metadata';
} else {	} else {
print $logfile "Unable to write metadata ".$copyfile."\n";	print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
return	return
"<font color=red>Failed to write metadata copy, FAIL</font>";	"<font color=red>Failed to write metadata copy, $!, FAIL</font>";
}	}

# --------------------------------------------------- Send update notifications	# --------------------------------------------------- Send update notifications
Line 628 if (-e $target) {	Line 666 if (-e $target) {

}	}

	# ---------------------------------------- Send update notifications, meta only

	{

	my $filename;

	$target=~/(.*)\/([^\/]+)$/;
	my $srcf=$2.'.meta';
	opendir(DIR,$1);
	while ($filename=readdir(DIR)) {
	if ($filename=~/$srcf\.(\w+)$/) {
	my $subhost=$1;
	if ($subhost ne 'meta') {
	$scrout.=
	'<p>Notifying host for metadata only '.$subhost.':';
	print $logfile
	"\nNotifying host for metadata only '.$subhost.':'";
	my $reply=&Apache::lonnet::critical(
	'update:'.$target.'.meta',$subhost);
	$scrout.=$reply;
	print $logfile $reply;
	}
	}
	}
	closedir(DIR);

	}

# ------------------------------------------------ Provide link to new resource	# ------------------------------------------------ Provide link to new resource

my $thisdistarget=$target;	my $thisdistarget=$target;
$thisdistarget=~s/^$docroot//;	$thisdistarget=~s/^$docroot//;

	my $thissrc=$source;
	$thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;

	my $thissrcdir=$thissrc;
	$thissrcdir=~s/\/[^\/]+$/\//;


return $scrout.	return $scrout.
'<p><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="'.$thissrcdir.
	'"><font size=+2>Back to Source Directory</font></a>';

}	}

# ================================================================ Main Handler	# ================================================================ Main Handler
Line 652 sub handler {	Line 729 sub handler {

my $fn=$ENV{'form.filename'};	my $fn=$ENV{'form.filename'};


unless ($fn) {	unless ($fn) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish empty filename', $r->filename);	' trying to publish empty filename', $r->filename);
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

unless ($ENV{'user.home'} eq $r->dir_config('lonHostID')) {	unless (($cuname,$cudom)=
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) {
	$r->log_reason($cuname.' at '.$cudom.
' trying to publish file '.$ENV{'form.filename'}.	' trying to publish file '.$ENV{'form.filename'}.
' ('.$fn.') - not homeserver ('.$ENV{'user.home'}.')',	' ('.$fn.') - not authorized',
	$r->filename);
	return HTTP_NOT_ACCEPTABLE;
	}

	unless (&Apache::lonnet::homeserver($cuname,$cudom)
	eq $r->dir_config('lonHostID')) {
	$r->log_reason($cuname.' at '.$cudom.
	' trying to publish file '.$ENV{'form.filename'}.
	' ('.$fn.') - not homeserver ('.
	&Apache::lonnet::homeserver($cuname,$cudom).')',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
Line 670 sub handler {	Line 759 sub handler {

my $targetdir='';	my $targetdir='';
$docroot=$r->dir_config('lonDocRoot');	$docroot=$r->dir_config('lonDocRoot');
if ($1 ne $ENV{'user.name'}) {	if ($1 ne $cuname) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish unowned file '.$ENV{'form.filename'}.	' trying to publish unowned file '.$ENV{'form.filename'}.
' ('.$fn.')',	' ('.$fn.')',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
} else {	} else {
$targetdir=$docroot.'/res/'.$ENV{'user.domain'};	$targetdir=$docroot.'/res/'.$cudom;
}	}


unless (-e $fn) {	unless (-e $fn) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish non-existing file '.$ENV{'form.filename'}.	' trying to publish non-existing file '.$ENV{'form.filename'}.
' ('.$fn.')',	' ('.$fn.')',
$r->filename);	$r->filename);
Line 741 unless ($ENV{'form.phase'} eq 'two') {	Line 830 unless ($ENV{'form.phase'} eq 'two') {
$r->send_http_header;	$r->send_http_header;

$r->print('<html><head><title>LON-CAPA Publishing</title></head>');	$r->print('<html><head><title>LON-CAPA Publishing</title></head>');
$r->print('<body bgcolor="#FFFFFF">');	$r->print(
	'<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
my $thisfn=$fn;	my $thisfn=$fn;

# ------------------------------------------------------------- Individual file	# ------------------------------------------------------------- Individual file
Line 759 unless ($ENV{'form.phase'} eq 'two') {	Line 849 unless ($ENV{'form.phase'} eq 'two') {
$thisdistarget=~s/^$docroot//;	$thisdistarget=~s/^$docroot//;

my $thisdisfn=$thisfn;	my $thisdisfn=$thisfn;
$thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///;	$thisdisfn=~s/^\/home\/$cuname\/public_html\///;

$r->print('<h2>Publishing '.	$r->print('<h2>Publishing '.
&Apache::lonnet::filedescription($thistype).' <tt>'.	&Apache::lonnet::filedescription($thistype).' <tt>'.
$thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');	$thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');

	if (($cuname ne $ENV{'user.name'}) \|\| ($cudom ne $ENV{'user.domain'})) {
	$r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
	'</font></h3>');
	}

	if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {
	$r->print('<br><a href="/adm/diff?filename=/~'.$cuname.'/'.
	$thisdisfn.
	'&versionone=priv" target=cat>Diffs with Current Version</a><p>');
	}

# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle	# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle

unless ($ENV{'form.phase'} eq 'two') {	unless ($ENV{'form.phase'} eq 'two') {
$r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));	$r->print(
	'<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
} else {	} else {
$r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle));	$r->print(
	'<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));
}	}

}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.12
changed lines
	Added in v.1.28