--- loncom/interface/lonmeta.pm	2004/04/13 16:03:46	1.66
+++ loncom/interface/lonmeta.pm	2004/06/17 15:05:59	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.66 2004/04/13 16:03:46 matthew Exp $
+# $Id: lonmeta.pm,v 1.81 2004/06/17 15:05:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,9 +40,86 @@ use Apache::lonlocal;
 use Apache::lonmysql;
 use Apache::lonmsg;
 
-# MySQL table columns
 
-my @columns;
+############################################################
+############################################################
+##
+## &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+)/:);
+    if (! defined($authordom)) {
+        $authordom = shift();
+    }
+    if  (! defined($author)) { 
+        $author = shift();
+    }
+    if (! defined($authordom) || ! defined($author)) {
+        return ();
+    }
+    my @Fields = ('url',
+                  'goto','goto_list',
+                  'comefrom','comefrom_list',
+                  'sequsage','sequsage_list',
+                  'stdno','stdno_list',
+                  'avetries','avetries_list',
+                  'difficulty','difficulty_list',
+                  'disc','disc_list',
+                  'clear','technical','correct',
+                  'helpful','depth');
+    #
+    my $query = 'SELECT '.join(',',@Fields).
+        ' FROM metadata WHERE url LIKE "'.$url.'%"';
+    my $server = &Apache::lonnet::homeserver($author,$authordom);
+    my $reply = &Apache::lonnet::metadata_query($query,undef,undef,
+                                                ,[$server]);
+    return () if (! defined($reply) || ref($reply) ne 'HASH');
+    my $filename = $reply->{$server};
+    if (! defined($filename) || $filename =~ /^error/) {
+        return ();
+    }
+    my $max_time = time + 10; # wait 10 seconds for results at most
+    my %ReturnHash;
+    #
+    # Look for results
+    my $finished = 0;
+    while (! $finished && time < $max_time) {
+        my $datafile=$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;
+        if (! -e "$datafile.end") { next; }
+        my $fh;
+        if (!($fh=Apache::File->new($datafile))) { next; }
+        while (my $result = <$fh>) {
+            chomp($result);
+            next if (! $result);
+            my @Data = 
+                map { 
+                    &Apache::lonnet::unescape($_); 
+                } split(',',$result);
+            my $url = $Data[0];
+            for (my $i=0;$i<=$#Fields;$i++) {
+                $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
+            }
+        }
+        $finished = 1;
+    }
+    #
+    return %ReturnHash;
+}
+
 
 # Fetch and evaluate dynamic metadata
 sub dynamicmeta {
@@ -60,6 +137,15 @@ sub dynamicmeta {
     #
     # Deal with 'count' separately
     $Data{'count'} = &access_count($url,$aauthor,$adomain);
+    #
+    # Debugging code I will probably need later
+    if (0) {
+        &Apache::lonnet::logthis('Dynamic Metadata');
+        while(my($k,$v)=each(%Data)){
+            &Apache::lonnet::logthis('    "'.$k.'"=>"'.$v.'"');
+        }
+        &Apache::lonnet::logthis('-------------------');
+    }
     return %Data;
 }
 
@@ -108,21 +194,21 @@ sub evalgraph {
         return '';
     }
     my $val=int($value*10.+0.5)-10;
-    my $output='<table border=0 cellpadding=0 cellspacing=0><tr>';
+    my $output='<table border="0" cellpadding="0" cellspacing="0"><tr>';
     if ($val>=20) {
-	$output.='<td width=20 bgcolor="#555555">&nbsp&nbsp;</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>';
+        $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>';
+	$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 width="20" bgcolor="#555555">&nbsp&nbsp;</td>';
     }
-    $output.='<td> ('.$value.') </td></tr></table>';
+    $output.='<td> ('.sprintf("%5.2f",$value).') </td></tr></table>';
     return $output;
 }
 
@@ -134,30 +220,18 @@ sub diffgraph {
     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>';
+    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>';
+            $output.='<td width="5" bgcolor="'.$colors[$i].'">&nbsp;</td>';
         } else {
-	    $output.='<td width=5 bgcolor="#555555">&nbsp;</td>';
+	    $output.='<td width="5" bgcolor="#555555">&nbsp;</td>';
 	}
     }
-    $output.='<td> ('.$value.') </td></tr></table>';
+    $output.='<td> ('.sprintf("%3.2f",$value).') </td></tr></table>';
     return $output;
 }
 
