--- loncom/interface/lonsearchcat.pm 2001/04/02 16:57:38 1.92
+++ loncom/interface/lonsearchcat.pm 2002/05/22 16:21:50 1.119
@@ -1,77 +1,82 @@
-# The LearningOnline Network
+# The LearningOnline Network with CAPA
# Search Catalog
#
-# 03/08/2001 Scott Harrison
-# Scott Harrison: 03/12/2001, 03/13/2001, 03/14/2001, 03/15/2001, 03/19/2001
-# Scott Harrison: 03/20/2001, 03/21/2001, 03/22/2001, 03/26/2001, 03/27/2001
-# Scott Harrison: 04/02/2001
+# $Id: lonsearchcat.pm,v 1.119 2002/05/22 16:21:50 www Exp $
#
-# Functions
+# Copyright Michigan State University Board of Trustees
#
-# handler(server reference) : interacts with the Apache server layer
-# (for /adm/searchcat URLs)
-# simpletextfield(name,value) : returns HTML formatted string for simple text
-# field
-# simplecheckbox(name,value) : returns HTML formatted string for simple
-# checkbox
-# searchphrasefield(title,name,value) : returns HTML formatted string for
-# a search expression phrase field
-# dateboxes(name, defaultmonth, defaultday, defaultyear) : returns HTML
-# formatted string
-# for a calendar date
-# selectbox(title,name,value,%HASH=options) : returns HTML formatted string for
-# a selection box field
-# advancedsearch(server reference, environment reference) : perform a complex
-# multi-field logical query
-# filled(field) : determines whether a given field has been filled
-# basicsearch(server reference, environment reference) : perform a simple
-# single-field logical query
-# output_blank_field_error(server reference) : outputs a message saying that
-# more fields need to be filled in
-# output_results(output mode,
-# server reference,
-# environment reference,
-# reply list reference) : outputs results from search
-# build_SQL_query(field name, logic) : builds a SQL query string from a
-# logical expression with AND/OR keywords
-# recursive_SQL_query_build(field name, reverse notation expression) :
-# builds a SQL query string from a reverse notation expression
-# logical expression with AND/OR keywords
-# build_custommetadata_query(field_name, logic_statement) : builds a perl
-# regular expression from a logical expression with AND/OR
-# keywords
-# detailed_citation_view, summary_view, fielded_format_view, xml_sgml_view:
-# four different ways to view metadata records. Outputs a HTML-ified string.
-# Input arguments are title, author, subject, url, keywords, version, notes,
-# short abstract, mime, language, creation date, last revision date, owner,
-# copyright, hostname, httphost, and extra custom metadata to show.
-# build_date_queries(cmonth1, cday1, cyear1, cmonth2, cday2, cyear2,
-# lmonth1, lday1, lyear1, lmonth2, lday2, lyear2) :
-# Builds a SQL logic query to check time/date entries.
-# output_date_error(server reference, error message) : outputs
-# an error message specific to bad date format.
-# make_persistent() : makes a set of hidden HTML fields to make
-# SQL search interface information to be persistent
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# 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
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# 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,12/12,12/16 Scott Harrison
+# YEAR=2002
+# 1/17 Scott Harrison
+#
+###
+
+###############################################################################
+## ##
+## ORGANIZATION OF THIS PERL MODULE ##
+## ##
+## 1. Modules used by this module ##
+## 2. Choices for different output views (detailed, summary, xml, etc) ##
+## 3. BEGIN block (to be run once after compilation) ##
+## 4. Handling routine called via Apache and mod_perl ##
+## 5. Other subroutines ##
+## ##
+###############################################################################
package Apache::lonsearchcat;
+# ------------------------------------------------- modules used by this module
use strict;
use Apache::Constants qw(:common);
use Apache::lonnet();
use Apache::File();
use CGI qw(:standard);
use Text::Query;
+use GDBM_File;
+use Apache::loncommon();
# ---------------------------------------- variables used throughout the module
-my %language;
-my $scrout;
-my %metadatafields;
-my %cprtag;
-my %mimetag;
-my $closebutton;
-# ------ form selection elements that allow for choosing different output views
-# Detailed Citation View ---> sub detailed_citationview
+# -- information holders
+my %hostdomains; # matches host name to host domain
+my %hostips; # matches host name to host ip
+my %hitcount; # stores number of hits per host
+
+# -- dynamically rendered interface components
+my $closebutton; # button that closes the search window
+my $importbutton; # button to take the selected results and go to group sorting
+my $hidden;
+
+# -- miscellaneous variables
+my $scrout; # string that holds portions of the screen output
+my $yourself; # allows for quickly limiting to oneself
+my %hash;
+
+# ------------------------------------------ choices for different output views
+# Detailed Citation View ---> sub detailed_citation_view
# Summary View ---> sub summary_view
# Fielded Format ---> sub fielded_format_view
# XML/SGML ---> sub xml_sgml_view
@@ -92,77 +97,97 @@ my $advancedviewselect=<
LIMIT BY LAST REVISION DATE RANGE:
- $uctitle:".
- "
+
between:
CREATIONDATESTART
$scrout.=&dateboxes('creationdatestart',1,1,1976,
@@ -228,7 +258,7 @@ CREATIONDATEEND
between:
+
between:
LASTREVISIONDATESTART
$scrout.=&dateboxes('lastrevisiondatestart',1,1,1976,
$ENV{'form.lastrevisiondatestart_month'},
@@ -247,11 +277,14 @@ LASTREVISIONDATEEND
$scrout.=&searchphrasefield('Limit by publisher/owner','owner',
$ENV{'form.owner'});
-# $metadatafields{'owner'});
$ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});
$scrout.=&selectbox('Limit by copyright/distribution','copyright',
- $ENV{'form.copyright'},%cprtag);
+ $ENV{'form.copyright'},
+ 'any','Any copyright/distribution',
+ \&{Apache::loncommon::copyrightdescription},
+ (&Apache::loncommon::copyrightids),
+ );
# ------------------------------------------- Compute customized metadata field
$scrout.=<
+key=value separated by operators such as AND, OR or NOT.
Example: grandmother=75 OR grandfather=85
-
+
CUSTOMMETADATA
$scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
$scrout.=' initial users of this system do not need to worry about this option';
@@ -272,7 +305,7 @@ $scrout.=' initial users of this syst
Enter in a space-separated list of special metadata fields to show
in a fielded listing for each record result.
-
+
CUSTOMSHOW
$scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
$scrout.=' initial users of this system do not need to worry about this option';
@@ -282,35 +315,43 @@ $scrout.=' initial users of this syst
Search Catalog
@@ -326,6 +368,24 @@ ENDDOCUMENT
return OK;
}
+# ------------------------------------------------------------- make persistent
+sub make_persistent {
+ my $persistent='';
+
+ foreach (keys %ENV) {
+ if (/^form\./ && !/submit/) {
+ my $name=$_;
+ my $key=$name;
+ $ENV{$key}=~s/\'//g; # do not mess with html field syntax
+ $name=~s/^form\.//;
+ $persistent.=<
".
+ " $instruction
".
'';
}
@@ -357,156 +417,61 @@ sub dateboxes {
my ($name,$defaultmonth,$defaultday,$defaultyear,
$currentmonth,$currentday,$currentyear)=@_;
($defaultmonth,$defaultday,$defaultyear)=('','','');
- my $month=<
".'Search Results
');
$r->rflush();
+ my $servernum=(keys %rhash)+0;
+
+ # define server grid (shows status of multiple machines)
+ my $hcinit;
+ my $grid="'
'+";
+ $grid.="\n";
+ my $sn=1;
+ for my $sk (sort keys %rhash) {
+ # ''+
+ $grid.="'+\"'\"+')\">'+";
+ $grid.="\n";
+ $grid.="''+\n";
+ $grid.="'
'+\n" unless $sn%10;
+ $sn++;
+ }
$r->print(<Search Results Progress
'+
- ''+
- '');
+
ENDPOP
$r->rflush();
- my $servernum=(keys %rhash)+0;
- $r->print('');
- $r->rflush();
- foreach my $rkey (keys %rhash) {
- $r->print('');
- $r->rflush();
+ my $servercount=0;
+ my $hitcountsum=0;
+ my $bloop=$servernum;
+ my %orkey;
+ BLOOP: while(1) {
+ my $sn=0;
+ last BLOOP unless $bloop;
+ last BLOOP unless $timeremain;
+ RLOOP: foreach my $rkey (sort keys %rhash) {
+ $sn++;
+ next RLOOP if $orkey{$rkey};
+ $servercount++;
+ $tflag=1;
+ $compiledresult='';
+ my $hostname=$rkey;
my $reply=$rhash{$rkey};
my @results;
my $replyfile='';
- $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
- $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
- $reply=~/(.*?)\_/;
- my $hostname=$1;
- {
- while (1) {
- $r->print('') if -e $replyfile;
- $r->rflush();
- last if -e "$replyfile.end";
- last unless $timeremain;
- sleep 1;
- $timeremain--;
- $r->print('');
- $r->rflush();
+
+ if ($reply eq 'con_lost') {
+ &popwin_imgupdate($r,$sn,"srvbad.gif");
+ $bloop--;
+ $orkey{$rkey}=1;
+ }
+ else {
+ $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
+ $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
+ $reply=~/(.*?)\_/;
+ {
+ my $temp=0;
+ WLOOP: while (1) {
+ if (-e $replyfile && $tflag) {
+ &popwin_imgupdate($r,$sn,"srvhalf.gif");
+ &popwin_js($r,'popwin.hc["'.$rkey.'"]='.
+ '"still transferring..."'.';');
+ $tflag=0;
+ }
+ if (-e "$replyfile.end") {
+ $bloop--;
+ $orkey{$rkey}=1;
+ if (-s $replyfile) {
+ &popwin_imgupdate($r,$sn,"srvgood.gif");
+ my $fh=Apache::File->new($replyfile) or
+ ($r->print('ERROR: file '.
+ $replyfile.' cannot be opened') and
+ return OK);
+ @results=<$fh> if $fh;
+ $hitcount{$rkey}=@results+0;
+ &popwin_js($r,'popwin.hc["'.$rkey.'"]='.
+ $hitcount{$rkey}.';');
+ $hitcountsum+=$hitcount{$rkey};
+ &popwin_js($r,'popwin.document.forms.popremain.'.
+ 'numhits.value='.$hitcountsum.';');
+ }
+ else {
+ &popwin_imgupdate($r,$sn,"srvempty.gif");
+ &popwin_js($r,'popwin.hc["'.$rkey.'"]=0;');
+ }
+ last WLOOP;
+ }
+ if ($temp>1) {
+ sleep 1;
+ $timeremain--;
+ $elapsetime++;
+ last WLOOP;
+ }
+ last WLOOP unless $timeremain;
+ sleep 1;
+ $timeremain--;
+ $elapsetime++;
+ &popwin_js($r,"popwin.document.popremain.".
+ "elapsetime.value=$elapsetime;");
+ $temp++;
+ }
}
- # QUESTION: how should I handle this error condition..
- # I'm sure there is syntax elsewhere I can use..
- my $fh=Apache::File->new($replyfile) or
- ($r->print('file cannot be opened') and return OK);
- @results=<$fh>;
+ &popwin_js($r,'popwin.document.whirly.'.
+ 'src="/adm/lonIcons/lonanimend.gif";');
}
-
my $customshow='';
my $extrashow='';
my @customfields;
@@ -800,7 +1057,7 @@ ENDPOP
$customshow=$ENV{'form.customshow'};
$customshow=~s/[^\w\s]//g;
my @fields=map {"$_:"}
- split(/\s+/,$customshow);
+ split(/\s+/,$customshow);
@customfields=split(/\s+/,$customshow);
if ($customshow) {
$extrashow="
\n";
@@ -817,168 +1074,140 @@ ENDPOP
$customhash{$k}=$v;
}
}
- foreach my $result (@results) {
- next if $result=~/^custom\=/;
- chomp $result;
- next unless $result;
- my @fields=map
- {&Apache::lonnet::unescape($_)}
- (split(/\,/,$result));
- my ($title,$author,$subject,$url,$keywords,$version,
- $notes,$abstract,$mime,$lang,
- $creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
- my $shortabstract=$abstract;
- $shortabstract=substr($abstract,0,200) if length($abstract)>200;
- $fields[7]=$shortabstract;
- my $extrashow2=$extrashow;
- if ($extrashow) {
- foreach my $field (@customfields) {
- my $value='';
- if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) {
- $value=$1;
- }
- $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g;
- }
+ if (keys %hash) {
+ untie %hash;
+ }
+ if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+ if ($ENV{'form.launch'} eq '1') {
+ &start_fresh_session();
}
+ foreach my $result (@results) {
+ next if $result=~/^custom\=/;
+ chomp $result;
+ next unless $result;
+ my @fields=map
+ {&Apache::lonnet::unescape($_)}
+ (split(/\,/,$result));
+ my ($title,$author,$subject,$url,$keywords,$version,
+ $notes,$abstract,$mime,$lang,
+ $creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
+
+ unless ($title) { $title='Untitled'; }
+ unless ($ENV{'user.adv'}) {
+ $keywords='- not displayed -';
+ $fields[4]=$keywords;
+ $notes='- not displayed -';
+ $fields[6]=$notes;
+ $abstract='- not displayed -';
+ $fields[7]=$abstract;
+ $subject='- not displayed -';
+ $fields[2]=$subject;
+ }
- $compiledresult.=<
+
END
- my $httphost=$ENV{'HTTP_HOST'};
+ }
+ if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ $fnum+=0;
+ $hash{"pre_${fnum}_link"}=$url;
+ $hash{"pre_${fnum}_title"}=$title;
+ $compiledresult.=<
+END
+#
+#
+ $fnum++;
+ }
+ my $httphost=$ENV{'HTTP_HOST'};
- my $viewselect;
- if ($mode eq 'Basic') {
- $viewselect=$ENV{'form.basicviewselect'};
- }
- elsif ($mode eq 'Advanced') {
- $viewselect=$ENV{'form.advancedviewselect'};
- }
+ my $viewselect;
+ if ($mode eq 'Basic') {
+ $viewselect=$ENV{'form.basicviewselect'};
+ }
+ elsif ($mode eq 'Advanced') {
+ $viewselect=$ENV{'form.advancedviewselect'};
+ }
- if ($viewselect eq 'Detailed Citation View') {
- $compiledresult.=&detailed_citation_view(@fields,
- $hostname,$httphost,
- $extrashow2);
- }
- elsif ($viewselect eq 'Summary View') {
- $compiledresult.=&summary_view(@fields,$hostname,$httphost,
- $extrashow2);
- }
- elsif ($viewselect eq 'Fielded Format') {
- $compiledresult.=&fielded_format_view(@fields,$hostname,
- $httphost,$extrashow2);
- }
- elsif ($viewselect eq 'XML/SGML') {
- $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost,
- $extrashow2);
- }
+ if ($viewselect eq 'Detailed Citation View') {
+ $compiledresult.=&detailed_citation_view(@fields,
+ $hostname,$httphost,
+ $extrashow2);
+ }
+ elsif ($viewselect eq 'Summary View') {
+ $compiledresult.=&summary_view(@fields,$hostname,$httphost,
+ $extrashow2);
+ }
+ elsif ($viewselect eq 'Fielded Format') {
+ $compiledresult.=&fielded_format_view(@fields,$hostname,
+ $httphost,$extrashow2);
+ }
+ elsif ($viewselect eq 'XML/SGML') {
+ $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost,
+ $extrashow2);
+ }
+
+ }
+ untie %hash;
}
-
- unless ($compiledresult) {
- $compiledresult="There were no results that matched your query";
+ else {
+ $r->print('Unable to tie hash to db '.
+ 'file');
+ }
+ if ($compiledresult) {
+ $resultflag=1;
}
- # make query information persistent to allow for subsequent revision
- my $persistent=&make_persistent();
-
- $r->print(<
-Search Query
-RESULTS
- if ($mode eq 'Basic') {
$r->print(<
-Subject: $subject
-Keyword(s): $keywords
-Notes: $notes
-MIME Type: $mimetag{$mime}
-Language: $language{$lang}
-Copyright/Distribution: $cprtag{$copyright}
+Subject: $subject
+Keyword(s): $keywords
+Notes: $notes
+MIME Type:
+END
+ $result.=&Apache::loncommon::filedescription($mime);
+ $result.=<
@@ -1014,11 +1255,12 @@ sub summary_view {
$notes,$shortabstract,$mime,$lang,
$creationdate,$lastrevisiondate,$owner,$copyright,
$hostname,$httphost,$extrashow)=@_;
+ my $cprtag=&Apache::loncommon::copyrightdescription($copyright);
my $result=<
$title
$owner -- $lastrevisiondate
-$cprtag{$copyright}
+$cprtag
$extrashow