--- loncom/interface/lonmeta.pm	2004/04/15 18:06:29	1.72
+++ loncom/interface/lonmeta.pm	2004/06/16 18:33:46	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.72 2004/04/15 18:06:29 matthew Exp $
+# $Id: lonmeta.pm,v 1.80 2004/06/16 18:33:46 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,88 @@ use Apache::lonmysql;
 use Apache::lonmsg;
 
 
+############################################################
+############################################################
+##
+## &get_dynamic_metadata_from_sql($url)
+## 
+## Queries sql database for dynamic metdata
+## Returns a hash of hashes, with keys of urls which match $url
+## Returned fields are given below.
+##
+## Examples:
+## 
+## %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
+##     ('/res/msu/korte/');
+##
+## $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
+##
+############################################################
+############################################################
+sub get_dynamic_metadata_from_sql {
+    my ($url) = shift();
+    # &Apache::lonnet::logthis('url = '.$url);
+    my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
+    if (! defined($authordom)) {
+        $authordom = shift();
+    }
+    if  (! defined($author)) { 
+        $author = shift();
+    }
+    if (! defined($authordom) || ! defined($author)) {
+        return ();
+    }
+    my @Fields = ('url',
+                  'goto','goto_list',
+                  'comefrom','comefrom_list',
+                  'sequsage','sequsage_list',
+                  'stdno','stdno_list',
+                  'avetries','avetries_list',
+                  'difficulty','difficulty_list',
+                  'disc','disc_list',
+                  'clear','technical','correct',
+                  'helpful','depth');
+    #
+    my $query = 'SELECT '.join(',',@Fields).
+        ' FROM metadata WHERE url LIKE "'.$url.'%"';
+    my $server = &Apache::lonnet::homeserver($author,$authordom);
+    my $reply = &Apache::lonnet::metadata_query($query,undef,undef,
+                                                ,[$server]);
+    return () if (! defined($reply) || ref($reply) ne 'HASH');
+    my $filename = $reply->{$server};
+    if (! defined($filename) || $filename =~ /^error/) {
+        return ();
+    }
+    my $max_time = time + 10; # wait 10 seconds for results at most
+    my %ReturnHash;
+    #
+    # Look for results
+    my $finished = 0;
+    while (! $finished && time < $max_time) {
+        my $datafile=$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;
+        if (! -e "$datafile.end") { next; }
+        my $fh;
+        if (!($fh=Apache::File->new($datafile))) { next; }
+        while (my $result = <$fh>) {
+            chomp($result);
+            next if (! $result);
+            my @Data = 
+                map { 
+                    &Apache::lonnet::unescape($_); 
+                } split(',',$result);
+            my $url = $Data[0];
+            for (my $i=0;$i<=$#Fields;$i++) {
+                $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
+                # &Apache::lonnet::logthis('  '.$Fields[$i].' => '.$Data[$i]);
+            }
+        }
+        $finished = 1;
+    }
+    #
+    return %ReturnHash;
+}
+
+
 # Fetch and evaluate dynamic metadata
 sub dynamicmeta {
     my $url=&Apache::lonnet::declutter(shift);
@@ -175,6 +257,8 @@ sub fieldnames {
          'owner' => 'Publisher/Owner',
          'copyright' => 'Copyright/Distribution',
          'customdistributionfile' => 'Custom Distribution File',
+         'sourceavail' => 'Source Availible',
+         'sourcerights' => 'Source Custom Distribution File',
          'obsolete' => 'Obsolete',
          'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
          'count'      => 'Network-wide number of accesses (hits)',
@@ -193,7 +277,8 @@ sub fieldnames {
          'technical'  => 'Resource is technically correct', 
          'avetries'   => 'Average number of tries till solved',
          'stdno'      => 'Total number of students who have worked on this problem',
-         'difficulty' => 'Degree of difficulty'
+         'difficulty' => 'Degree of difficulty',
+         'disc'       => 'Degree of discrimination',
          );
 }
 
@@ -223,6 +308,10 @@ sub prettyprint {
     if ($type eq 'copyright') {
 	return &Apache::loncommon::copyrightdescription($value);
     }
+    # Copyright
+    if ($type eq 'sourceavail') {
+	return &Apache::loncommon::source_copyrightdescription($value);
+    }
     # MIME
     if ($type eq 'mime') {
         return '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
@@ -283,7 +372,7 @@ sub prettyprint {
 	return &evalgraph($value);
     }
     # Difficulty
-    if ($type eq 'difficulty') {
+    if ($type eq 'difficulty' || $type eq 'disc') {
 	return &diffgraph($value);
     }
     # List of courses
@@ -344,7 +433,10 @@ sub relatedfield {
 
 sub prettyinput {
     my ($type,$value,$fieldname,$formname,
-	$relatedsearchflag,$relatedsep,$relatedvalue)=@_;
+	$relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+    if (! defined($size)) {
+        $size = 80;
+    }
     # Language
     if ($type eq 'language') {
 	return &selectbox($fieldname,
@@ -361,6 +453,14 @@ sub prettyinput {
 			  (&Apache::loncommon::copyrightids)).
                               &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
+    # Source Copyright
+    if ($type eq 'sourceavail') {
+	return &selectbox($fieldname,
+			  $value,
+			  \&Apache::loncommon::source_copyrightdescription,
+			  (&Apache::loncommon::source_copyrightids)).
+                              &relatedfield(0,$relatedsearchflag,$relatedsep);
+    }
     # Gradelevels
     if (($type eq 'lowestgradelevel') ||
 	($type eq 'highestgradelevel')) {
@@ -389,6 +489,14 @@ sub prettyinput {
 	    ",'rights')\">".&mt('Select').'</a>'.
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
+    # Source Customdistribution file
+    if ($type eq 'sourcerights') {
+	return '<input type="text" name="'.$fieldname.
+	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+	    "('".$formname."','".$fieldname."'".
+	    ",'rights')\">".&mt('Select').'</a>'.
+            &relatedfield(0,$relatedsearchflag,$relatedsep); 
+    }
     # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
@@ -400,9 +508,9 @@ sub prettyinput {
     $value=~s/^\s+//gs;
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
-    $value=~s/\"/\&quod\;/gs;
+    $value=~s/\"/\&quot\;/gs;
     return 
-        '<input type="text" name="'.$fieldname.'" size="80" '.
+        '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
         'value="'.$value.'" />'.
         &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
                       $relatedvalue); 
@@ -414,26 +522,13 @@ sub handler {
     #
     my $uri=$r->uri;
     #
-    # Check to see if this server is overloaded
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { 
-        return $loaderror;
-    }
-    #
-    # Check to see if original resource server is overloaded
-    my ($resdomain,$resuser)=
-        (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    $loaderror=&Apache::lonnet::overloaderror
-        ($r,&Apache::lonnet::homeserver($resuser,$resdomain));
-    if ($loaderror) { 
-        return $loaderror;
-    }
-    #
     # Set document type
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
     #
+    my ($resdomain,$resuser)=
+        (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
     $r->print('<html><head><title>'.
               'Catalog Information'.
               '</title></head>');
@@ -551,7 +646,9 @@ sub present_uneditable_metadata {
              'lastrevisiondate', 
              'owner', 
              'copyright', 
-             'customdistributionfile', 
+             'customdistributionfile',
+             'sourceavail',
+             'sourcerights', 
              'obsolete', 
              'obsoletereplacement') {
         $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
@@ -613,23 +710,88 @@ sub print_dynamic_metadata {
     }
     #
     # Assessment statistics
-    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/ &&
-        (exists($dynmeta{'stdno'}) ||
-         exists($dynmeta{'avetries'}) ||
-         exists($dynmeta{'difficulty'}))) {
-        # This is an assessment, print assessment data
-        $r->print('<h4>'.&mt('Assessment Statistical Data').'</h4>'.
-                  '<table cellspacing=2 border=0>');
-        foreach ('stdno','avetries','difficulty') {
-            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
+    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+        if (exists($dynmeta{'stdno'}) ||
+            exists($dynmeta{'avetries'}) ||
+            exists($dynmeta{'difficulty'}) ||
+            exists($dynmeta{'disc'})) {
+            # This is an assessment, print assessment data
+            $r->print('<h4>'.
+                      &mt('Overall Assessment Statistical Data').
+                      '</h4>'.
+                      '<table cellspacing=2 border=0>');
+            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
                       '<td bgcolor="#CCCCCC">'.
-                      &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})).'</td>'.
-                      "</tr>\n");
+                      &prettyprint('stdno',$dynmeta{'stdno'}).
+                      '</td>'."</tr>\n");
+            foreach ('avetries','difficulty','disc') {
+                $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
+                          '<td bgcolor="#CCCCCC">'.
+                          &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})).
+                          '</td>'."</tr>\n");
+            }
+            $r->print('</table>');    
+        }
+        if (exists($dynmeta{'stats'})) {
+            #
+            # New assessment statistics
+            $r->print('<h4>'.
+                      &mt('Detailed Assessment Statistical Data').
+                      '</h4>');
+            my $table = '<table cellspacing=2 border=0>'.
+                '<tr>'.
+                '<th>Course</th>'.
+                '<th>Section(s)</th>'.
+                '<th>Num Students</th>'.
+                '<th>Mean Tries</th>'.
+                '<th>Degree of Difficulty</th>'.
+                '<th>Degree of Discrimination</th>'.
+                '<th>Time of computation</th>'.
+                '</tr>'.$/;
+            foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
+                my $data = $dynmeta{'stats'}->{$identifier};
+                my $course = $data->{'course'};
+                my %courseinfo = &Apache::lonnet::coursedescription($course);
+                if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
+                    &Apache::lonnet::logthis('lookup for '.$course.' failed');
+                    next;
+                }
+                $table .= '<tr>';
+                $table .= 
+                    '<td><nobr>'.$courseinfo{'description'}.'</nobr></td>';
+                $table .= 
+                    '<td align="right">'.$data->{'sections'}.'</td>';
+                $table .=
+                    '<td align="right">'.$data->{'stdno'}.'</td>';
+                foreach ('avetries','difficulty','disc') {
+                    $table .= '<td align="right">';
+                    if (exists($data->{$_})) {
+                        $table .= sprintf('%.2f',$data->{$_}).'&nbsp;';
+                    } else {
+                        $table .= '';
+                    }
+                    $table .= '</td>';
+                }
+                $table .=
+                    '<td><nobr>'.
+                    &Apache::lonlocal::locallocaltime($data->{'timestamp'}).
+                    '</nobr></td>';
+                $table .=
+                    '</tr>'.$/;
+            }
+            $table .= '</table>'.$/;
+            $r->print($table);
+        } else {
+            $r->print('No new dynamic data found.');
         }
-        $r->print('</table>');    
     } else {
-        $r->print('<h4>'.&mt('No Assessment Statistical Data is available for this resource').'</h4>');
+        $r->print('<h4>'.
+          &mt('No Assessment Statistical Data is available for this resource').
+                  '</h4>');
     }
+
+    #
+    #
     if (exists($dynmeta{'clear'})   || 
         exists($dynmeta{'depth'})   || 
         exists($dynmeta{'helpful'}) || 
@@ -759,7 +921,7 @@ ENDEDIT
         foreach ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
                  'standards',
-                 'lowestgradelevel','highestgradelevel',
+                 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement') {
             if (defined($ENV{'form.new_'.$_})) {
                 $Apache::lonpublisher::metadatafields{$_}=