--- loncom/interface/lonmeta.pm	2009/04/04 13:47:50	1.212.2.5
+++ loncom/interface/lonmeta.pm	2008/12/12 10:01:25	1.219
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.212.2.5 2009/04/04 13:47:50 raeburn Exp $
+# $Id: lonmeta.pm,v 1.219 2008/12/12 10:01:25 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,24 +42,6 @@ use Apache::lonmsg;
 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/($match_domain)/($match_username)/});
@@ -182,7 +164,7 @@ sub evalgraph {
     my $val=int($value*10.+0.5)-10;
     my $output='<table border="0" cellpadding="0" cellspacing="0"><tr>';
     if ($val>=20) {
-	$output.='<td width="20" bgcolor="#555555">'.('&nbsp;' x2).'</td>';
+	$output.='<td width="20" bgcolor="#555555">&nbsp;&nbsp;</td>';
     } else {
         $output.='<td width="'.($val).'" bgcolor="#555555">&nbsp;</td>'.
                  '<td width="'.(20-$val).'" bgcolor="#FF3333">&nbsp;</td>';
@@ -192,7 +174,7 @@ sub evalgraph {
 	$output.='<td width="'.($val-20).'" bgcolor="#33FF33">&nbsp;</td>'.
                  '<td width="'.(40-$val).'" bgcolor="#555555">&nbsp;</td>';
     } else {
-        $output.='<td width="20" bgcolor="#555555">'.('&nbsp;' x2).'</td>';
+        $output.='<td width="20" bgcolor="#555555">&nbsp;&nbsp;</td>';
     }
     $output.='<td> ('.sprintf("%5.2f",$value).') </td></tr></table>';
     return $output;
@@ -573,13 +555,12 @@ sub selectbox {
         $functionref=\&direct;
     }
     my $selout='<select name="'.$name.'">';
-    foreach my $id (@idlist) {
-        $selout.='<option value="'.$id.'"';
-        if ($id eq $value) {
-	    $selout.=' selected="selected">'.&{$functionref}($id).'</option>';
-        } else {
-            $selout.='>'.&{$functionref}($id).'</option>';
-        }
+    foreach (@idlist) {
+        $selout.='<option value=\''.$_.'\'';
+        if ($_ eq $value) {
+	    $selout.=' selected>'.&{$functionref}($_).'</option>';
+	}
+        else {$selout.='>'.&{$functionref}($_).'</option>';}
     }
     return $selout.'</select>';
 }
@@ -812,7 +793,7 @@ sub handler {
 						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri);
     } else {
-        $r->print(&Apache::loncommon::start_page('Catalog Information',
+        $r->print(&Apache::loncommon::start_page('Metadata',
 						 undef,
 						 {'domain' => $resdomain,}));
         &present_uneditable_metadata($r,$uri);
@@ -851,11 +832,11 @@ sub report_bombs {
 ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
-        foreach my $key (sort(keys(%brokenurls))) {
-            if ($key=~/^\Q$uri\E/) {
+        foreach (sort(keys(%brokenurls))) {
+            if ($_=~/^\Q$uri\E/) {
                 $r->print
-                    ('<a href="'.&Apache::lonnet::clutter($key).'">'.$key.'</a>'.
-                     &Apache::lonmsg::retrieve_author_res_msg($key).
+                    ('<a href="'.&Apache::lonnet::clutter($_).'">'.$_.'</a>'.
+                     &Apache::lonmsg::retrieve_author_res_msg($_).
                      '<hr />');
             }
         }
@@ -878,8 +859,8 @@ sub present_uneditable_metadata {
     my $uploaded = ($uri =~ m|/uploaded/|);
     my %content=();
     # Read file
-    foreach my $key (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
-        $content{$key}=&Apache::lonnet::metadata($uri,$key);
+    foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
+        $content{$_}=&Apache::lonnet::metadata($uri,$_);
     }
     # Render Output
     # displayed url
@@ -945,26 +926,22 @@ sub present_uneditable_metadata {
 		   'obsolete', 
 		   'obsoletereplacement');
     }
-    my $rownum = 0;
     foreach my $field (@fields) {
-        my $lastrow = '';
-        $rownum ++;
-        $lastrow = 1 if ($rownum == @fields);
         $table.=&Apache::lonhtmlcommon::row_title($lt{$field})
-                .&prettyprint($field,$content{$field})
-                .&Apache::lonhtmlcommon::row_closure($lastrow);
+               .&prettyprint($field,$content{$field})
+               .&Apache::lonhtmlcommon::row_closure();
         delete($content{$field});
     }
     #
     $r->print("<h2>$title</h2>"
-              .'<p>'
-              .$disuri.'<br />'
-              .$obsoletewarning
-              .$versiondisplay
-              .'</p>'
-              .&Apache::lonhtmlcommon::start_pick_box()
-              .$table
-              .&Apache::lonhtmlcommon::end_pick_box()
+             .'<p>'
+             .$disuri.'<br />'
+             .$obsoletewarning
+             .$versiondisplay
+             .'</p>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .$table
+             .&Apache::lonhtmlcommon::end_pick_box()
     );
     if (!$uploaded && $env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
@@ -993,17 +970,14 @@ sub print_dynamic_metadata {
         exists($dynmeta{'course'})) {
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
                   &Apache::lonhtmlcommon::start_pick_box());
-        my @counts = ('count','sequsage','sequsage_list',
-                      'comefrom','comefrom_list','goto',
-                      'goto_list','course','course_list');
-        my $rownum = 0;
-        foreach my $item (@counts) {
-            my $lastrow = '';
-            $rownum ++;
-            $lastrow = 1 if ($rownum == @counts);
-            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
-                      .&prettyprint($item,$dynmeta{$item})
-                      .&Apache::lonhtmlcommon::row_closure($lastrow)
+        foreach ('count',
+                 'sequsage','sequsage_list',
+                 'comefrom','comefrom_list',
+                 'goto','goto_list',
+                 'course','course_list') {
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                     .&prettyprint($_,$dynmeta{$_})
+                     .&Apache::lonhtmlcommon::row_closure()
             );
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -1023,21 +997,16 @@ sub print_dynamic_metadata {
                       '</h4>'.
                       &Apache::lonhtmlcommon::start_pick_box());
             $r->print(&Apache::lonhtmlcommon::row_title($lt{'stdno'})
-                      .&prettyprint('stdno',$dynmeta{'stdno'})
-                      .&Apache::lonhtmlcommon::row_closure()
+                     .&prettyprint('stdno',$dynmeta{'stdno'})
+                     .&Apache::lonhtmlcommon::row_closure()
             );
-            my @stats = ('avetries','difficulty','disc');
-            my $rownum = 0;
-            foreach my $item (@stats) {
-                my $lastrow = '';
-                $rownum ++;
-                $lastrow = 1 if ($rownum == @stats);
-                $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
-                          .&prettyprint($item,sprintf('%5.2f',$dynmeta{$item}))
-                          .&Apache::lonhtmlcommon::row_closure($lastrow)
+            foreach ('avetries','difficulty','disc') {
+                $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                         .&prettyprint($_,sprintf('%5.2f',$dynmeta{$_}))
+                         .&Apache::lonhtmlcommon::row_closure()
                 );
             }
-            $r->print(&Apache::lonhtmlcommon::end_pick_box());    
+            $r->print(&Apache::lonhtmlcommon::end_pick_box());
         }
         if (exists($dynmeta{'stats'})) {
             #
@@ -1046,15 +1015,15 @@ sub print_dynamic_metadata {
                       &mt('Recent Detailed Assessment Statistical Data').
                       '</h4>');
             my $table=&Apache::loncommon::start_data_table()
-                      .&Apache::loncommon::start_data_table_header_row()
-                      .'<th>'.&mt('Course').'</th>'
-                      .'<th>'.&mt('Section(s)').'</th>'
-                      .'<th>'.&mt('Num Student').'s</th>'
-                      .'<th>'.&mt('Mean Tries').'</th>'
-                      .'<th>'.&mt('Degree of Difficulty').'</th>'
-                      .'<th>'.&mt('Degree of Discrimination').'</th>'
-                      .'<th>'.&mt('Time of computation').'</th>'
-                      .&Apache::loncommon::end_data_table_header_row().$/;
+                     .&Apache::loncommon::start_data_table_header_row()
+                     .'<th>'.&mt('Course').'</th>'
+                     .'<th>'.&mt('Section(s)').'</th>'
+                     .'<th>'.&mt('Num Students').'</th>'
+                     .'<th>'.&mt('Mean Tries').'</th>'
+                     .'<th>'.&mt('Degree of Difficulty').'</th>'
+                     .'<th>'.&mt('Degree of Discrimination').'</th>'
+                     .'<th>'.&mt('Time of computation').'</th>'
+                     .&Apache::loncommon::end_data_table_header_row().$/;
             foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
                 my $data = $dynmeta{'stats'}->{$identifier};
                 my $course = $data->{'course'};
@@ -1072,10 +1041,10 @@ sub print_dynamic_metadata {
                     '<td align="right">'.$data->{'sections'}.'</td>';
                 $table .=
                     '<td align="right">'.$data->{'stdno'}.'</td>';
-                foreach my $item ('avetries','difficulty','disc') {
+                foreach ('avetries','difficulty','disc') {
                     $table .= '<td align="right">';
-                    if (exists($data->{$item})) {
-                        $table .= sprintf('%.2f',$data->{$item}).'&nbsp;';
+                    if (exists($data->{$_})) {
+                        $table .= sprintf('%.2f',$data->{$_}).'&nbsp;';
                     } else {
                         $table .= '';
                     }
@@ -1107,15 +1076,10 @@ sub print_dynamic_metadata {
         exists($dynmeta{'technical'})){ 
         $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
                   &Apache::lonhtmlcommon::start_pick_box());
-        my @criteria = ('clear','depth','helpful','correct','technical');
-        my $rownum = 0;
-        foreach my $item (@criteria) {
-            my $lastrow = '';
-            $rownum ++;
-            $lastrow = 1 if ($rownum == @criteria);
-            $r->print(&Apache::lonhtmlcommon::row_title($lt{$item})
-                      .&prettyprint($item,$dynmeta{$item})
-                      .&Apache::lonhtmlcommon::row_closure($lastrow)
+        foreach ('clear','depth','helpful','correct','technical') {
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                     .&prettyprint($_,$dynmeta{$_})
+                     .&Apache::lonhtmlcommon::row_closure()
             );
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -1148,39 +1112,30 @@ sub print_dynamic_metadata {
               &mt('Additional Metadata (non-standard, parameters, exports)').
               '</h3>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
-    my @names;
-    foreach my $key (sort(keys(%content))) {
-        if ($key!~/\.display$/) {
-            push(@names,$key);
-        }
-    }
-    if (@names > 0) {
-        my $rownum = 0;
-        foreach my $name (@names) {
-            my $lastrow = '';
-            $rownum ++;
-            $lastrow = 1 if ($rownum == @names);
-
+    foreach (sort(keys(%content))) {
+        my $name=$_;
+        if ($name!~/\.display$/) {
             my $display=&Apache::lonnet::metadata($uri,
                                                   $name.'.display');
             if (! $display) { 
                 $display=$name;
             };
             my $otherinfo='';
-            foreach my $item ('name','part','type','default') {
+            foreach ('name','part','type','default') {
                 if (defined(&Apache::lonnet::metadata($uri,
-                                                      $name.'.'.$item))) {
-                    $otherinfo.=' '.$item.'='.
+                                                      $name.'.'.$_))) {
+                    $otherinfo.=' '.$_.'='.
                         &Apache::lonnet::metadata($uri,
-                                                  $name.'.'.$item).'; ';
+                                                  $name.'.'.$_).'; ';
                 }
             }
             $r->print(&Apache::lonhtmlcommon::row_title($display)
-                      .$content{$name});
+                     .$content{$name}
+            );
             if ($otherinfo) {
                 $r->print(' ('.$otherinfo.')');
             }
-            $r->print(&Apache::lonhtmlcommon::row_closure($lastrow));
+            $r->print(&Apache::lonhtmlcommon::row_closure());
         }
     }
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -1255,11 +1210,11 @@ ENDDEL
 	}
 	$r->print('<br />'.$bombs);
     } else {
-        my $displayfile=&mt('Catalog Information for [_1]',$disuri);
+        my $displayfile=&mt('Metadata for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
-            $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir);
+            $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
@@ -1422,8 +1377,8 @@ ENDEDIT
             my ($outcome,$result) = &store_metadata($fn,$uri,'store');
             $r->print($result);
 	}
-	$r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Save Catalog Information').'" />');
+	$r->print($output.'<br /><input type="submit" title="'.&mt('Save Metadata').'" name="store" value="'.
+                  &mt('Save').'" />');
 
 	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
 	    my ($port_path,$group) = &get_port_path_and_group($uri);
@@ -1588,3 +1543,95 @@ sub update_metadata_table {
 1;
 __END__
 
+
+=head1 NAME
+
+Apache::lonmeta - display meta data
+
+=head1 SYNOPSIS
+
+Handler to display meta data
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item &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}
+
+=item dynamicmeta()
+
+Fetch and evaluate dynamic metadata
+
+=item access_count()
+
+=item alttag()
+
+Try to make an alt tag if there is none
+
+=item authordisplay()
+
+Author display
+
+=item evalgraph()
+
+Pretty display
+
+=item diffgraph()
+
+=item fieldnames()
+
+=item portfolio_linked_path()
+
+=item get_port_path_and_group()
+
+=item portfolio_display_uri()
+
+=item pre_select_course()
+
+=item select_course()
+
+=item prettyprint()
+
+Pretty printing of metadata field
+
+=item direct()
+
+Pretty input of metadata field
+
+=item selectbox()
+
+=item relatedfield()
+
+=item prettyinput()
+
+=item report_bombs()
+
+=item present_uneditable_metadata()
+
+=item present_editable_metadata()
+
+=item store_metadata()
+
+=item store_transferred_addedfields()
+
+=item store_portfolio_metadata()
+
+=item update_metadata_table()
+
+=back
+
+=cut