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.150 and 1.157

version 1.150, 2003/12/26 16:27:20	version 1.157, 2003/12/29 19:13:23
Line 126 use Apache::loncommon();	Line 126 use Apache::loncommon();
use Apache::lonmysql;	use Apache::lonmysql;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::loncfile;	use Apache::loncfile;
	use Apache::lonmeta;
use vars qw(%metadatafields %metadatakeys);	use vars qw(%metadatafields %metadatakeys);

my %addid;	my %addid;
Line 316 sub textfield {	Line 317 sub textfield {
$value=~s/\s+$//gs;	$value=~s/\s+$//gs;
$value=~s/\s+/ /gs;	$value=~s/\s+/ /gs;
$title=&mt($title);	$title=&mt($title);
my $uctitle=uc($title);	return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
"</b></font></p><br />".	"</b></font></p><br />".
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';	'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
}	}
Line 330 sub hiddenfield {	Line 330 sub hiddenfield {
sub selectbox {	sub selectbox {
my ($title,$name,$value,$functionref,@idlist)=@_;	my ($title,$name,$value,$functionref,@idlist)=@_;
$title=&mt($title);	$title=&mt($title);
my $uctitle=uc($title);
$value=(split(/\s,\s/,$value))[-1];	$value=(split(/\s,\s/,$value))[-1];
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".	my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
'</b></font></p><br /><select name="'.$name.'">';	'</b></font></p><br /><select name="'.$name.'">';
foreach (@idlist) {	foreach (@idlist) {
$selout.='<option value=\''.$_.'\'';	$selout.='<option value=\''.$_.'\'';
Line 767 Returns: (error,status). error is undef	Line 766 Returns: (error,status). error is undef
#########################################	#########################################
#########################################	#########################################
sub store_metadata {	sub store_metadata {
my %metadata = %{shift()};	my %metadata = @_;
my $error;	my $error;
# Determine if the table exists	# Determine if the table exists
my $status = &Apache::lonmysql::check_table('metadata');	my $status = &Apache::lonmysql::check_table('metadata');
Line 784 sub store_metadata {	Line 783 sub store_metadata {
&Apache::lonnet::logthis($error);	&Apache::lonnet::logthis($error);
return ($error,undef);	return ($error,undef);
}	}
# Remove old value from table	if (($metadata{'obsolete'}) \|\| ($metadata{'copyright'} eq 'priv') \|\|
$status = &Apache::lonmysql::remove_from_table	($metadata{'copyright'} eq 'custom')) {
('metadata','url',$metadata{'url'});	# remove this entry
if (! defined($status)) {	$status=&Apache::lonmysql::remove_from_table
$error = '<font color="red">Error when removing old values from '.	('metadata','url',$metadata{'url'});
'metadata table in LON-CAPA database.</font>';	} else {
&Apache::lonnet::logthis($error);	# store new data
return ($error,undef);	# adjust some values to metadatadatabase (e.g., "usage" is a reserved word)
	$metadata{'creationdate'}=
	&Apache::lonmysql::sqltime($metadata{'creationdate'});
	$metadata{'lastrevisiondate'}=
	&Apache::lonmysql::sqltime($metadata{'lastrevisiondate'});
	$metadata{'sequsage'}=$metadata{'usage'};
	$metadata{'sequsage_list'}=$metadata{'usage_list'};
	my %newmetadata=();
	# see if we have old entries
	my @oldmeta=&Apache::lonmysql::get_rows('metadata',
	"url LIKE BINARY '".
	$metadata{'url'}."'");
	if ($#oldmeta==0) {
	# yes, there is one old entry, transfer to newmetadata
	%newmetadata=&Apache::lonmeta::metadata_col_to_hash(@{$oldmeta[0]});
	# remove old entry
	$status=&Apache::lonmysql::remove_from_table
	('metadata','url',$metadata{'url'});
	} elsif ($#oldmeta>0) {
	# more than one entry fit - how did that happen?
	$error='<font color="red">Error occured retrieving old values in '.
	'metadata table in LON-CAPA database: '.$#oldmeta.
	' matches</font>';
	&Apache::lonnet::logthis($error);
	return ($error,undef);
	}
	# store new data on top of it
	foreach (keys %metadata) {
	$newmetadata{$_}=$metadata{$_};
	}
	$status = &Apache::lonmysql::store_row('metadata',\%newmetadata);
}	}
# Store data in table.
$status = &Apache::lonmysql::store_row('metadata',\%metadata);
if (! defined($status)) {	if (! defined($status)) {
$error='<font color="red">Error occured storing new values in '.	$error='<font color="red">Error occured storing new values in '.
'metadata table in LON-CAPA database</font>';	'metadata table in LON-CAPA database</font>';
Line 958 sub publish {	Line 985 sub publish {
$metadatafields{'author'}=~s/\s+/ /g;	$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;	$metadatafields{'author'}=~s/\s+$//;
$metadatafields{'owner'}=$cuname.'@'.$cudom;	$metadatafields{'owner'}=$cuname.'@'.$cudom;
$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
$ENV{'user.domain'};
$metadatafields{'authorspace'}=$cuname.'@'.$cudom;

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

Line 1086 sub publish {	Line 1110 sub publish {
# --------------------------------------------------- Scan content for keywords	# --------------------------------------------------- Scan content for keywords

my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");	my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
my $KEYWORDS=&mt('KEYWORDS');	my $KEYWORDS=&mt('Keywords');
my $CheckAll=&mt('check all');	my $CheckAll=&mt('check all');
my $UncheckAll=&mt('uncheck all');	my $UncheckAll=&mt('uncheck all');
my $keywordout=<<"END";	my $keywordout=<<"END";
Line 1137 END	Line 1161 END
$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});

$scrout.=	$scrout.=
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('ABSTRACT').":".	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".
"</b></font></p><br />".	"</b></font></p><br />".
'<textarea cols="80" rows="5" name="abstract">'.	'<textarea cols="80" rows="5" name="abstract">'.
$metadatafields{'abstract'}.'</textarea></p>';	$metadatafields{'abstract'}.'</textarea></p>';
Line 1147 END	Line 1171 END

$scrout.=	$scrout.=
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
uc(&mt('Lowest Grade Level:')).	&mt('Lowest Grade Level').':'.
"</b></font></p><br />".	"</b></font></p><br />".
&Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').	&Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
uc(&mt('Highest Grade Level:')).	&mt('Highest Grade Level').':'.
"</b></font></p><br />".	"</b></font></p><br />".
&Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').	&Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
&textfield('Standards','standards',$metadatafields{'standards'});	&textfield('Standards','standards',$metadatafields{'standards'});
Line 1176 END	Line 1200 END
$metadatafields{'creationdate'}=time;	$metadatafields{'creationdate'}=time;
}	}
$scrout.=&hiddenfield('creationdate',	$scrout.=&hiddenfield('creationdate',
&Apache::loncommon::unsqltime($metadatafields{'creationdate'}));	&Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));

$scrout.=&hiddenfield('lastrevisiondate',time);	$scrout.=&hiddenfield('lastrevisiondate',time);

Line 1334 sub phasetwo {	Line 1358 sub phasetwo {
$metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};	$metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
$metadatafields{'owner'}=$ENV{'form.owner'};	$metadatafields{'owner'}=$ENV{'form.owner'};
$metadatafields{'copyright'}=$ENV{'form.copyright'};	$metadatafields{'copyright'}=$ENV{'form.copyright'};
	$metadatafields{'standards'}=$ENV{'form.standards'};
	$metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
	$metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
$metadatafields{'customdistributionfile'}=	$metadatafields{'customdistributionfile'}=
$ENV{'form.customdistributionfile'};	$ENV{'form.customdistributionfile'};
$metadatafields{'obsolete'}=$ENV{'form.obsolete'};	$metadatafields{'obsolete'}=$ENV{'form.obsolete'};
$metadatafields{'obsoletereplacement'}=	$metadatafields{'obsoletereplacement'}=
$ENV{'form.obsoletereplacement'};	$ENV{'form.obsoletereplacement'};
$metadatafields{'dependencies'}=$ENV{'form.dependencies'};	$metadatafields{'dependencies'}=$ENV{'form.dependencies'};
	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
	$ENV{'user.domain'};
	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;

my $allkeywords=$ENV{'form.addkey'};	my $allkeywords=$ENV{'form.addkey'};
if (exists($ENV{'form.keywords'})) {	if (exists($ENV{'form.keywords'})) {
Line 1395 sub phasetwo {	Line 1425 sub phasetwo {

$metadatafields{'url'} = $distarget;	$metadatafields{'url'} = $distarget;
$metadatafields{'version'} = 'current';	$metadatafields{'version'} = 'current';
unless ($metadatafields{'copyright'} eq 'priv') {
my ($error,$success) = &store_metadata(\%metadatafields);	my ($error,$success) = &store_metadata(%metadatafields);
if ($success) {	if ($success) {
$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
print $logfile "\nSynchronized SQL metadata database";	print $logfile "\nSynchronized SQL metadata database";
} else {
$r->print($error);
print $logfile "\n".$error;
}
} else {	} else {
$r->print('<p>'.	$r->print($error);
&mt('Private Publication - did not synchronize database').'</p>');	print $logfile "\n".$error;
print $logfile "\nPrivate: Did not synchronize data into ".
"SQL metadata database";
}	}

# ----------------------------------------------------------- Copy old versions	# ----------------------------------------------------------- Copy old versions

if (-e $target) {	if (-e $target) {
Line 1622 sub publishdirectory {	Line 1647 sub publishdirectory {
my $resdir=	my $resdir=
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
$thisdisfn;	$thisdisfn;
$r->print('<h1>Directory <tt>'.$thisdisfn.'</tt></h1>'.	$r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
'Target: <tt>'.$resdir.'</tt><br />');	&mt('Target').': <tt>'.$resdir.'</tt><br />');

my $dirptr=16384; # Mask indicating a directory in stat.cmode.	my $dirptr=16384; # Mask indicating a directory in stat.cmode.

Line 1661 sub publishdirectory {	Line 1686 sub publishdirectory {
if ($publishthis) {	if ($publishthis) {
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);	&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
} else {	} else {
$r->print('<br />Skipping '.$filename.'<br />');	$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
}	}
$r->rflush();	$r->rflush();
}	}

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

Removed from v.1.150
changed lines
	Added in v.1.157