--- loncom/interface/lonmeta.pm	2003/09/25 22:30:06	1.36
+++ loncom/interface/lonmeta.pm	2003/12/22 21:44:17	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.36 2003/09/25 22:30:06 www Exp $
+# $Id: lonmeta.pm,v 1.41 2003/12/22 21:44:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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 {
@@ -219,9 +234,9 @@ sub handler {
 
 # --------------------------------------------------------------- Render Output
   my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
-my $creationdate=localtime(
+my $creationdate=&Apache::lonlocal::locallocaltime(
  &Apache::loncommon::unsqltime($content{'creationdate'}));
-my $lastrevisiondate=localtime(
+my $lastrevisiondate=&Apache::lonlocal::locallocaltime(
  &Apache::loncommon::unsqltime($content{'lastrevisiondate'}));
 my $language=&Apache::loncommon::languagedescription($content{'language'});
 my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
@@ -234,8 +249,8 @@ my $owner=$content{'owner'};
 $owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
 my $versiondisplay='';
 if ($thisversion) {
-    $versiondisplay='Version: '.$thisversion.
-    ' (most recent version: '.$currentversion.')';
+    $versiondisplay=&mt('Version').': '.$thisversion.
+    ' ('.&mt('most recent version').': '.$currentversion.')';
 } else {
     $versiondisplay='Version: '.$currentversion;
 }
@@ -401,7 +416,8 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
   '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
       $r->print(
-   '<h4>Error Messages (visible to author and co-authors only)</h4>');
+   '<h4>'.&mt('Error Messages').' ('.
+          &mt('visible to author and co-authors only').')</h4>');
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
       foreach (keys %errormsgs) {
 	if ($_=~/^\Q$disuri\E\_\d+$/) {
@@ -454,7 +470,8 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
   if ($disuri=~/\/default$/) {
       my $dir=$disuri;
       $dir=~s/default$//;
-      $displayfile='Default Cataloging Information for Directory '.$dir;
+      $displayfile=&mt('Default Cataloging Information for Directory').' '.
+	  $dir;
   }
   %Apache::lonpublisher::metadatafields=();
   %Apache::lonpublisher::metadatakeys=();
@@ -466,13 +483,15 @@ $bodytag
 <form method="post">
 ENDEDIT
    foreach ('author','title','subject','keywords','abstract','notes',
-            'copyright','customdistributionfile','language') {
+            'copyright','customdistributionfile','language',
+            'obsolete','obsoletereplacement') {
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }
        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/) {
@@ -489,7 +508,8 @@ ENDEDIT
       my $mfh;
       unless ($mfh=Apache::File->new('>'.$fn)) {
             $r->print(
-            '<p><font color=red>Could not write metadata, FAIL</font>');
+            '<p><font color=red>'.&mt('Could not write metadata').', '.
+		      &mt('FAIL').'</font>');
       } else {
           foreach (sort keys %Apache::lonpublisher::metadatafields) {
             unless ($_=~/\./) {
@@ -510,11 +530,12 @@ ENDEDIT
                         .'</'.$tag.'>';
             }
 	  }
-          $r->print('<p>Wrote Metadata');
+          $r->print('<p>'.&mt('Wrote Metadata'));
       }
     }
     $r->print(
- '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');
+ '<br /><input type="submit" name="store" value="'.
+&mt('Store Catalog Information').'"></form></body></html>');
     return OK;
   }
 }