--- loncom/interface/lonmeta.pm 2006/08/28 00:13:22 1.168.2.1
+++ loncom/interface/lonmeta.pm 2014/06/12 12:08:02 1.253
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.168.2.1 2006/08/28 00:13:22 albertel Exp $
+# $Id: lonmeta.pm,v 1.253 2014/06/12 12:08:02 kruse Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,31 +39,12 @@ use Apache::lonpublisher;
use Apache::lonlocal;
use Apache::lonmysql;
use Apache::lonmsg;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
-############################################################
-############################################################
-##
-## &get_dynamic_metadata_from_sql($url)
-##
-## Queries sql database for dynamic metdata
-## Returns a hash of hashes, with keys of urls which match $url
-## Returned fields are given below.
-##
-## Examples:
-##
-## %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
-## ('/res/msu/korte/');
-##
-## $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
-##
-############################################################
-############################################################
sub get_dynamic_metadata_from_sql {
my ($url) = shift();
- my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
+ my ($authordom,$author)=($url=~m{^/res/($match_domain)/($match_username)/});
if (! defined($authordom)) {
$authordom = shift();
}
@@ -95,7 +76,8 @@ sub get_dynamic_metadata_from_sql {
while (my $result = <$fh>) {
chomp($result);
next if (! $result);
- my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash(map { &unescape($_) } split(/\,/,$result));
+ my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash('metadata',
+ map { &unescape($_) } split(/\,/,$result));
foreach my $key (keys(%hash)) {
$ReturnHash{$hash{'url'}}->{$key}=$hash{$key};
}
@@ -111,7 +93,7 @@ sub get_dynamic_metadata_from_sql {
sub dynamicmeta {
my $url=&Apache::lonnet::declutter(shift);
$url=~s/\.meta$//;
- my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
+ my ($adomain,$aauthor)=($url=~/^($match_domain)\/($match_username)\//);
my $regexp=$url;
$regexp=~s/(\W)/\\$1/g;
$regexp='___'.$regexp.'___';
@@ -182,7 +164,7 @@ sub evalgraph {
my $val=int($value*10.+0.5)-10;
my $output='
';
if ($val>=20) {
- $output.='
';
+ $output.='
'.(' ' x2).'
';
} else {
$output.='
'.
'
';
@@ -192,7 +174,7 @@ sub evalgraph {
$output.='
'.
'
';
} else {
- $output.='
';
+ $output.='
'.(' ' x2).'
';
}
$output.='
('.sprintf("%5.2f",$value).')
';
return $output;
@@ -235,13 +217,7 @@ sub fieldnames {
'lowestgradelevel' => 'Lowest Grade Level',
'highestgradelevel' => 'Highest Grade Level');
- if (! defined($file_type) || $file_type ne 'portfolio') {
- %fields =
- (%fields,
- 'courserestricted' => 'Course Restricting Metadata');
- }
-
- if (! defined($file_type) || $file_type ne 'portfolio') {
+ if ( !defined($file_type) || ($file_type ne 'portfolio' && $file_type ne 'groups') ) {
%fields =
(%fields,
'domain' => 'Domain',
@@ -271,7 +247,7 @@ sub fieldnames {
'correct' => 'Material appears to be correct',
'technical' => 'Resource is technically correct',
'avetries' => 'Average number of tries till solved',
- 'stdno' => 'Total number of students who have worked on this problem',
+ 'stdno' => 'Statistics calculated for number of students',
'difficulty' => 'Degree of difficulty',
'disc' => 'Degree of discrimination',
'dependencies' => 'Resources used by this resource',
@@ -362,10 +338,12 @@ sub pre_select_course {
&Apache::lonpublisher::metaeval($result);
}
$r->print('');
my ($port_path,$group) = &get_port_path_and_group($uri);
@@ -373,7 +351,7 @@ sub pre_select_course {
if ($group) {
$group_input = '';
}
- $r->print('
");
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
return;
}
@@ -1106,8 +1294,8 @@ sub print_dynamic_metadata {
#####################################################
#####################################################
sub present_editable_metadata {
- my ($r,$uri, $file_type) = @_;
- # Construction Space Call
+ my ($r,$uri,$file_type) = @_;
+ # Authoring Space Call
# Header
my $disuri=$uri;
my $fn=&Apache::lonnet::filelocation('',$uri);
@@ -1123,92 +1311,159 @@ sub present_editable_metadata {
$target=~s/\.meta$//;
my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
if ($bombs) {
- my $showdel=1;
+ # Display Bombs, not Metadata
+ $r->print(
+ '
'.&mt('Error Messages').'
'
+ .'
'.&mt('Folder: [_1]',
+ ''.$disuri.'')
+ .'
'
+ );
+ my $showbuttons=1;
+ my $message='';
+ my $rc='';
if ($env{'form.delmsg'}) {
- if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
- $bombs=&mt('Messages deleted.');
- $showdel=0;
+ $rc=&Apache::lonmsg::del_url_author_res_msg($target);
+ if ($rc eq 'ok') {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Messages deleted.'));
+ $showbuttons=0;
} else {
- $bombs=&mt('Error deleting messages');
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Error deleting messages'), 1)
+ .' '.&mt('Error: [_1]',$rc);
}
}
if ($env{'form.clearmsg'}) {
my $cleardir=$target;
- $cleardir=~s/\/[^\/]+$/\//;
- if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
- $bombs=&mt('Messages cleared.');
- $showdel=0;
+ $cleardir=~s/\/[^\/]+$/\//; # Extract dir: keep path, remove filename
+ $rc=&Apache::lonmsg::clear_author_res_msg($cleardir);
+ if ($rc eq 'ok') {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Messages cleared.'));
+ $showbuttons=0;
} else {
- $bombs=&mt('Error clearing messages');
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Error clearing messages'),1)
+ .' '.&mt('Error: [_1]',$rc);
}
}
- my $del=&mt('Delete Messages for this Resource');
- my $clear=&mt('Clear all Messages in Subdirectory');
- my $goback=&mt('Back to Source File');
- $r->print(<$disuri
-