--- loncom/interface/lonmeta.pm 2004/04/16 21:43:56 1.73 +++ loncom/interface/lonmeta.pm 2004/06/16 14:30:15 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.73 2004/04/16 21:43:56 matthew Exp $ +# $Id: lonmeta.pm,v 1.79 2004/06/16 14:30:15 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -175,6 +175,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)', @@ -224,6 +226,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 ' '. @@ -345,7 +351,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, @@ -362,6 +371,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')) { @@ -390,6 +407,14 @@ sub prettyinput { ",'rights')\">".&mt('Select').''. &relatedfield(0,$relatedsearchflag,$relatedsep); } + # Source Customdistribution file + if ($type eq 'sourcerights') { + return '".&mt('Select').''. + &relatedfield(0,$relatedsearchflag,$relatedsep); + } # Dates if (($type eq 'creationdate') || ($type eq 'lastrevisiondate')) { @@ -401,9 +426,9 @@ sub prettyinput { $value=~s/^\s+//gs; $value=~s/\s+$//gs; $value=~s/\s+/ /gs; - $value=~s/\"/\&quod\;/gs; + $value=~s/\"/\"\;/gs; return - ''. &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname, $relatedvalue); @@ -415,26 +440,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(''. 'Catalog Information'. ''); @@ -552,7 +564,9 @@ sub present_uneditable_metadata { 'lastrevisiondate', 'owner', 'copyright', - 'customdistributionfile', + 'customdistributionfile', + 'sourceavail', + 'sourcerights', 'obsolete', 'obsoletereplacement') { $table.=''.$lt{$_}. @@ -590,8 +604,6 @@ sub print_dynamic_metadata { $r->rflush(); my %items=&fieldnames(); my %dynmeta=&dynamicmeta($uri); - &Apache::lonnet::logthis('dynamic metadata keys:'.$/. - join("\n",keys(%dynmeta))); # # General Access and Usage Statistics if (exists($dynmeta{'count'}) || @@ -827,7 +839,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{$_}=