--- loncom/publisher/lonpublisher.pm 2003/12/22 21:57:25 1.148 +++ loncom/publisher/lonpublisher.pm 2003/12/27 16:58:36 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Publication Handler # -# $Id: lonpublisher.pm,v 1.148 2003/12/22 21:57:25 albertel Exp $ +# $Id: lonpublisher.pm,v 1.155 2003/12/27 16:58:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,24 +25,6 @@ # # http://www.lon-capa.org/ # -# -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 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 -# 05/03,05/05,05/07 Gerd Kortemeyer -# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer -# 12/04,12/05 Guy Albertelli -# 12/05 Gerd Kortemeyer -# 12/05 Guy Albertelli -# 12/06,12/07 Gerd Kortemeyer -# 12/25 Gerd Kortemeyer -# YEAR=2002 -# 1/17 Gerd Kortemeyer -# ### ############################################################################### @@ -219,9 +201,8 @@ sub metaeval { $newentry=~s/^\s*//; if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; } } - unless ($metadatafields{$unikey}=~/\w/) { - $metadatafields{$unikey}=$newentry; - } +# actually store + $metadatafields{$unikey}=$newentry; } } } @@ -786,7 +767,7 @@ Returns: (error,status). error is undef ######################################### ######################################### sub store_metadata { - my %metadata = %{shift()}; + my %metadata = @_; my $error; # Determine if the table exists my $status = &Apache::lonmysql::check_table('metadata'); @@ -803,17 +784,49 @@ sub store_metadata { &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); + 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=(); +# retrieve current database column names + my @columns=&Apache::lonmysql::col_order('metadata'); +# see if we have old entries + my @oldmeta=&Apache::lonmysql::get_rows('metadata', + "url LIKE BINARY '". + $metadata{'url'}."'"); + if ($#oldmeta==0) { +# there is an old value + for (my $i=0; $i<=$#columns; $i++) { + $newmetadata{$columns[$i]}=$oldmeta[0]->[$i]; + } +# 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'; @@ -977,14 +990,7 @@ 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; -# ----------------------------------------------------------- Parse file itself -# read %metadatafields from file itself - - $allmeta=&parseformeta($source,$style); # ------------------------------------------------ Check out directory hierachy my $thisdisfn=$source; @@ -1001,6 +1007,10 @@ sub publish { $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix); $prefix=~s|^\.\./||; } +# ----------------------------------------------------------- Parse file itself +# read %metadatafields from file itself + + $allmeta=&parseformeta($source,$style); # ------------------- Clear out parameters and stores (there should not be any) @@ -1163,6 +1173,21 @@ END $source=~/\.(\w+)$/; + + $scrout.= + "\n

". + uc(&mt('Lowest Grade Level:')). + "


". + &Apache::loncommon::select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel'). + "\n

". + uc(&mt('Highest Grade Level:')). + "


". + &Apache::loncommon::select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel'). + &textfield('Standards','standards',$metadatafields{'standards'}); + + + + $scrout.=&hiddenfield('mime',$1); my $defaultlanguage=$metadatafields{'language'}; @@ -1180,7 +1205,7 @@ END $metadatafields{'creationdate'}=time; } $scrout.=&hiddenfield('creationdate', - &Apache::loncommon::unsqltime($metadatafields{'creationdate'})); + &Apache::lonmysql::unsqltime($metadatafields{'creationdate'})); $scrout.=&hiddenfield('lastrevisiondate',time); @@ -1338,12 +1363,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'})) { @@ -1357,6 +1388,15 @@ sub phasetwo { $allkeywords=~s/^\,//; $metadatafields{'keywords'}=$allkeywords; +# check if custom distribution file is specified + if ($metadatafields{'copyright'} eq 'custom') { + my $file=$metadatafields{'customdistributionfile'}; + unless ($file=~/\.rights$/) { + return + ''.&mt('No valid custom distribution rights file specified, FAIL'). + ''; + } + } { print $logfile "\nWrite metadata file for ".$source; my $mfh; @@ -1390,21 +1430,16 @@ sub phasetwo { $metadatafields{'url'} = $distarget; $metadatafields{'version'} = 'current'; - unless ($metadatafields{'copyright'} eq 'priv') { - my ($error,$success) = &store_metadata(\%metadatafields); - if ($success) { - $r->print('

'.&mt('Synchronized SQL metadata database').'

'); - print $logfile "\nSynchronized SQL metadata database"; - } else { - $r->print($error); - print $logfile "\n".$error; - } + + my ($error,$success) = &store_metadata(%metadatafields); + if ($success) { + $r->print('

'.&mt('Synchronized SQL metadata database').'

'); + print $logfile "\nSynchronized SQL metadata database"; } else { - $r->print('

'. - &mt('Private Publication - did not synchronize database').'

'); - print $logfile "\nPrivate: Did not synchronize data into ". - "SQL metadata database"; + $r->print($error); + print $logfile "\n".$error; } + # ----------------------------------------------------------- Copy old versions if (-e $target) { @@ -1562,6 +1597,7 @@ sub phasetwo { '">'. &mt('Back to Source Directory').'

'); } + return '

'.&mt('Done').'

'; } ######################################### @@ -1861,8 +1897,8 @@ ENDDIFF my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle); $r->print('
'.$outstring); } else { - $r->print('
'); - &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); + $r->print('
'. + &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); } } $r->print('');