--- loncom/interface/lonsearchcat.pm 2002/08/26 14:34:19 1.155
+++ loncom/interface/lonsearchcat.pm 2003/09/28 00:14:25 1.187
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.155 2002/08/26 14:34:19 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.187 2003/09/28 00:14:25 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -74,15 +74,15 @@ package Apache::lonsearchcat;
# ------------------------------------------------- modules used by this module
use strict;
-use Apache::Constants qw(:common);
+use Apache::Constants qw(:common :http);
use Apache::lonnet();
use Apache::File();
use CGI qw(:standard);
use Text::Query;
-use DBI;
use GDBM_File;
use Apache::loncommon();
use Apache::lonmysql();
+use Apache::lonlocal;
# ---------------------------------------- variables used throughout the module
@@ -143,6 +143,14 @@ my %persistent_db;
my $hidden_fields;
my $bodytag;
+#
+# For course search
+#
+my %alreadyseen;
+my $hashtied;
+my %hash;
+my $totalfound;
+
######################################################################
######################################################################
@@ -171,19 +179,28 @@ string that holds portions of the screen
sub handler {
my $r = shift;
#
+
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+
my $closebutton; # button that closes the search window
# This button is different for the RAT compared to
# normal invocation.
#
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
+ ##
+ ## Prevent caching of the search interface window. Hopefully this means
+ ## we will get the launch=1 passed in a little more.
+ &Apache::loncommon::no_cache($r);
##
## Pick up form fields passed in the links.
##
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element','pause',
- 'phase','persistent_db_id','table','start','show']);
+ 'phase','persistent_db_id','table','start','show',
+ 'cleargroupsort']);
##
## The following is a trick - we wait a few seconds if asked to so
## the daemon running the search can get ahead of the daemon
@@ -191,15 +208,14 @@ sub handler {
## this once, so the pause indicator is deleted
##
if (exists($ENV{'form.pause'})) {
- sleep(3);
+ sleep(1);
delete($ENV{'form.pause'});
}
##
## Initialize global variables
##
my $domain = $r->dir_config('lonDefDomain');
- $diropendb= "/home/httpd/perl/tmp/".&Apache::lonnet::escape($domain).
- "\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
+ $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
#
# set the name of the persistent database
# $ENV{'form.persistent_db_id'} can only have digits in it.
@@ -234,12 +250,13 @@ END
## Clear out old values from groupsearch database
##
untie %groupsearch_db if (tied(%groupsearch_db));
- if ($ENV{'form.launch'} eq '1' &&
- ($ENV{'form.catalogmode'} eq 'groupsearch') &&
- ($ENV{'form.phase'} eq 'results')) {
+ if (($ENV{'form.cleargroupsort'} eq '1') ||
+ (($ENV{'form.launch'} eq '1') &&
+ ($ENV{'form.catalogmode'} eq 'groupsearch'))) {
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();
untie %groupsearch_db;
+ delete($ENV{'form.cleargroupsort'});
} else {
# This is a stupid error to give to the user.
# It really tells them nothing.
@@ -329,6 +346,8 @@ END
&run_search($r,$query,$customquery,$customshow,
$libraries,$pretty_string);
}
+ } elsif ($ENV{'form.phase'} eq 'course_search') {
+ &course_search($r);
} elsif(($ENV{'form.phase'} eq 'basic_search') ||
($ENV{'form.phase'} eq 'adv_search')) {
$ENV{'form.searchmode'} = 'basic';
@@ -364,7 +383,8 @@ END
(undef,undef,undef,undef);
my $pretty_string;
if ($ENV{'form.phase'} eq 'basic_search') {
- ($query,$pretty_string) = &parse_basic_search($r,$closebutton);
+ ($query,$pretty_string,$libraries) =
+ &parse_basic_search($r,$closebutton);
} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)
= &parse_advanced_search($r,$closebutton);
@@ -387,6 +407,111 @@ END
######################################################################
######################################################################
+sub course_search {
+ my $r=shift;
+ my $bodytag=&Apache::loncommon::bodytag('Course Search');
+ my $pretty_search_string = ''.$ENV{'form.courseexp'}.'';
+ my $search_string = $ENV{'form.courseexp'};
+ my @New_Words;
+ if ($ENV{'form.crsrelated'}) {
+ ($search_string,@New_Words) = &related_version($ENV{'form.courseexp'});
+ if (@New_Words) {
+ $pretty_search_string .= " with related words: @New_Words.";
+ } else {
+ $pretty_search_string .= " with no related words.";
+ }
+ }
+ my $fulltext=$ENV{'form.crsfulltext'};
+ my @allwords=($search_string,@New_Words);
+ $totalfound=0;
+ $r->print('LON-CAPA Course Search'.
+ $bodytag.$pretty_search_string);
+ $r->rflush();
+# ======================================================= Go through the course
+ $hashtied=0;
+ undef %alreadyseen;
+ %alreadyseen=();
+ my $c=$r->connection;
+ &tiehash();
+ foreach (keys %hash) {
+ if ($c->aborted()) { last; }
+ if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
+ &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords);
+ }
+ }
+ &untiehash();
+ unless ($totalfound) {
+ $r->print(''.&mt('No resources found').'.
');
+ }
+# =================================================== Done going through course
+ $r->print('