--- loncom/interface/lonmeta.pm 2004/04/14 20:45:14 1.70 +++ loncom/interface/lonmeta.pm 2004/06/16 14:30:15 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.70 2004/04/14 20:45:14 matthew Exp $ +# $Id: lonmeta.pm,v 1.79 2004/06/16 14:30:15 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -114,21 +114,21 @@ sub evalgraph { return ''; } my $val=int($value*10.+0.5)-10; - my $output=''; + my $output='
'; if ($val>=20) { - $output.=''; + $output.=''; } else { - $output.=''. - ''; + $output.=''. + ''; } $output.=''; if ($val>20) { - $output.=''. - ''; + $output.=''. + ''; } else { - $output.=''; + $output.=''; } - $output.='
                  ('.$value.')
'; + $output.=' ('.sprintf("%5.2f",$value).') '; return $output; } @@ -140,15 +140,15 @@ sub diffgraph { my $val=int(40.0*$value+0.5); my @colors=('#FF9933','#EEAA33','#DDBB33','#CCCC33', '#BBDD33','#CCCC33','#DDBB33','#EEAA33'); - my $output=''; + my $output='
'; for (my $i=0;$i<8;$i++) { if ($val>$i*5) { - $output.=''; + $output.=''; } else { - $output.=''; + $output.=''; } } - $output.='
     ('.$value.')
