--- loncom/interface/lonmeta.pm 2004/06/16 18:33:46 1.80
+++ loncom/interface/lonmeta.pm 2005/08/04 23:47:37 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.80 2004/06/16 18:33:46 matthew Exp $
+# $Id: lonmeta.pm,v 1.103 2005/08/04 23:47:37 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -17,7 +17,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
@@ -31,9 +31,9 @@ package Apache::lonmeta;
use strict;
use LONCAPA::lonmetadata();
use Apache::Constants qw(:common);
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::loncommon();
-use Apache::lonhtmlcommon();
+use Apache::lonhtmlcommon();
use Apache::lonmsg;
use Apache::lonpublisher;
use Apache::lonlocal;
@@ -61,7 +61,6 @@ use Apache::lonmsg;
############################################################
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();
@@ -72,11 +71,12 @@ sub get_dynamic_metadata_from_sql {
if (! defined($authordom) || ! defined($author)) {
return ();
}
- my @Fields = ('url',
+ my @Fields = ('url','count','course',
'goto','goto_list',
'comefrom','comefrom_list',
'sequsage','sequsage_list',
'stdno','stdno_list',
+ 'dependencies',
'avetries','avetries_list',
'difficulty','difficulty_list',
'disc','disc_list',
@@ -113,7 +113,6 @@ sub get_dynamic_metadata_from_sql {
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;
@@ -237,9 +236,9 @@ sub diffgraph {
# The field names
sub fieldnames {
- return &Apache::lonlocal::texthash
- (
- 'title' => 'Title',
+ my $file_type=shift;
+ my %fields =
+ ('title' => 'Title',
'author' =>'Author(s)',
'authorspace' => 'Author Space',
'modifyinguser' => 'Last Modifying User',
@@ -248,7 +247,11 @@ sub fieldnames {
'notes' => 'Notes',
'abstract' => 'Abstract',
'lowestgradelevel' => 'Lowest Grade Level',
- 'highestgradelevel' => 'Highest Grade Level',
+ 'highestgradelevel' => 'Highest Grade Level');
+ if (! defined($file_type) || $file_type ne 'portfolio') {
+ %fields =
+ (%fields,
+ 'domain' => 'Domain',
'standards' => 'Standards',
'mime' => 'MIME Type',
'language' => 'Language',
@@ -257,7 +260,7 @@ sub fieldnames {
'owner' => 'Publisher/Owner',
'copyright' => 'Copyright/Distribution',
'customdistributionfile' => 'Custom Distribution File',
- 'sourceavail' => 'Source Availible',
+ 'sourceavail' => 'Source Available',
'sourcerights' => 'Source Custom Distribution File',
'obsolete' => 'Obsolete',
'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
@@ -279,13 +282,47 @@ sub fieldnames {
'stdno' => 'Total number of students who have worked on this problem',
'difficulty' => 'Degree of difficulty',
'disc' => 'Degree of discrimination',
+ 'dependencies' => 'Resources used by this resource',
);
+ }
+ return &Apache::lonlocal::texthash(%fields);
}
+sub select_course {
+ my ($r)=@_;
+ $r->print('
Instructor Selected Meta-Data
');
+ $r->print('
+ENDCLEAR
my %brokenurls =
&Apache::lonmsg::all_url_author_res_msg($author,$domain);
foreach (sort(keys(%brokenurls))) {
@@ -619,7 +676,7 @@ sub present_uneditable_metadata {
# obsolete
my $obsolete=$content{'obsolete'};
my $obsoletewarning='';
- if (($obsolete) && ($ENV{'user.adv'})) {
+ if (($obsolete) && ($env{'user.adv'})) {
$obsoletewarning='
'.
&mt('This resource has been marked obsolete by the author(s)').
'
'.&mt('Evaluation Comments').' ('.
&mt('visible to author and co-authors only').
@@ -832,7 +889,7 @@ sub print_dynamic_metadata {
# All other stuff
$r->print('