--- loncom/interface/lonmeta.pm	2003/10/24 14:58:36	1.39
+++ loncom/interface/lonmeta.pm	2003/12/26 21:17:37	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.39 2003/10/24 14:58:36 albertel Exp $
+# $Id: lonmeta.pm,v 1.43 2003/12/26 21:17:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::loncommon();
 use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
+use Apache::lonmysql;
 
 # ----------------------------------------- Fetch and evaluate dynamic metadata
 
@@ -55,7 +56,7 @@ sub dynamicmeta {
     my %sum=();
     my %cnt=();
     my %concat=();
-    my %listitems=('count'        => 'add',
+    my %listitems=(
                    'course'       => 'add',
                    'goto'         => 'add',
                    'comefrom'     => 'add',
@@ -104,9 +105,24 @@ sub dynamicmeta {
        $returnhash{$_.'_list'}=$concat{$_};
        ### Apache->request->print("\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'});
     }
+    #
+    # Deal with 'count' seperately
+    $returnhash{'count'} = &access_count($url,$aauthor,$adomain);
+
     return %returnhash;
 }
 
+sub access_count {
+    my ($src,$author,$adomain) = @_;
+    my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
+                                        $author,$src);
+    if (! exists($countdata{$src})) {
+        return 'Not Available';
+    } else {
+        return $countdata{$src};
+    }
+}
+
 # ------------------------------------- Try to make an alt tag if there is none
 
 sub alttag {
@@ -220,9 +236,9 @@ sub handler {
 # --------------------------------------------------------------- Render Output
   my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
 my $creationdate=&Apache::lonlocal::locallocaltime(
- &Apache::loncommon::unsqltime($content{'creationdate'}));
+ &Apache::lonmysql::unsqltime($content{'creationdate'}));
 my $lastrevisiondate=&Apache::lonlocal::locallocaltime(
- &Apache::loncommon::unsqltime($content{'lastrevisiondate'}));
+ &Apache::lonmysql::unsqltime($content{'lastrevisiondate'}));
 my $language=&Apache::loncommon::languagedescription($content{'language'});
 my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
 my $disuri=&Apache::lonnet::declutter($uri);
@@ -258,6 +274,9 @@ my %lt=&Apache::lonlocal::texthash(
 				   'kw' => 'Keyword(s)',
 				   'no' => 'Notes',
 				   'ab' => 'Abstract',
+                                   'lg' => 'Lowest Grade Level',
+                                   'hg' => 'Highest Grade Level',
+                                   'st' => 'Standards',
 				   'mi' => 'MIME Type',
 				   'la' => 'Language',
 				   'cd' => 'Creation Date',
@@ -287,6 +306,12 @@ $versiondisplay<br />
 <td bgcolor="#CCCCCC">$content{'notes'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>$lt{'ab'}</td>
 <td bgcolor="#CCCCCC">$content{'abstract'}&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'lg'}</td>
+<td bgcolor="#CCCCCC">$content{'lowestgradelevel'}&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'hg'}</td>
+<td bgcolor="#CCCCCC">$content{'highestgradelevel'}&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'st'}</td>
+<td bgcolor="#CCCCCC">$content{'standards'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>$lt{'mi'}</td>
 <td bgcolor="#CCCCCC">$mime ($content{'mime'})&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>$lt{'la'}</td>
@@ -475,7 +500,8 @@ ENDEDIT
        }
        if (m/copyright/) {
 	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
-			       $Apache::lonpublisher::metadatafields{$_},
+			       ($Apache::lonpublisher::metadatafields{$_}?
+				$Apache::lonpublisher::metadatafields{$_}:'default'),
 			       \&Apache::loncommon::copyrightdescription,
 			       (&Apache::loncommon::copyrightids)));
        } elsif (m/language/) {