'; + $output.=' ('.sprintf("%3.2f",$value).') '; return $output; } @@ -175,6 +175,8 @@ sub fieldnames { 'owner' => 'Publisher/Owner', 'copyright' => 'Copyright/Distribution', 'customdistributionfile' => 'Custom Distribution File', + 'sourceavail' => 'Source Availible', + 'sourcerights' => 'Source Custom Distribution File', 'obsolete' => 'Obsolete', 'obsoletereplacement' => 'Suggested Replacement for Obsolete File', 'count' => 'Network-wide number of accesses (hits)', @@ -193,7 +195,8 @@ sub fieldnames { 'technical' => 'Resource is technically correct', 'avetries' => 'Average number of tries till solved', 'stdno' => 'Total number of students who have worked on this problem', - 'difficulty' => 'Degree of difficulty' + 'difficulty' => 'Degree of difficulty', + 'disc' => 'Degree of discrimination', ); } @@ -223,6 +226,10 @@ sub prettyprint { if ($type eq 'copyright') { return &Apache::loncommon::copyrightdescription($value); } + # Copyright + if ($type eq 'sourceavail') { + return &Apache::loncommon::source_copyrightdescription($value); + } # MIME if ($type eq 'mime') { return ' '. @@ -253,7 +260,22 @@ sub prettyprint { ($type eq 'sequsage_list')) { return join('
',map { my $url = &Apache::lonnet::clutter($_); - $_ = ''.&Apache::lonnet::gettitle($url).' '. + my $title = &Apache::lonnet::gettitle($url); + if ($title eq '') { + $title = 'Untitled'; + if ($url =~ /\.sequence$/) { + $title .= ' Sequence'; + } elsif ($url =~ /\.page$/) { + $title .= ' Page'; + } elsif ($url =~ /\.problem$/) { + $title .= ' Problem'; + } elsif ($url =~ /\.html$/) { + $title .= ' HTML document'; + } elsif ($url =~ m:/syllabus$:) { + $title .= ' Syllabus'; + } + } + $_ = ''.$title.' '. ''. ''.$url.''. '' @@ -268,17 +290,24 @@ sub prettyprint { return &evalgraph($value); } # Difficulty - if ($type eq 'difficulty') { + if ($type eq 'difficulty' || $type eq 'disc') { return &diffgraph($value); } # List of courses if ($type=~/\_list/) { - return join('
',map { - my %courseinfo=&Apache::lonnet::coursedescription($_); - ''. - $courseinfo{'description'}.''; - } split(/\s*\,\s*/,$value)); + my @Courses = split(/\s*\,\s*/,$value); + my $Str; + foreach my $course (@Courses) { + my %courseinfo = &Apache::lonnet::coursedescription($course); + if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') { + next; + } + if ($Str ne '') { $Str .= '
'; } + $Str .= ''. + $courseinfo{'description'}.''; + } + return $Str; } # No pretty print found return $value; @@ -322,7 +351,10 @@ sub relatedfield { sub prettyinput { my ($type,$value,$fieldname,$formname, - $relatedsearchflag,$relatedsep,$relatedvalue)=@_; + $relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_; + if (! defined($size)) { + $size = 80; + } # Language if ($type eq 'language') { return &selectbox($fieldname, @@ -339,6 +371,14 @@ sub prettyinput { (&Apache::loncommon::copyrightids)). &relatedfield(0,$relatedsearchflag,$relatedsep); } + # Source Copyright + if ($type eq 'sourceavail') { + return &selectbox($fieldname, + $value, + \&Apache::loncommon::source_copyrightdescription, + (&Apache::loncommon::source_copyrightids)). + &relatedfield(0,$relatedsearchflag,$relatedsep); + } # Gradelevels if (($type eq 'lowestgradelevel') || ($type eq 'highestgradelevel')) { @@ -367,6 +407,14 @@ sub prettyinput { ",'rights')\">".&mt('Select').''. &relatedfield(0,$relatedsearchflag,$relatedsep); } + # Source Customdistribution file + if ($type eq 'sourcerights') { + return '".&mt('Select').''. + &relatedfield(0,$relatedsearchflag,$relatedsep); + } # Dates if (($type eq 'creationdate') || ($type eq 'lastrevisiondate')) { @@ -378,9 +426,9 @@ sub prettyinput { $value=~s/^\s+//gs; $value=~s/\s+$//gs; $value=~s/\s+/ /gs; - $value=~s/\"/\&quod\;/gs; + $value=~s/\"/\"\;/gs; return - ''. &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname, $relatedvalue); @@ -392,26 +440,13 @@ sub handler { # my $uri=$r->uri; # - # Check to see if this server is overloaded - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { - return $loaderror; - } - # - # Check to see if original resource server is overloaded - my ($resdomain,$resuser)= - (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); - $loaderror=&Apache::lonnet::overloaderror - ($r,&Apache::lonnet::homeserver($resuser,$resdomain)); - if ($loaderror) { - return $loaderror; - } - # # Set document type &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; # + my ($resdomain,$resuser)= + (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); $r->print(''. 'Catalog Information'. ''); @@ -496,8 +531,9 @@ sub present_uneditable_metadata { } else { $versiondisplay='Version: '.$currentversion; } - # crumbify displayed URL - $disuri=&Apache::lonhtmlcommon::crumbs($disuri); + # crumbify displayed URL uri target prefix form size + $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1'); + $disuri =~ s:
::g; # obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; @@ -509,6 +545,10 @@ sub present_uneditable_metadata { # my %lt=&fieldnames(); my $table=''; + my $title = $content{'title'}; + if (! defined($title)) { + $title = 'Untitled Resource'; + } foreach ('title', 'author', 'subject', @@ -524,7 +564,9 @@ sub present_uneditable_metadata { 'lastrevisiondate', 'owner', 'copyright', - 'customdistributionfile', + 'customdistributionfile', + 'sourceavail', + 'sourcerights', 'obsolete', 'obsoletereplacement') { $table.=''.$lt{$_}. @@ -534,10 +576,12 @@ sub present_uneditable_metadata { } # $r->print(<$content{'title'} -

$disuri

+

$title

+

+$disuri
$obsoletewarning -$versiondisplay
+$versiondisplay +

$table
@@ -584,23 +628,88 @@ sub print_dynamic_metadata { } # # Assessment statistics - if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/ && - (exists($dynmeta{'stdno'}) || - exists($dynmeta{'avetries'}) || - exists($dynmeta{'difficulty'}))) { - # This is an assessment, print assessment data - $r->print( - '

'.&mt('Assessment Statistical Data').'

'. - ''); - foreach ('stdno','avetries','difficulty') { - $r->print(''. + if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) { + if (exists($dynmeta{'stdno'}) || + exists($dynmeta{'avetries'}) || + exists($dynmeta{'difficulty'}) || + exists($dynmeta{'disc'})) { + # This is an assessment, print assessment data + $r->print('

'. + &mt('Overall Assessment Statistical Data'). + '

'. + '
'.$lt{$_}.'
'); + $r->print(''. '\n"); + &prettyprint('stdno',$dynmeta{'stdno'}). + ''."\n"); + foreach ('avetries','difficulty','disc') { + $r->print(''. + ''."\n"); + } + $r->print('
'.$lt{'stdno'}.''. - &prettyprint($_,$dynmeta{$_})."
'.$lt{$_}.''. + &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})). + '
'); + } + if (exists($dynmeta{'stats'})) { + # + # New assessment statistics + $r->print('

'. + &mt('Detailed Assessment Statistical Data'). + '

'); + my $table = ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''.$/; + foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) { + my $data = $dynmeta{'stats'}->{$identifier}; + my $course = $data->{'course'}; + my %courseinfo = &Apache::lonnet::coursedescription($course); + if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') { + &Apache::lonnet::logthis('lookup for '.$course.' failed'); + next; + } + $table .= ''; + $table .= + ''; + $table .= + ''; + $table .= + ''; + foreach ('avetries','difficulty','disc') { + $table .= ''; + } + $table .= + ''; + $table .= + ''.$/; + } + $table .= '
CourseSection(s)Num StudentsMean TriesDegree of DifficultyDegree of DiscriminationTime of computation
'.$courseinfo{'description'}.''.$data->{'sections'}.''.$data->{'stdno'}.''; + if (exists($data->{$_})) { + $table .= sprintf('%.2f',$data->{$_}).' '; + } else { + $table .= ''; + } + $table .= ''. + &Apache::lonlocal::locallocaltime($data->{'timestamp'}). + '
'.$/; + $r->print($table); + } else { + $r->print('No new dynamic data found.'); } - $r->print(''); } else { - $r->print('

'.&mt('No Assessment Statistical Data is available for this resource').'

'); + $r->print('

'. + &mt('No Assessment Statistical Data is available for this resource'). + '

'); } + + # + # if (exists($dynmeta{'clear'}) || exists($dynmeta{'depth'}) || exists($dynmeta{'helpful'}) || @@ -730,7 +839,7 @@ ENDEDIT foreach ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', 'standards', - 'lowestgradelevel','highestgradelevel', + 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', 'obsolete','obsoletereplacement') { if (defined($ENV{'form.new_'.$_})) { $Apache::lonpublisher::metadatafields{$_}=