-#
-# Turn MySQL row into hash
-#     This routine is here for historic reasons.  Probably should be moved to 
-#     a more generic place since it has nothing to do with metadata
-sub metadata_col_to_hash {
-    my @cols=@_;
-    my %hash=();
-    for (my $i=0; $i<=$#columns; $i++) {
-	$hash{$columns[$i]}=$cols[$i];
-    }
-    return %hash;
-}
 
 # The field names
 sub fieldnames {
@@ -181,6 +255,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)',
@@ -199,7 +275,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',
          );
 }
 
@@ -229,6 +306,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 '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
@@ -258,9 +339,26 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list')) {
 	return join('<br />',map {
-            my $url=&Apache::lonnet::clutter($_);
-            '<b>'.&Apache::lonnet::gettitle($url).'</b>'.
-                &Apache::lonhtmlcommon::crumbs($url,'preview','',undef,'+0');
+            my $url = &Apache::lonnet::clutter($_);
+            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';
+                } 
+            }
+            $_ = '<b>'.$title.'</b> '.
+                '<a href="'.$url.'" target="preview">'.
+                '<font size="-1">'.$url.'</font>'.
+                '</a>'
         } split(/\s*\,\s*/,$value));
     }
     # Evaluations
@@ -272,17 +370,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('<br />',map {
-	    my %courseinfo=&Apache::lonnet::coursedescription($_);  
-	    '<a href="/public/'.
-		$courseinfo{'domain'}.'/'.$courseinfo{'num'}.'/syllabus" target="preview">'.
-		$courseinfo{'description'}.'</a>';
-	} 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 .= '<br />'; }
+            $Str .= '<a href="/public/'.$courseinfo{'domain'}.'/'.
+                $courseinfo{'num'}.'/syllabus" target="preview">'.
+                $courseinfo{'description'}.'</a>';
+        }
+	return $Str;
     }
     # No pretty print found
     return $value;
