--- loncom/publisher/lonpublisher.pm 2003/12/22 22:09:06 1.149 +++ loncom/publisher/lonpublisher.pm 2003/12/29 19:13:23 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Publication Handler # -# $Id: lonpublisher.pm,v 1.149 2003/12/22 22:09:06 www Exp $ +# $Id: lonpublisher.pm,v 1.157 2003/12/29 19:13:23 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -126,6 +126,7 @@ use Apache::loncommon(); use Apache::lonmysql; use Apache::lonlocal; use Apache::loncfile; +use Apache::lonmeta; use vars qw(%metadatafields %metadatakeys); my %addid; @@ -316,8 +317,7 @@ sub textfield { $value=~s/\s+$//gs; $value=~s/\s+/ /gs; $title=&mt($title); - my $uctitle=uc($title); - return "\n
$uctitle:".
+ return "\n $title:".
" $uctitle:".
+ my $selout="\n $title:".
' ".&mt('ABSTRACT').":".
+ "\n ".&mt('Abstract').":".
" ".
+ &mt('Lowest Grade Level').':'.
+ " ".
+ &mt('Highest Grade Level').':'.
+ " '.&mt('Synchronized SQL metadata database').' '.&mt('Synchronized SQL metadata database').' '.
- &mt('Private Publication - did not synchronize database').'
".
'';
}
@@ -330,9 +330,8 @@ sub hiddenfield {
sub selectbox {
my ($title,$name,$value,$functionref,@idlist)=@_;
$title=&mt($title);
- my $uctitle=uc($title);
$value=(split(/\s*,\s*/,$value))[-1];
- my $selout="\n
';
- &Apache::lonnet::logthis($error);
- return ($error,undef);
+ if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
+ ($metadata{'copyright'} eq 'custom')) {
+# remove this entry
+ $status=&Apache::lonmysql::remove_from_table
+ ('metadata','url',$metadata{'url'});
+ } else {
+# store new data
+# 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='Error occured retrieving old values in '.
+ 'metadata table in LON-CAPA database: '.$#oldmeta.
+ ' matches';
+ &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)) {
$error='Error occured storing new values in '.
'metadata table in LON-CAPA database';
@@ -958,9 +985,6 @@ sub publish {
$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;
$metadatafields{'owner'}=$cuname.'@'.$cudom;
- $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
- $ENV{'user.domain'};
- $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
# ------------------------------------------------ Check out directory hierachy
@@ -1086,7 +1110,7 @@ sub publish {
# --------------------------------------------------- Scan content for 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 $UncheckAll=&mt('uncheck all');
my $keywordout=<<"END";
@@ -1137,13 +1161,28 @@ END
$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
$scrout.=
- "\n
".
'
".
+ &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+ "\n
".
+ &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+ &textfield('Standards','standards',$metadatafields{'standards'});
+
+
+
+
$scrout.=&hiddenfield('mime',$1);
my $defaultlanguage=$metadatafields{'language'};
@@ -1161,7 +1200,7 @@ END
$metadatafields{'creationdate'}=time;
}
$scrout.=&hiddenfield('creationdate',
- &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+ &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
$scrout.=&hiddenfield('lastrevisiondate',time);
@@ -1319,12 +1358,18 @@ sub phasetwo {
$metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
$metadatafields{'owner'}=$ENV{'form.owner'};
$metadatafields{'copyright'}=$ENV{'form.copyright'};
+ $metadatafields{'standards'}=$ENV{'form.standards'};
+ $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
+ $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
$metadatafields{'customdistributionfile'}=
$ENV{'form.customdistributionfile'};
$metadatafields{'obsolete'}=$ENV{'form.obsolete'};
$metadatafields{'obsoletereplacement'}=
$ENV{'form.obsoletereplacement'};
$metadatafields{'dependencies'}=$ENV{'form.dependencies'};
+ $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+ $ENV{'user.domain'};
+ $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
my $allkeywords=$ENV{'form.addkey'};
if (exists($ENV{'form.keywords'})) {
@@ -1380,21 +1425,16 @@ sub phasetwo {
$metadatafields{'url'} = $distarget;
$metadatafields{'version'} = 'current';
- unless ($metadatafields{'copyright'} eq 'priv') {
- my ($error,$success) = &store_metadata(\%metadatafields);
- if ($success) {
- $r->print('Directory '.$thisdisfn.'
'.
- 'Target: '.$resdir.'
');
+ $r->print(''.&mt('Directory').' '.$thisdisfn.'
'.
+ &mt('Target').': '.$resdir.'
');
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -1646,7 +1686,7 @@ sub publishdirectory {
if ($publishthis) {
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
} else {
- $r->print('
Skipping '.$filename.'
');
+ $r->print('
'.&mt('Skipping').' '.$filename.'
');
}
$r->rflush();
}