--- loncom/interface/lonsearchcat.pm 2001/12/11 03:18:39 1.110
+++ loncom/interface/lonsearchcat.pm 2002/01/06 01:29:53 1.114
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.110 2001/12/11 03:18:39 harris41 Exp $
+# $Id: lonsearchcat.pm,v 1.114 2002/01/06 01:29:53 harris41 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,7 +28,7 @@
# YEAR=2001
# 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison
# 3/20, 3/21, 3/22, 3/26, 3/27, 4/2, 8/15, 8/24, 8/25 Scott Harrison
-# 10/12,10/14,10/15,10/16,11/28,11/29,12/10 Scott Harrison
+# 10/12,10/14,10/15,10/16,11/28,11/29,12/10,12/12,12/16 Scott Harrison
#
###
@@ -54,13 +54,11 @@ use Apache::File();
use CGI qw(:standard);
use Text::Query;
use GDBM_File;
+use Apache::loncommon();
# ---------------------------------------- variables used throughout the module
# -- information holders
-my %language; # holds contents of language.tab
-my %cprtag; # holds contents of copyright.tab
-my %mimetag; # holds contents of filetypes.tab
my %hostdomains; # matches host name to host domain
my %hostips; # matches host name to host ip
my %hitcount; # stores number of hits per host
@@ -97,37 +95,7 @@ my $advancedviewselect=<new($Apache::lonnet::perlvar{'lonTabDir'}.
- '/language.tab');
- while (<$fh>) {
- $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
- $language{$1}=$2;
- }
- }
- $cprtag{'any'}='Any copyright/distribution';
- {
- my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonIncludes'}.
- '/copyright.tab');
- while (<$fh>) {
- $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
- $cprtag{$1}=$2;
- }
- }
- $mimetag{'any'}='Any type';
- {
- my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
- '/filetypes.tab');
- while (<$fh>) {
- if (/^\S/ and !/^\#/) {
- $_=~/(\S+)\s+(\S+)\s+([\S\s\-]+)/; chomp;
- $mimetag{$1}=".$1 $3";
- }
- }
- }
+BEGIN {
{
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
'/hosts.tab');
@@ -235,13 +203,18 @@ END
$ENV{'form.mime'}='any' unless length($ENV{'form.mime'});
$scrout.=&selectbox('Limit by MIME type','mime',
- $ENV{'form.mime'},%mimetag);
+ $ENV{'form.mime'},
+ 'any','Any type',
+ \&{Apache::loncommon::filedescriptionex},
+ (&Apache::loncommon::fileextensions));
$ENV{'form.language'}='any' unless length($ENV{'form.language'});
$scrout.=&selectbox('Limit by language','language',
- $ENV{'form.language'},%language);
-
+ $ENV{'form.language'},'any','Any Language',
+ \&{Apache::loncommon::languagedescription},
+ (&Apache::loncommon::languageids),
+ );
# ------------------------------------------------ Compute date selection boxes
$scrout.=<$uctitle:".
"
".'';
}
+sub testf {
+ return @_[0];
+}
+
# ----------------------------------------------- Performing an advanced search
sub advancedsearch {
my ($r,$envhash)=@_;
@@ -1333,9 +1319,21 @@ sub detailed_citation_view {
Subject: $subject
Keyword(s): $keywords
Notes: $notes
-MIME Type: $mimetag{$mime}
-Language: $language{$lang}
-Copyright/Distribution: $cprtag{$copyright}
+MIME Type:
+END
+ $result.=&Apache::loncommon::filedescription($mime);
+ $result.=<
+Language:
+END
+ $result.=&Apache::loncommon::languagedescription($lang);
+ $result.=<
+Copyright/Distribution:
+END
+ $result.=&Apache::loncommon::copyrightdescription($copyright);
+ $result.=<
$extrashow
@@ -1351,11 +1349,12 @@ sub summary_view {
$notes,$shortabstract,$mime,$lang,
$creationdate,$lastrevisiondate,$owner,$copyright,
$hostname,$httphost,$extrashow)=@_;
+ my $cprtag=&Apache::loncommon::copyrightdescription($copyright);
my $result=<$author
$title
$owner -- $lastrevisiondate
-$cprtag{$copyright}
+$cprtag
$extrashow
END
@@ -1368,6 +1367,9 @@ sub fielded_format_view {
$notes,$shortabstract,$mime,$lang,
$creationdate,$lastrevisiondate,$owner,$copyright,
$hostname,$httphost,$extrashow)=@_;
+ my $mimetag=&Apache::loncommon::filedescription($mime);
+ my $language=&Apache::loncommon::languagedescription($lang);
+ my $cprtag=&Apache::loncommon::copyrightdescription($copyright);
my $result=<URL: $url
@@ -1376,12 +1378,12 @@ sub fielded_format_view {
Subject: $subject
Keyword(s): $keywords
Notes: $notes
-MIME Type: $mimetag{$mime}
-Language: $language{$lang}
+MIME Type: $mimetag
+Language: $language
Creation Date: $creationdate
Last Revision Date: $lastrevisiondate
Publisher/Owner: $owner
-Copyright/Distribution: $cprtag{$copyright}
+Copyright/Distribution: $cprtag
Repository Location: $hostname
Abstract: $shortabstract
$extrashow
@@ -1396,6 +1398,9 @@ sub xml_sgml_view {
$notes,$shortabstract,$mime,$lang,
$creationdate,$lastrevisiondate,$owner,$copyright,
$hostname,$httphost,$extrashow)=@_;
+ my $cprtag=&Apache::loncommon::copyrightdescription($copyright);
+ my $mimetag=&Apache::loncommon::filedescription($mime);
+ my $language=&Apache::loncommon::languagedescription($lang);
my $result=<
<LonCapaResource>
@@ -1407,18 +1412,18 @@ sub xml_sgml_view {
<notes>$notes</notes>
<mimeInfo>
<mime>$mime</mime>
-<mimetag>$mimetag{$mime}</mimetag>
+<mimetag>$mimetag</mimetag>
</mimeInfo>
<languageInfo>
<language>$lang</language>
-<languagetag>$language{$lang}</languagetag>
+<languagetag>$language</languagetag>
</languageInfo>
<creationdate>$creationdate</creationdate>
<lastrevisiondate>$lastrevisiondate</lastrevisiondate>
<owner>$owner</owner>
<copyrightInfo>
<copyright>$copyright</copyright>
-<copyrighttag>$cprtag{$copyright}</copyrighttag>
+<copyrighttag>$cprtag</copyrighttag>
</copyrightInfo>
<repositoryLocation>$hostname</repositoryLocation>
<shortabstract>$shortabstract</shortabstract>
@@ -1553,18 +1558,6 @@ This routine is only run once after comp
=item *
-Initializes %language hash table.
-
-=item *
-
-Initializes %cprtag hash table (for copyright.tab).
-
-=item *
-
-Initializes %mimetag hash table (for filetypes.tab).
-
-=item *
-
Initializes %hostdomains and hostips hash table (for hosts.tab).
=back