@@ -326,7 +431,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,
@@ -343,6 +451,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')) {
@@ -371,6 +487,14 @@ sub prettyinput {
 	    ",'rights')\">".&mt('Select').'</a>'.
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
+    # Source Customdistribution file
+    if ($type eq 'sourcerights') {
+	return '<input type="text" name="'.$fieldname.
+	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+	    "('".$formname."','".$fieldname."'".
+	    ",'rights')\">".&mt('Select').'</a>'.
+            &relatedfield(0,$relatedsearchflag,$relatedsep); 
+    }
     # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
@@ -382,9 +506,9 @@ sub prettyinput {
     $value=~s/^\s+//gs;
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
-    $value=~s/\"/\&quod\;/gs;
+    $value=~s/\"/\&quot\;/gs;
     return 
-        '<input type="text" name="'.$fieldname.'" size="80" '.
+        '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
         'value="'.$value.'" />'.
         &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
                       $relatedvalue); 
@@ -394,69 +518,78 @@ sub prettyinput {
 sub handler {
     my $r=shift;
     #
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
-    #
     my $uri=$r->uri;
     #
+    # 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('<html><head><title>'.
+              'Catalog Information'.
+              '</title></head>');
     if ($uri=~m:/adm/bombs/(.*)$:) {
+        $r->print(&Apache::loncommon::bodytag('Error Messages'));
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
+        $r->print(&Apache::loncommon::bodytag
+                  ('Edit Catalog Information','','','',$resdomain));
         &present_editable_metadata($r,$uri);
     } else {
+        $r->print(&Apache::loncommon::bodytag
+                  ('Catalog Information','','','',$resdomain));
         &present_uneditable_metadata($r,$uri);
     }
+    $r->print('</body></html>');
     return OK;
 }
 
+#####################################################
+#####################################################
+###                                               ###
+###                Report Bombs                   ###
+###                                               ###
+#####################################################
+#####################################################
 sub report_bombs {
     my ($r,$uri) = @_;
     # Set document type
-    $uri=~ s:/adm/bombs/::;
-    $uri=&Apache::lonnet::declutter($uri);
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    #
-    return OK if $r->header_only;
-    $r->print(&Apache::loncommon::bodytag('Error Messages'));
+    $uri =~ s:/adm/bombs/::;
+    $uri = &Apache::lonnet::declutter($uri);
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
     my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//);
     if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
-        my %brokenurls=&Apache::lonmsg::all_url_author_res_msg($author,
-                                                               $domain);
-        foreach (sort keys %brokenurls) {
+        my %brokenurls = 
+            &Apache::lonmsg::all_url_author_res_msg($author,$domain);
+        foreach (sort(keys(%brokenurls))) {
             if ($_=~/^\Q$uri\E/) {
-                $r->print(&Apache::lonhtmlcommon::crumbs
-                          (&Apache::lonnet::clutter($_)).
-                          &Apache::lonmsg::retrieve_author_res_msg($_).
-                          '<hr />');
+                $r->print
+                    ('<a href="'.&Apache::lonnet::clutter($_).'">'.$_.'</a>'.
+                     &Apache::lonmsg::retrieve_author_res_msg($_).
+                     '<hr />');
             }
         }
     } else {
         $r->print(&mt('Not authorized'));
     }
-    $r->print('</body></html>');
     return;
 }
 
+#####################################################
+#####################################################
+###                                               ###
+###        Uneditable Metadata Display            ###
+###                                               ###
+#####################################################
+#####################################################
 sub present_uneditable_metadata {
     my ($r,$uri) = @_;
-    my ($resdomain,$resuser)=
-        (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    my $loaderror=&Apache::lonnet::overloaderror
-        ($r,
-         &Apache::lonnet::homeserver($resuser,$resdomain));
-    if ($loaderror) { 
-        return $loaderror;
-    }
     #
     my %content=();
-    # Set document type
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
     # Read file
     foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
         $content{$_}=&Apache::lonnet::metadata($uri,$_);
@@ -478,8 +611,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:<br />::g;
     # obsolete
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
@@ -491,8 +625,10 @@ sub present_uneditable_metadata {
     #
     my %lt=&fieldnames();
     my $table='';
-    my $bodytag=&Apache::loncommon::bodytag
-        ('Catalog Information','','','',$resdomain);
+    my $title = $content{'title'};
+    if (! defined($title)) {
+        $title = 'Untitled Resource';
+    }
     foreach ('title', 
              'author', 
              'subject', 
@@ -508,7 +644,9 @@ sub present_uneditable_metadata {
              'lastrevisiondate', 
              'owner', 
              'copyright', 
-             'customdistributionfile', 
+             'customdistributionfile',
+             'sourceavail',
+             'sourcerights', 
              'obsolete', 
              'obsoletereplacement') {
         $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
@@ -518,26 +656,41 @@ sub present_uneditable_metadata {
     }
     #
     $r->print(<<ENDHEAD);
-<html><head><title>Catalog Information</title></head>
-$bodytag
-<h2>$content{'title'}</h2>
-<h3><tt>$disuri</tt></h3>
+<h2>$title</h2>
+<p>
+$disuri<br />
 $obsoletewarning
-$versiondisplay<br />
+$versiondisplay
+</p>
 <table cellspacing=2 border=0>
 $table
 </table>
 ENDHEAD
     if ($ENV{'user.adv'}) {
-        # Dynamic Metadata
-        $r->print(
-                  '<h3>'.&mt('Dynamic Metadata').' ('.
-                  &mt('updated periodically').')</h3>'.&mt('Processing').
-                  ' ...<br />');
-        $r->rflush();
-        my %items=&fieldnames();
-        my %dynmeta=&dynamicmeta($uri);
-        # General Access and Usage Statistics
+        &print_dynamic_metadata($r,$uri,\%content);
+    }
+    return;
+}
+
+sub print_dynamic_metadata {
+    my ($r,$uri,$content) = @_;
+    #
+    my %content = %$content;
+    my %lt=&fieldnames();
+    #
+    my $description = 'Dynamic Metadata (updated periodically)';
+    $r->print('<h3>'.&mt($description).'</h3>'.
+              &mt('Processing'));
+    $r->rflush();
+    my %items=&fieldnames();
+    my %dynmeta=&dynamicmeta($uri);
+    #
+    # General Access and Usage Statistics
+    if (exists($dynmeta{'count'}) ||
+        exists($dynmeta{'sequsage'}) ||
+        exists($dynmeta{'comefrom'}) ||
+        exists($dynmeta{'goto'}) ||
+        exists($dynmeta{'course'})) {
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
                   '<table cellspacing=2 border=0>');
         foreach ('count',
@@ -550,18 +703,98 @@ ENDHEAD
                       &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
         }
         $r->print('</table>');
-        if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
+    } else {
+        $r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
+    }
+    #
+    # Assessment statistics
+    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(
-                      '<h4>'.&mt('Assessment Statistical Data').'</h4>'.
+            $r->print('<h4>'.
+                      &mt('Overall Assessment Statistical Data').
+                      '</h4>'.
                       '<table cellspacing=2 border=0>');
-            foreach ('stdno','avetries','difficulty') {
+            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
+                      '<td bgcolor="#CCCCCC">'.
+                      &prettyprint('stdno',$dynmeta{'stdno'}).
+                      '</td>'."</tr>\n");
+            foreach ('avetries','difficulty','disc') {
                 $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
                           '<td bgcolor="#CCCCCC">'.
-                          &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
+                          &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})).
+                          '</td>'."</tr>\n");
             }
             $r->print('</table>');    
         }
+        if (exists($dynmeta{'stats'})) {
+            #
+            # New assessment statistics
+            $r->print('<h4>'.
+                      &mt('Detailed Assessment Statistical Data').
+                      '</h4>');
+            my $table = '<table cellspacing=2 border=0>'.
+                '<tr>'.
+                '<th>Course</th>'.
+                '<th>Section(s)</th>'.
+                '<th>Num Students</th>'.
+                '<th>Mean Tries</th>'.
+                '<th>Degree of Difficulty</th>'.
+                '<th>Degree of Discrimination</th>'.
+                '<th>Time of computation</th>'.
+                '</tr>'.$/;
+            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 .= '<tr>';
+                $table .= 
+                    '<td><nobr>'.$courseinfo{'description'}.'</nobr></td>';
+                $table .= 
+                    '<td align="right">'.$data->{'sections'}.'</td>';
+                $table .=
+                    '<td align="right">'.$data->{'stdno'}.'</td>';
+                foreach ('avetries','difficulty','disc') {
+                    $table .= '<td align="right">';
+                    if (exists($data->{$_})) {
+                        $table .= sprintf('%.2f',$data->{$_}).'&nbsp;';
+                    } else {
+                        $table .= '';
+                    }
+                    $table .= '</td>';
+                }
+                $table .=
+                    '<td><nobr>'.
+                    &Apache::lonlocal::locallocaltime($data->{'timestamp'}).
+                    '</nobr></td>';
+                $table .=
+                    '</tr>'.$/;
+            }
+            $table .= '</table>'.$/;
+            $r->print($table);
+        } else {
+            $r->print('No new dynamic data found.');
+        }
+    } else {
+        $r->print('<h4>'.
+          &mt('No Assessment Statistical Data is available for this resource').
+                  '</h4>');
+    }
+
+    #
+    #
+    if (exists($dynmeta{'clear'})   || 
+        exists($dynmeta{'depth'})   || 
+        exists($dynmeta{'helpful'}) || 
+        exists($dynmeta{'correct'}) || 
+        exists($dynmeta{'technical'})){ 
         $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
                   '<table cellspacing=2 border=0>');
         foreach ('clear','depth','helpful','correct','technical') {
@@ -570,57 +803,72 @@ ENDHEAD
                       &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
         }
         $r->print('</table>');
