--- loncom/interface/lonmeta.pm	2003/10/04 20:49:40	1.38
+++ loncom/interface/lonmeta.pm	2003/12/28 20:12:59	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.38 2003/10/04 20:49:40 www Exp $
+# $Id: lonmeta.pm,v 1.44 2003/12/28 20:12:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,12 +24,7 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 10/19,10/21,10/23,11/27,08/09/01,12/22,12/24,12/25 Gerd Kortemeyer
+
 
 package Apache::lonmeta;
 
@@ -40,6 +35,11 @@ use Apache::loncommon();
 use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
+use Apache::lonmysql;
+
+# MySQL table columns
+
+my @columns;
 
 # ----------------------------------------- Fetch and evaluate dynamic metadata
 
@@ -55,7 +55,7 @@ sub dynamicmeta {
     my %sum=();
     my %cnt=();
     my %concat=();
-    my %listitems=('count'        => 'add',
+    my %listitems=(
                    'course'       => 'add',
                    'goto'         => 'add',
                    'comefrom'     => 'add',
@@ -70,10 +70,10 @@ sub dynamicmeta {
                    'comments'     => 'app',
                    'usage'        => 'cnt'
                    );
-    foreach (keys %evaldata) {
-	my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
-###	print "\n".$_.' - '.$item.'<br />';
-        if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
+    while ($_=each(%evaldata)) {
+	my ($item,$purl,$cat)=split(/___/,$_);
+	### Apache->request->print("\n".$_.' - '.$item.'<br />');
+	if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
         unless ($listitems{$cat} eq 'app') {
             if (defined($sum{$cat})) {
                $sum{$cat}+=$evaldata{$_};
@@ -93,7 +93,7 @@ sub dynamicmeta {
 	}
     }
     my %returnhash=();
-    foreach (keys %cnt) {
+    while ($_=each(%cnt)) {
        if ($listitems{$_} eq 'avg') {
 	   $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
        } elsif ($listitems{$_} eq 'cnt') {
@@ -102,11 +102,26 @@ sub dynamicmeta {
            $returnhash{$_}=$sum{$_};
        }
        $returnhash{$_.'_list'}=$concat{$_};
-### print "\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'};
+       ### 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 {
@@ -175,6 +190,17 @@ sub diffgraph {
     return $output;
 }
 
+# ==================================================== Turn MySQL row into hash
+
+sub metadata_col_to_hash {
+    my @cols=@_;
+    my %hash=();
+    for (my $i=0; $i<=$#columns; $i++) {
+	$hash{$columns[$i]}=$cols[$i];
+    }
+    return %hash;
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -220,9 +246,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 +284,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 +316,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 +510,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/) {
@@ -524,6 +560,11 @@ ENDEDIT
   }
 }
 
+# ================================================================= BEGIN Block
+BEGIN {
+# Get columns of MySQL metadata table
+    @columns=&Apache::lonmysql::col_order('metadata');
+}
 1;
 __END__