--- loncom/interface/lonmeta.pm	2001/12/24 21:09:08	1.11
+++ loncom/interface/lonmeta.pm	2002/08/26 16:57:11	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.11 2001/12/24 21:09:08 www Exp $
+# $Id: lonmeta.pm,v 1.17 2002/08/26 16:57:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
-# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24 Gerd Kortemeyer
+# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24,12/25 Gerd Kortemeyer
 
 package Apache::lonmeta;
 
@@ -47,8 +47,8 @@ sub dynamicmeta {
     my $regexp=&Apache::lonnet::escape($url);
     $regexp=~s/(\W)/\\$1/g;
     $regexp='___'.$regexp.'___';
-    my %evaldata=&Apache::lonnet::dump
-                                     ('resevaldata',$adomain,$aauthor,$regexp);
+    my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
+				       $aauthor,$regexp);
     my %sum;
     my %cnt;
     my %listitems=('count'        => 'add',
@@ -96,6 +96,48 @@ sub dynamicmeta {
     return %returnhash;
 }
 
+# -------------------------------------------------------------- Pretty display
+
+sub evalgraph {
+    my $value=shift;
+    unless ($value) { return ''; }
+    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&nbsp;</td>';
+    } else {
+        $output.='<td width='.($val).' bgcolor="#555555">&nbsp;</td>'.
+                 '<td width='.(20-$val).' bgcolor="#FF3333">&nbsp;</td>';
+    }
+    $output.='<td bgcolor="#FFFF33">&nbsp;</td>';
+    if ($val>20) {
+	$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&nbsp;</td>';
+    }
+    $output.='<td> ('.$value.') </td></tr></table>';
+    return $output;
+}
+
+sub diffgraph {
+    my $value=shift;
+    unless ($value) { return ''; }
+    my $val=int(40.0*$value+0.5);
+    my @colors=('#FF9933','#EEAA33','#DDBB33','#CCCC33',
+                '#BBDD33','#CCCC33','#DDBB33','#EEAA33');
+    my $output='<table border=0 cellpadding=0 cellspacing=0><tr>';
+    for (my $i=0;$i<8;$i++) {
+	if ($val>$i*5) {
+            $output.='<td width=5 bgcolor="'.$colors[$i].'">&nbsp;</td>';
+        } else {
+	    $output.='<td width=5 bgcolor="#555555">&nbsp;</td>';
+	}
+    }
+    $output.='<td> ('.$value.') </td></tr></table>';
+    return $output;
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -112,16 +154,16 @@ sub handler {
 # ------------------------------------------------------------------- Read file
 
   my $uri=$r->uri;
-  map {
+  foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
       $content{$_}=&Apache::lonnet::metadata($uri,$_);
-  } split(/\,/,&Apache::lonnet::metadata($uri,'keys'));
-
+  }
+  my ($resdomain)=(&Apache::lonnet::declutter($uri)=~/^(\w+)\//);
 # ------------------------------------------------------------------ Hide stuff
 
   unless ($ENV{'user.adv'}) {
-      map {
+      foreach ('keywords','notes','abstract','subject') {
           $content{$_}='<i>- not displayed -</i>';
-      } ('keywords','notes','abstract','subject');
+      }
   }
 
 # --------------------------------------------------------------- Render Output
@@ -132,10 +174,12 @@ my $language=&Apache::loncommon::languag
 my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
 my $disuri=&Apache::lonnet::declutter($uri);
   $disuri=~s/\.meta$//;
+my $bodytag=&Apache::loncommon::bodytag
+            ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);
 <html><head><title>Catalog Information</title></head>
 <body bgcolor="#FFFFFF">
-<h1>Catalog Information</h1>
+$bodytag
 <h2>$content{'title'}</h2>
 <h3><tt>$disuri</tt></h3>
 <table cellspacing=2 border=0>
@@ -177,7 +221,9 @@ ENDHEAD
   delete($content{'copyright'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
-   $r->print('<h3>Dynamic Metadata (updated periodically)</h3>');
+   $r->print(
+   '<h3>Dynamic Metadata (updated periodically)</h3>Processing ...<br>');
+   $r->rflush();
     my %items=(
  'count'      => 'Network-wide number of accesses (hits)',
  'course'     => 'Network-wide number of courses using resource',
@@ -202,18 +248,23 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
       $r->print(
 '<h4>Assessment Statistical Data</h4><table cellspacing=2 border=0>');
-      foreach ('stdno','avetries','difficulty') {
+      foreach ('stdno','avetries') {
           $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
 $dynmeta{$_}."&nbsp;</td></tr>\n");
       }
+      foreach ('difficulty') {
+         $r->print(
+'<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
+&diffgraph($dynmeta{$_})."</td></tr>\n");
+      }
       $r->print('</table>');    
    }
    $r->print('<h4>Evaluation Data</h4><table cellspacing=2 border=0>');
    foreach ('clear','depth','helpful','correct','technical') {
        $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
-$dynmeta{$_}."&nbsp;</td></tr>\n");
+&evalgraph($dynmeta{$_})."</td></tr>\n");
    }    
    $r->print('</table>');
    $disuri=~/^(\w+)\/(\w+)\//;   
@@ -231,12 +282,12 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
       my $display=&Apache::lonnet::metadata($uri,$name.'.display');
       unless ($display) { $display=$name; };
       my $otherinfo='';
-      map {
+      foreach ('name','part','type','default') {
           if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
              $otherinfo.=' '.$_.'='.
 		 &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
           }
-      } ('name','part','type','default'); 
+      }
       $r->print('<b>'.$display.':</b> '.$content{$name});
       if ($otherinfo) {
          $r->print(' ('.$otherinfo.')');

'.$items{$_}.'	'. $dynmeta{$_}."
'.$items{$_}.'	'. +&diffgraph($dynmeta{$_})."