-        $uri=~/^\/res\/(\w+)\/(\w+)\//; 
-        if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
-            || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
+    } else {
+        $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
+    }
+    $uri=~/^\/res\/(\w+)\/(\w+)\//; 
+    if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
+        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
+        if (exists($dynmeta{'comments'})) {
             $r->print('<h4>'.&mt('Evaluation Comments').' ('.
                       &mt('visible to author and co-authors only').
                       ')</h4>'.
                       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+        } else {
+            $r->print('<h4>'.&mt('There are no Evaluation Comments on this resource.').'</h4>');
+        }
+        my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
+        if (defined($bombs) && $bombs ne '') {
             $r->print('<a name="bombs" /><h4>'.&mt('Error Messages').' ('.
                       &mt('visible to author and co-authors only').')'.
-                      '</h4>'.
-                      &Apache::lonmsg::retrieve_author_res_msg($uri));
+                      '</h4>'.$bombs);
+        } else {
+            $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
         }
-        # All other stuff
-        $r->print('<h3>'.
-                  &mt('Additional Metadata (non-standard, parameters, exports)').
-                  '</h3>');
-        foreach (sort keys %content) {
-            my $name=$_;
-            if ($name!~/\.display$/) {
-                my $display=&Apache::lonnet::metadata($uri,
-                                                      $name.'.display');
-                if (! $display) { 
-                    $display=$name;
-                };
-                my $otherinfo='';
-                foreach ('name','part','type','default') {
-                    if (defined(&Apache::lonnet::metadata($uri,
-                                                          $name.'.'.$_))) {
-                        $otherinfo.=' '.$_.'='.
-                            &Apache::lonnet::metadata($uri,
-                                                      $name.'.'.$_).'; ';
-                    }
-                }
-                $r->print('<b>'.$display.':</b> '.$content{$name});
-                if ($otherinfo) {
-                    $r->print(' ('.$otherinfo.')');
+    }
+    #
+    # All other stuff
+    $r->print('<h3>'.
+              &mt('Additional Metadata (non-standard, parameters, exports)').
+              '</h3><table border="0" cellspacing="1">');
+    foreach (sort(keys(%content))) {
+        my $name=$_;
+        if ($name!~/\.display$/) {
+            my $display=&Apache::lonnet::metadata($uri,
+                                                  $name.'.display');
+            if (! $display) { 
+                $display=$name;
+            };
+            my $otherinfo='';
+            foreach ('name','part','type','default') {
+                if (defined(&Apache::lonnet::metadata($uri,
+                                                      $name.'.'.$_))) {
+                    $otherinfo.=' '.$_.'='.
+                        &Apache::lonnet::metadata($uri,
+                                                  $name.'.'.$_).'; ';
                 }
-                $r->print("<br />\n");
             }
+            $r->print('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
+            if ($otherinfo) {
+                $r->print(' ('.$otherinfo.')');
+            }
+            $r->print("</font></td></tr>\n");
         }
     }
+    $r->print("</table>");
+    return;
 }
 
+#####################################################
+#####################################################
+###                                               ###
+###          Editable metadata display            ###
+###                                               ###
+#####################################################
+#####################################################
 sub present_editable_metadata {
     my ($r,$uri) = @_;
     # Construction Space Call
-    # Set document type
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    #
-    return OK if $r->header_only;
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
@@ -638,18 +886,12 @@ sub present_editable_metadata {
                 $bombs=&mt('Error deleting messages');
             }
         }
-        my $bodytag=&Apache::loncommon::bodytag('Error Messages');
         my $del=&mt('Delete Messages');
         $r->print(<<ENDBOMBS);
-<html><head><title>Edit Catalog Information</title></head>
-$bodytag
 <h1>$disuri</h1>
 <form method="post" name="defaultmeta">
 <input type="submit" name="delmsg" value="$del" />
 <br />$bombs
-</form>
-</body>
-</html>
 ENDBOMBS
     } else {
         my $displayfile='Catalog Information for '.$disuri;
@@ -678,7 +920,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{$_}=
@@ -701,42 +943,35 @@ ENDEDIT
                           &mt('FAIL').'</font>');
             } else {
                 foreach (sort keys %Apache::lonpublisher::metadatafields) {
-                    if ($_!~/\./) {
-                        my $unikey=$_;
-                        $unikey=~/^([A-Za-z]+)/;
-                        my $tag=$1;
-                        $tag=~tr/A-Z/a-z/;
-                        print $mfh "\n\<$tag";
-                        foreach (split(/\,/,
+                    next if ($_ =~ /\./);
+                    my $unikey=$_;
+                    $unikey=~/^([A-Za-z]+)/;
+                    my $tag=$1;
+                    $tag=~tr/A-Z/a-z/;
+                    print $mfh "\n\<$tag";
+                    foreach (split(/\,/,
                                  $Apache::lonpublisher::metadatakeys{$unikey})
-                                 ) {
-                            my $value=
-                        $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-                            $value=~s/\"/\'\'/g;
-                            print $mfh ' '.$_.'="'.$value.'"';
-                        }
-                        print $mfh '>'.
-                            &HTML::Entities::encode
-                            ($Apache::lonpublisher::metadatafields{$unikey},
-                             '<>&"').
-                             '</'.$tag.'>';
+                             ) {
+                        my $value=
+                         $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+                        $value=~s/\"/\'\'/g;
+                        print $mfh ' '.$_.'="'.$value.'"';
                     }
+                    print $mfh '>'.
+                        &HTML::Entities::encode
+                        ($Apache::lonpublisher::metadatafields{$unikey},
+                         '<>&"').
+                         '</'.$tag.'>';
                 }
                 $r->print('<p>'.&mt('Wrote Metadata'));
             }
         }
         $r->print('<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'"></form>'.
-                  '</body></html>');
+                  &mt('Store Catalog Information').'">');
     }
+    $r->print('</form>');
     return;
 }
 
-# BEGIN Block
-BEGIN {
-    # Get columns of MySQL metadata table
-    @columns=&Apache::lonmysql::col_order('metadata');
-}
-
 1;
 __END__