--- loncom/interface/lonmeta.pm	2003/04/12 15:57:30	1.29
+++ loncom/interface/lonmeta.pm	2003/07/15 19:04:31	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.29 2003/04/12 15:57:30 www Exp $
+# $Id: lonmeta.pm,v 1.33 2003/07/15 19:04:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,8 +51,9 @@ sub dynamicmeta {
     $regexp='___'.$regexp.'___';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
 				       $aauthor,$regexp);
-    my %sum;
-    my %cnt;
+    my %sum=();
+    my %cnt=();
+    my %concat=();
     my %listitems=('count'        => 'add',
                    'course'       => 'add',
                    'goto'         => 'add',
@@ -69,21 +70,24 @@ sub dynamicmeta {
                    'usage'        => 'cnt'
                    );
     foreach (keys %evaldata) {
-	$_=~/___(\w+)$/;
-        if (defined($cnt{$1})) { $cnt{$1}++; } else { $cnt{$1}=1; }
-        unless ($listitems{$1} eq 'app') {
-            if (defined($sum{$1})) {
-               $sum{$1}+=$evaldata{$_};
+	my ($item,$purl,$cat)=split(/\_\_\_/,$_);
+###	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{$_};
+               $concat{$cat}.=','.$item;
 	    } else {
-               $sum{$1}=$evaldata{$_};
+               $sum{$cat}=$evaldata{$_};
+               $concat{$cat}=$item;
 	    }
         } else {
-            if (defined($sum{$1})) {
+            if (defined($sum{$cat})) {
                if ($evaldata{$_}) {
-                  $sum{$1}.='<hr>'.$evaldata{$_};
+                  $sum{$cat}.='<hr>'.$evaldata{$_};
 	       }
  	    } else {
-	       $sum{$1}=''.$evaldata{$_};
+	       $sum{$cat}=''.$evaldata{$_};
 	    }
 	}
     }
@@ -96,6 +100,8 @@ sub dynamicmeta {
        } else {
            $returnhash{$_}=$sum{$_};
        }
+       $returnhash{$_.'_list'}=$concat{$_};
+### print "\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'};
     }
     return %returnhash;
 }
@@ -284,6 +290,7 @@ ENDHEAD
   delete($content{'lastrevisiondate'});
   delete($content{'owner'});
   delete($content{'copyright'});
+  delete($content{'customdistributionfile'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
    $r->print(
@@ -293,6 +300,8 @@ ENDHEAD
  'count'      => 'Network-wide number of accesses (hits)',
  'course'     => 'Network-wide number of courses using resource',
  'usage'      => 'Number of resources using or importing resource',
+ 'goto'       => 'Number of resources that follow this resource in maps',
+ 'comefrom'   => 'Number of resources that lead up to this resource in maps',
  'clear'      => 'Material presented in clear way',
  'depth'      => 'Material covered with sufficient depth',
  'helpful'    => 'Material is helpful',
@@ -304,11 +313,31 @@ ENDHEAD
    my %dynmeta=&dynamicmeta($uri);
    $r->print(
 '</table><h4>Access and Usage Statistics</h4><table cellspacing=2 border=0>');
-   foreach ('count','usage','course') {
+   foreach ('count') {
        $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
 $dynmeta{$_}."&nbsp;</td></tr>\n");
    }
+   foreach my $cat ('usage','comefrom','goto') {
+       $r->print(
+'<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.
+$dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",
+      map { my $murl=$_; 
+ '<li><a href="'.&Apache::lonnet::clutter($murl).'" target="preview">'.
+                        &Apache::lonnet::gettitle($murl).' [<tt>'.$murl
+                        .'</tt>]</a></li>' }
+      split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");
+   }
+   foreach my $cat ('course') {
+       $r->print(
+'<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.
+$dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",
+      map { my %courseinfo=&Apache::lonnet::coursedescription($_);  
+ '<li><a href="/public/'.
+  $courseinfo{'domain'}.'/'.$courseinfo{'num'}.'/syllabus" target="preview">'.
+  $courseinfo{'description'}.'</a></li>' }
+      split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");
+   }
        $r->print('</table>');
    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
       $r->print(
@@ -354,20 +383,22 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
  '<h3>Additional Metadata (non-standard, parameters, exports)</h3>');
    foreach (sort keys %content) {
       my $name=$_;
-      my $display=&Apache::lonnet::metadata($uri,$name.'.display');
-      unless ($display) { $display=$name; };
-      my $otherinfo='';
-      foreach ('name','part','type','default') {
-          if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
-             $otherinfo.=' '.$_.'='.
-		 &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
-          }
+      unless ($name=~/\.display$/) {
+	  my $display=&Apache::lonnet::metadata($uri,$name.'.display');
+	  unless ($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.')');
+	  }
+	  $r->print("<br>\n");
       }
-      $r->print('<b>'.$display.':</b> '.$content{$name});
-      if ($otherinfo) {
-         $r->print(' ('.$otherinfo.')');
-      }
-      $r->print("<br>\n");
    }
   }
 # ===================================================== End Resource Space Call
@@ -406,9 +437,20 @@ ENDEDIT
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }
-       $r->print(
-         &Apache::lonpublisher::textfield($_,'new_'.$_,
-                                 $Apache::lonpublisher::metadatafields{$_}));
+       if (m/copyright/) {
+	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
+			       $Apache::lonpublisher::metadatafields{$_},
+			       \&Apache::loncommon::copyrightdescription,
+			       (&Apache::loncommon::copyrightids)));
+       } elsif (m/language/) {
+	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
+			      $Apache::lonpublisher::metadatafields{$_},
+			      \&Apache::loncommon::languagedescription,
+			      (&Apache::loncommon::languageids)));
+       } else {
+	   $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_,
+			     $Apache::lonpublisher::metadatafields{$_}));
+       }
    }
    if ($ENV{'form.store'}) {
       my $mfh;