--- loncom/interface/lonmeta.pm	2003/12/31 02:33:27	1.52
+++ loncom/interface/lonmeta.pm	2004/04/12 21:13:13	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.52 2003/12/31 02:33:27 www Exp $
+# $Id: lonmeta.pm,v 1.63 2004/04/12 21:13:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package Apache::lonmeta;
 
 use strict;
+use LONCAPA::lonmetadata();
 use Apache::Constants qw(:common);
 use Apache::lonnet();
 use Apache::loncommon();
@@ -54,66 +55,15 @@ sub dynamicmeta {
     $regexp='___'.$regexp.'___';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
 				       $aauthor,$regexp);
-    my %sum=();
-    my %cnt=();
-    my %concat=();
-    my %listitems=(
-                   'course'       => 'add',
-                   'goto'         => 'add',
-                   'comefrom'     => 'add',
-                   'avetries'     => 'avg',
-                   'stdno'        => 'add',
-                   'difficulty'   => 'avg',
-                   'clear'        => 'avg',
-                   'technical'    => 'avg',
-                   'helpful'      => 'avg',
-                   'correct'      => 'avg',
-                   'depth'        => 'avg',
-                   'comments'     => 'app',
-                   'usage'        => 'cnt'
-                   );
-    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{$_};
-               $concat{$cat}.=','.$item;
-	    } else {
-               $sum{$cat}=$evaldata{$_};
-               $concat{$cat}=$item;
-	    }
-        } else {
-            if (defined($sum{$cat})) {
-               if ($evaldata{$_}) {
-                  $sum{$cat}.='<hr />'.$evaldata{$_};
-	       }
- 	    } else {
-	       $sum{$cat}=''.$evaldata{$_};
-	    }
-	}
-    }
-    my %returnhash=();
-    while ($_=each(%cnt)) {
-       if ($listitems{$_} eq 'avg') {
-	   $returnhash{$_}=int(($sum{$_}/$cnt{$_})*100.0+0.5)/100.0;
-       } elsif ($listitems{$_} eq 'cnt') {
-           $returnhash{$_}=$cnt{$_};
-       } else {
-           $returnhash{$_}=$sum{$_};
-       }
-       $returnhash{$_.'_list'}=$concat{$_};
-       ### Apache->request->print("\n<hr />".$_.': '.$returnhash{$_}.'<br />'.$returnhash{$_.'_list'});
-    }
+    my %DynamicData = &LONCAPA::lonmetadata::process_reseval_data(\%evaldata);
+    my %Data = &LONCAPA::lonmetadata::process_dynamic_metadata($url,
+                                                               \%DynamicData);
     #
     # Deal with 'count' separately
-    $returnhash{'count'} = &access_count($url,$aauthor,$adomain);
+    $Data{'count'} = &access_count($url,$aauthor,$adomain);
     # since "usage" is reserved word in MySQL ...
-    $returnhash{'sequsage'}=$returnhash{'usage'};
-    $returnhash{'sequsage_list'}=$returnhash{'usage_list'};
 
-    return %returnhash;
+    return %Data;
 }
 
 sub access_count {
@@ -212,6 +162,8 @@ sub fieldnames {
     return &Apache::lonlocal::texthash(
 				   'title' => 'Title',
 				   'author' =>'Author(s)',
+				   'authorspace' => 'Author Space',
+				   'modifyinguser' => 'Last Modifying User',
 				   'subject' => 'Subject',
 				   'keywords' => 'Keyword(s)',
 				   'notes' => 'Notes',
@@ -260,8 +212,9 @@ sub prettyprint {
 # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
-	return &Apache::lonlocal::locallocaltime(
-			  &Apache::lonmysql::unsqltime($value));
+	return ($value?&Apache::lonlocal::locallocaltime(
+			  &Apache::lonmysql::unsqltime($value)):
+		&mt('not available'));
     }
 # Language
     if ($type eq 'language') {
@@ -298,8 +251,9 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list')) {
 	return join('<br />',map {
-	       &Apache::lonnet::gettitle($_).' ['.
-	       &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']';
+	       my $url=&Apache::lonnet::clutter($_);
+	       '<b>'.&Apache::lonnet::gettitle($url).'</b>'.
+	       &Apache::lonhtmlcommon::crumbs($url,'preview','',undef,'+0');
 	    } split(/\s*\,\s*/,$value));
     }
 # Evaluations
@@ -328,8 +282,13 @@ sub prettyprint {
 }
 # ============================================== Pretty input of metadata field
 
+sub direct {
+    return shift;
+}
+
 sub selectbox {
     my ($name,$value,$functionref,@idlist)=@_;
+    unless (defined($functionref)) { $functionref=\&direct; }
     my $selout='<select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
@@ -341,59 +300,77 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+sub relatedfield {
+    my ($show,$relatedsearchflag,$relatedsep,$fieldname,$relatedvalue)=@_;
+    unless ($relatedsearchflag) { return ''; }
+    unless (defined($relatedsep)) { $relatedsep=' '; }
+    unless ($show) { return $relatedsep.'&nbsp;'; }
+    return $relatedsep.'<input type="checkbox" name="'.$fieldname.'_related"'.
+	($relatedvalue?' checked="1"':'').' />';
+}
 
 sub prettyinput {
-    my ($type,$value,$fieldname,$formname)=@_;
+    my ($type,$value,$fieldname,$formname,
+	$relatedsearchflag,$relatedsep,$relatedvalue)=@_;
 # Language
     if ($type eq 'language') {
 	return &selectbox($fieldname,
 			  $value,
 			  \&Apache::loncommon::languagedescription,
-			  (&Apache::loncommon::languageids));
+			  (&Apache::loncommon::languageids)).
+	       &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
 # Copyright
     if ($type eq 'copyright') {
 	return &selectbox($fieldname,
 			  $value,
 			  \&Apache::loncommon::copyrightdescription,
-			  (&Apache::loncommon::copyrightids));
+			  (&Apache::loncommon::copyrightids)).
+	       &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
 # Gradelevels
     if (($type eq 'lowestgradelevel') ||
 	($type eq 'highestgradelevel')) {
-	return &Apache::loncommon::select_level_form($value,$fieldname);
+	return &Apache::loncommon::select_level_form($value,$fieldname).
+	       &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
 # Obsolete
     if ($type eq 'obsolete') {
 	return '<input type="checkbox" name="'.$fieldname.'"'.
-	    ($value?' checked="1"':'').' />'; 
+	    ($value?' checked="1"':'').' />'.
+	       &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
 # Obsolete replacement file
     if ($type eq 'obsoletereplacement') {
 	return '<input type="text" name="'.$fieldname.
 	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
 	    "('".$formname."','".$fieldname."'".
-	    ",'')\">".&mt('Select').'</a>'; 
+	    ",'')\">".&mt('Select').'</a>'.
+	       &relatedfield(0,$relatedsearchflag,$relatedsep); 
    }
 # Customdistribution file
     if ($type eq 'customdistributionfile') {
 	return '<input type="text" name="'.$fieldname.
 	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
 	    "('".$formname."','".$fieldname."'".
-	    ",'rights')\">".&mt('Select').'</a>'; 
+	    ",'rights')\">".&mt('Select').'</a>'.
+	       &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
 # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
 	return &Apache::lonhtmlcommon::date_setter($formname,
-						   $fieldname,$value);
+						   $fieldname,$value).
+	       &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
 # No pretty input found
     $value=~s/^\s+//gs;
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
     $value=~s/\"/\&quod\;/gs;
-    return '<input type="text" name="'.$fieldname.'" size="80" value="'.$value.'" />'; 
+    return 
+    '<input type="text" name="'.$fieldname.'" size="80" value="'.$value.'" />'.
+    &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,$relatedvalue); 
 }
 
 # ================================================================ Main Handler
@@ -407,7 +384,30 @@ sub handler {
 
     my $uri=$r->uri;
 
-  unless ($uri=~/^\/\~/) { 
+# ====================================================== Looking for all bombs?
+  if ($uri=~/\/adm\/bombs\/(.*)$/) {
+# ----------------------------------------------------------- Set document type
+      $uri=&Apache::lonnet::declutter($1);
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      
+      return OK if $r->header_only;
+      $r->print(&Apache::loncommon::bodytag('Error Messages'));
+      $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) {
+	      if ($_=~/^\Q$uri\E/) {
+		  $r->print(&Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_)).
+		    &Apache::lonmsg::retrieve_author_res_msg($_).'<hr />');
+	      }
+	  }
+      } else {
+	  $r->print(&mt('Not authorized'));
+      }
+      $r->print('</body></html>');
+  } elsif ($uri!~/^\/\~/) { 
 # =========================================== This is not in construction space
     my ($resdomain,$resuser)=
            (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
@@ -464,7 +464,10 @@ sub handler {
 	     'subject', 
 	     'keywords', 
 	     'notes', 
-	     'abstract', 
+	     'abstract',
+	     'lowestgradelevel',
+	     'highestgradelevel',
+	     'standards', 
 	     'mime', 
 	     'language', 
 	     'creationdate', 
@@ -508,7 +511,7 @@ ENDHEAD
 	       'goto','goto_list',
 	       'course','course_list') {
 	  $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
-		    &prettyprint($dynmeta{$_})."</td></tr>\n");
+		    &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
       }
       $r->print('</table>');
       if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
@@ -517,14 +520,14 @@ ENDHEAD
 		    '<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
 	  foreach ('stdno','avetries','difficulty') {
 	      $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
-			&prettyprint($dynmeta{$_})."</td></tr>\n");
+			&prettyprint($_,$dynmeta{$_})."</td></tr>\n");
 	  }
 	  $r->print('</table>');    
       }
       $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
       foreach ('clear','depth','helpful','correct','technical') {
 	  $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
-		    &prettyprint($dynmeta{$_})."</td></tr>\n");
+		    &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
      }    
       $r->print('</table>');
       $uri=~/^\/res\/(\w+)\/(\w+)\//; 
@@ -626,7 +629,9 @@ ENDEDIT
 	       'copyright','customdistributionfile','language','standards',
 	       'lowestgradelevel','highestgradelevel',
 	       'obsolete','obsoletereplacement') {
-	  $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
+	  if (defined($ENV{'form.new_'.$_})) {
+	      $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
+	  }
 	  unless ($Apache::lonpublisher::metadatafields{'copyright'}) {
 	      $Apache::lonpublisher::metadatafields{'copyright'}='default';
 	  }
@@ -656,7 +661,7 @@ ENDEDIT
 			      print $mfh ' '.$_.'="'.$value.'"';
 			  }
 		      print $mfh '>'.
-			  &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey})
+			  &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey},'<>&"')
 			  .'</'.$tag.'>';
 		  }
 	      }
@@ -666,9 +671,9 @@ ENDEDIT
       $r->print(
 		'<br /><input type="submit" name="store" value="'.
 		&mt('Store Catalog Information').'"></form></body></html>');
+   }
   }
-    return OK;
- }
+  return OK;
 }
 
 # ================================================================= BEGIN Block