--- loncom/interface/lonsearchcat.pm 2002/07/29 21:53:57 1.146
+++ loncom/interface/lonsearchcat.pm 2003/10/24 21:09:24 1.191
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.146 2002/07/29 21:53:57 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.191 2003/10/24 21:09:24 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,14 +25,6 @@
#
# 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
-# 6/17 Matthew Hall
-#
###############################################################################
###############################################################################
@@ -82,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
@@ -123,6 +115,11 @@ that produces it. Adding a new view typ
adding a line to the definition of this hash and making sure the function
takes the proper parameters.
+=item $bodytag
+
+LON-CAPA standard body tag, gotten from &Apache::lonnet::bodytag.
+No title, no table, just a <body> tag.
+
=back
=cut
@@ -140,9 +137,20 @@ my $diropendb = ""; # db file
my %Views = ("Detailed Citation View" => \&detailed_citation_view,
"Summary View" => \&summary_view,
"Fielded Format" => \&fielded_format_view,
- "XML/SGML" => \&xml_sgml_view );
+ "XML/SGML" => \&xml_sgml_view,
+ "Compact View" => \&compact_view);
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','titleelement']);
##
## 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,55 +208,107 @@ sub handler {
## this once, so the pause indicator is deleted
##
if (exists($ENV{'form.pause'})) {
- sleep(5);
+ 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.
if (! exists($ENV{'form.persistent_db_id'}) ||
- $ENV{'form.persistent_db_id'} =~ /\D/ ) {
+ ($ENV{'form.persistent_db_id'} =~ /\D/) ||
+ ($ENV{'form.launch'} eq '1')) {
$ENV{'form.persistent_db_id'} = time;
}
+ $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
my $persistent_db_file = "/home/httpd/perl/tmp/".
&Apache::lonnet::escape($domain).
'_'.&Apache::lonnet::escape($ENV{'user.name'}).
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';
##
- &get_persistent_form_data($r,$persistent_db_file);
+ if (! &get_persistent_form_data($persistent_db_file)) {
+ if ($ENV{'form.phase'} =~ /(run_search|results)/) {
+ &Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
+ "from $persistent_db_file");
+ $r->print(<<END);
+<html>
+<head><title>LON-CAPA Search Error</title></head>
+$bodytag
+We were unable to retrieve data describing your search. This is a serious
+error and has been logged. Please alert your LON-CAPA administrator.
+</body>
+</html>
+END
+ return OK;
+ }
+ }
##
## Clear out old values from groupsearch database
##
untie %groupsearch_db if (tied(%groupsearch_db));
- if ($ENV{'form.launch'} eq '1') {
- if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+ 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 {
- $r->print('<html><head></head><body>Unable to tie hash to db '.
- 'file</body></html>');
+ # This is a stupid error to give to the user.
+ # It really tells them nothing.
+ $r->print('<html><head></head>'.$bodytag.
+ 'Unable to tie hash to db file</body></html>');
return OK;
}
}
##
- ## Configure dynamic components of interface
+ ## Configure hidden fields
##
$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
- $ENV{'form.persistent_db_id'}.'" />';
+ $ENV{'form.persistent_db_id'}.'" />'."\n";
+ if (exists($ENV{'form.catalogmode'})) {
+ $hidden_fields .= '<input type="hidden" name="catalogmode" value="'.
+ $ENV{'form.catalogmode'}.'" />'."\n";
+ }
+ if (exists($ENV{'form.form'})) {
+ $hidden_fields .= '<input type="hidden" name="form" value="'.
+ $ENV{'form.form'}.'" />'."\n";
+ }
+ if (exists($ENV{'form.element'})) {
+ $hidden_fields .= '<input type="hidden" name="element" value="'.
+ $ENV{'form.element'}.'" />'."\n";
+ }
+ if (exists($ENV{'form.titleelement'})) {
+ $hidden_fields .= '<input type="hidden" name="titleelement" value="'.
+ $ENV{'form.titleelement'}.'" />'."\n";
+ }
+ if (exists($ENV{'form.mode'})) {
+ $hidden_fields .= '<input type="hidden" name="mode" value="'.
+ $ENV{'form.mode'}.'" />'."\n";
+ }
+ ##
+ ## Configure dynamic components of interface
##
if ($ENV{'form.catalogmode'} eq 'interactive') {
- $closebutton="<input type='button' name='close' value='CLOSE' ".
- "onClick='self.close()'>"."\n";
+ $closebutton="<input type='button' name='close' value='CLOSE' ";
+ if ($ENV{'form.phase'} =~ /(results|run_search)/) {
+ $closebutton .="onClick='parent.close()'";
+ } else {
+ $closebutton .="onClick='self.close()'";
+ }
+ $closebutton .=">\n";
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $closebutton=<<END;
-<input type='button' name='close' value='CLOSE' onClick='self.close()'>
-END
+ $closebutton="<input type='button' name='close' value='CLOSE' ";
+ if ($ENV{'form.phase'} =~ /(results|run_search)/) {
+ $closebutton .="onClick='parent.close()'";
+ } else {
+ $closebutton .="onClick='self.close()'";
+ }
+ $closebutton .= ">";
$importbutton=<<END;
<input type='button' name='import' value='IMPORT'
onClick='javascript:select_group()'>
@@ -252,9 +321,15 @@ END
## Sanity checks on form elements
##
if (!defined($ENV{'form.viewselect'})) {
- $ENV{'form.viewselect'} ="Detailed Citation View";
+ if (($ENV{'form.catalogmode'} eq 'groupsearch') ||
+ ($ENV{'form.catalogmode'} eq 'interactive')) {
+ $ENV{'form.viewselect'} ="Compact View";
+ } else {
+ $ENV{'form.viewselect'} ="Detailed Citation View";
+ }
}
- $ENV{'form.phase'} = 'displaybasic' if (! exists($ENV{'form.phase'}));
+ $ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
+ $ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
##
## Switch on the phase
##
@@ -264,28 +339,47 @@ END
&print_advanced_search_form($r,$closebutton);
} elsif ($ENV{'form.phase'} eq 'results') {
&display_results($r,$importbutton,$closebutton);
- } elsif($ENV{'form.phase'} eq 'run_search') {
+ } elsif ($ENV{'form.phase'} =~ /^(sort|run_search)$/) {
my ($query,$customquery,$customshow,$libraries,$pretty_string) =
&get_persistent_data($persistent_db_file,
['query','customquery','customshow',
'libraries','pretty_string']);
- &write_status($r,"query = $query");
- &write_status($r,"customquery = $customquery");
- &write_status($r,"customshow = $customshow");
- &write_status($r,"libraries = $libraries");
- &write_status($r,"pretty_string = $pretty_string");
- &run_search($r,$query,$customquery,$customshow,
- $libraries,$pretty_string);
+ if ($ENV{'form.phase'} eq 'sort') {
+ &print_sort_form($r,$pretty_string);
+ } elsif ($ENV{'form.phase'} eq 'run_search') {
+ &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';
+ if ($ENV{'form.phase'} eq 'adv_search') {
+ $ENV{'form.searchmode'} = 'advanced';
+ }
# Set up table
if (! defined(&create_results_table())) {
- # Unable to make table to store results in.
- # Definately abort search.
+ $r->print(<<END);
+<html><head><title>Search Error</title></head>
+$bodytag
+Unable to create table in which to store search results.
+The search has been aborted.
+</body>
+</html>
+END
+ return OK;
}
+ delete($ENV{'form.launch'});
if (! &make_form_data_persistent($r,$persistent_db_file)) {
- # Unable to store persistent data.
- # Probably should bail out.
+ $r->print(<<END);
+<html><head><title>Search Error</title></head>
+$bodytag
+Unable to properly store search information. The search has been aborted.
+</body>
+</html>
+END
+ return OK;
}
#
# We are running a search
@@ -293,19 +387,14 @@ 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);
return OK if (! defined($query));
}
- &write_status($r,"query = $query");
- &write_status($r,"customquery = $customquery");
- &write_status($r,"customshow = $customshow");
- &write_status($r,"libraries = $libraries");
- &write_status($r,"pretty_string = $pretty_string");
- &make_persistent($r,
- { query => $query,
+ &make_persistent({ query => $query,
customquery => $customquery,
customshow => $customshow,
libraries => $libraries,
@@ -322,6 +411,111 @@ END
######################################################################
######################################################################
+sub course_search {
+ my $r=shift;
+ my $bodytag=&Apache::loncommon::bodytag('Course Search');
+ my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>';
+ 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: <b>@New_Words</b>.";
+ } else {
+ $pretty_search_string .= " with no related words.";
+ }
+ }
+ my $fulltext=$ENV{'form.crsfulltext'};
+ my @allwords=($search_string,@New_Words);
+ $totalfound=0;
+ $r->print('<html><head><title>LON-CAPA Course Search</title></head>'.
+ $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('<p>'.&mt('No resources found').'.</p>');
+ }
+# =================================================== Done going through course
+ $r->print('</body></html>');
+}
+
+# ---------------------------------------------------------------- tie the hash
+
+sub tiehash {
+ $hashtied=0;
+ if ($ENV{'request.course.fn'}) {
+ if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
+ &GDBM_READER(),0640)) {
+ $hashtied=1;
+ }
+ }
+}
+
+sub untiehash {
+ if ($hashtied) { untie %hash; }
+ $hashtied=0;
+}
+
+# =============================== This pulls up a resource and its dependencies
+
+sub checkonthis {
+ my ($r,$url,$level,$title,$fulltext,@allwords)=@_;
+ $alreadyseen{$url}=1;
+ $r->rflush();
+ my $result=&Apache::lonnet::metadata($url,'title').' '.
+ &Apache::lonnet::metadata($url,'subject').' '.
+ &Apache::lonnet::metadata($url,'abstract').' '.
+ &Apache::lonnet::metadata($url,'keywords');
+ if (($url) && ($fulltext)) {
+ $result.=&Apache::lonnet::ssi_body($url);
+ }
+ $result=~s/\s+/ /gs;
+ my $applies=0;
+ foreach (@allwords) {
+ if ($_=~/\w/) {
+ if ($result=~/$_/si) {
+ $applies++;
+ }
+ }
+ }
+# Does this resource apply?
+ if ($applies) {
+ $r->print('<br />');
+ for (my $i=0;$i<=$level*5;$i++) {
+ $r->print(' ');
+ }
+ $r->print('<a href="'.$url.'" target="cat">'.
+ ($title?$title:$url).'</a><br />');
+ $totalfound++;
+ } elsif ($fulltext) {
+ $r->print(' .');
+ }
+ $r->rflush();
+# Check also the dependencies of this one
+ my $dependencies=
+ &Apache::lonnet::metadata($url,'dependencies');
+ foreach (split(/\,/,$dependencies)) {
+ if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
+ &checkonthis($r,$_,$level+1,'',$fulltext,@allwords);
+ }
+ }
+}
+
+######################################################################
+######################################################################
+
=pod
=item &print_basic_search_form()
@@ -335,6 +529,7 @@ Returns a scalar which holds html for th
sub print_basic_search_form{
my ($r,$closebutton) = @_;
+ my $bodytag=&Apache::loncommon::bodytag('Search');
my $scrout=<<"ENDDOCUMENT";
<html>
<head>
@@ -347,13 +542,14 @@ sub print_basic_search_form{
}
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+$bodytag
+ENDDOCUMENT
+if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
+ $scrout.=(<<ENDDOCUMENT);
+<h1>Catalog Search</h1>
<form method="post" action="/adm/searchcat">
<input type="hidden" name="phase" value="basic_search" />
$hidden_fields
-<h3>Basic Search</h3>
<p>
Enter terms or phrases separated by AND, OR, or NOT
then press SEARCH below.
@@ -364,26 +560,71 @@ then press SEARCH below.
ENDDOCUMENT
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
' ';
-# $scrout.=&simplecheckbox('allversions',$ENV{'form.allversions'});
-# $scrout.='<font color="#800000">Search historic archives</font>';
- my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
+ my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
+ my $domain = $r->dir_config('lonDefDomain');
+ my $domaincheckbox = &simplecheckbox('domains',$domain);
+ my $srch=&mt('Search');
+ my $header=&mt('Advanced Search');
$scrout.=<<END;
-</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>
-<tr><td>$checkbox use related words</td><td></td></tr>
+</td><td><a
+href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
+>$header</a></td></tr>
+<tr><td>$relatedcheckbox use related words</td>
+ <td>$domaincheckbox only search domain <b>$domain</b></td></tr>
</table>
</p>
<p>
- <input type="submit" name="basicsubmit" value='SEARCH' />
+ <input type="submit" name="basicsubmit" value='$srch' />
$closebutton
END
- $scrout.=&selectbox(undef,'viewselect',
+ $scrout.=&selectbox('View','viewselect',
$ENV{'form.viewselect'},
undef,undef,undef,
sort(keys(%Views)));
+ $scrout.=&selectbox('Per Page','show',
+ $ENV{'form.show'},
+ undef,undef,undef,
+ (10,20,50,100));
$scrout.=<<ENDDOCUMENT;
-<input type="button" value="HELP" onClick="openhelp()" />
</p>
</form>
+ENDDOCUMENT
+ }
+ if ($ENV{'request.course.id'}) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'srch' => 'Search',
+ 'header' => 'Course Search',
+ 'note' => 'Enter terms or phrases, then press "Search" below',
+ );
+ $scrout.=(<<ENDCOURSESEARCH);
+<hr />
+<h1>$lt{'header'}</h1>
+<form method="post" action="/adm/searchcat">
+<input type="hidden" name="phase" value="course_search" />
+$hidden_fields
+<p>
+$lt{'note'}.
+</p>
+<p>
+<table>
+<tr><td>
+ENDCOURSESEARCH
+ $scrout.=' '.
+ &simpletextfield('courseexp',$ENV{'form.courseexp'},40);
+ my $crscheckbox =
+ &simplecheckbox('crsfulltext',$ENV{'form.crsfulltext'});
+ my $relcheckbox =
+ &simplecheckbox('crsrelated',$ENV{'form.crsrelated'});
+ $scrout.=(<<ENDENDCOURSE);
+</td></tr>
+<tr><td>$relcheckbox use related words</td><td></td></tr>
+<tr><td>$crscheckbox fulltext search (time consuming)</td><td></td></tr>
+</table><p>
+ <input type="submit" name="coursesubmit" value='$lt{'srch'}' />
+</p>
+ENDENDCOURSE
+ }
+ $scrout.=(<<ENDDOCUMENT);
</body>
</html>
ENDDOCUMENT
@@ -417,6 +658,7 @@ END
if (!defined($ENV{'form.viewselect'})) {
$ENV{'form.viewselect'} ="Detailed Citation View";
}
+ my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
my $scrout=<<"ENDHEADER";
<html>
<head>
@@ -429,10 +671,7 @@ END
}
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Advanced Catalog Search</h1>
-<hr />
+$bodytag
Enter terms or phrases separated by search operators
such as AND, OR, or NOT.<br />
<form method="post" action="/adm/searchcat">
@@ -447,7 +686,14 @@ ENDHEADER
$ENV{'form.viewselect'},
undef,undef,undef,
sort(keys(%Views)));
- $scrout.="</td><td>Related<br />Words</td></tr>\n";
+ $scrout.=' ';
+ $scrout.=&selectbox(undef,'show',
+ $ENV{'form.show'},
+ undef,undef,undef,
+ (10,20,50,100));
+ $scrout.=' '.
+ '<font color="#800000" face="helvetica">'.&mt('Per Page').'</font>';
+ $scrout.="</td><td>".&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
$scrout.=&searchphrasefield_with_related('title', 'title' ,
$ENV{'form.title'});
$scrout.=&searchphrasefield('author', 'author' ,$ENV{'form.author'});
@@ -462,13 +708,13 @@ ENDHEADER
$ENV{'form.abstract'});
# Hack - an empty table row.
$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";
- $scrout.=&searchphrasefield('file<br />extension','mime',
- $ENV{'form.mime'});
+ $scrout.=&searchphrasefield('file<br />extension','extension',
+ $ENV{'form.extension'});
$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";
$scrout.=&searchphrasefield('publisher<br />owner','owner',
$ENV{'form.owner'});
$scrout.="</table>\n";
- $ENV{'form.category'}='any' unless length($ENV{'form.category'});
+ $ENV{'form.category'}='any' if (! defined($ENV{'form.category'}));
$scrout.=&selectbox('File Category','category',
$ENV{'form.category'},
'any','Any category',
@@ -489,9 +735,9 @@ ENDHEADER
my @domains =&Apache::loncommon::get_domains();
# adjust the size of the select box
my $size = 4;
- my $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
+ $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
$scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
- 'DOMAINS</b></font><br />'.
+ 'DOMAINS TO BE SEARCHED</b></font><br />'.
'<select name="domains" size="'.$size.'" multiple>'."\n".
'<option name="any" value="any" '.
($domain_hash{'any'}? 'selected ' :'').
@@ -504,7 +750,7 @@ ENDHEADER
#----------------------------------------------------------------
$scrout.=&selectbox('Limit by language','language',
$ENV{'form.language'},'any','Any Language',
- \&{Apache::loncommon::languagedescription},
+ \&Apache::loncommon::languagedescription,
(&Apache::loncommon::languageids),
);
# ------------------------------------------------ Compute date selection boxes
@@ -551,29 +797,29 @@ LASTREVISIONDATEEND
$scrout.=&selectbox('Limit by copyright/distribution','copyright',
$ENV{'form.copyright'},
'any','Any copyright/distribution',
- \&{Apache::loncommon::copyrightdescription},
+ \&Apache::loncommon::copyrightdescription,
(&Apache::loncommon::copyrightids),
);
# ------------------------------------------- Compute customized metadata field
- $scrout.=<<CUSTOMMETADATA;
-<p>
-<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>
-</font>
-For resource-specific metadata, enter in an expression in the form of
-<i>key</i>=<i>value</i> separated by operators such as AND, OR or NOT.<br />
-<b>Example:</b> grandmother=75 OR grandfather=85
-<br />
-CUSTOMMETADATA
- $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
- $scrout.=<<CUSTOMSHOW;
-<p>
-<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b>
-</font>
-Enter in a space-separated list of special metadata fields to show
-in a fielded listing for each record result.
-<br />
-CUSTOMSHOW
- $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
+# $scrout.=<<CUSTOMMETADATA;
+#<p>
+#<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>
+#</font>
+#For resource-specific metadata, enter in an expression in the form of
+#<i>key</i>=<i>value</i> separated by operators such as AND, OR or NOT.<br />
+#<b>Example:</b> grandmother=75 OR grandfather=85
+#<br />
+#CUSTOMMETADATA
+# $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
+# $scrout.=<<CUSTOMSHOW;
+#<p>
+#<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b>
+#</font>
+#Enter in a space-separated list of special metadata fields to show
+#in a fielded listing for each record result.
+#<br />
+#CUSTOMSHOW
+# $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
$scrout.=<<ENDDOCUMENT;
$advanced_buttons
</form>
@@ -606,42 +852,39 @@ to them.
######################################################################
######################################################################
sub get_persistent_form_data {
- my $r = shift;
my $filename = shift;
- return undef if (! -e $filename);
+ return 0 if (! -e $filename);
return undef if (! tie(%persistent_db,'GDBM_File',$filename,
- &GDBM_READER,0640));
+ &GDBM_READER(),0640));
#
# These make sure we do not get array references printed out as 'values'.
- my %arrays_allowed = ('form.category'=>1,'form.domains'=>1);
+ my %arrays_allowed = ('form.domains'=>1);
#
# Loop through the keys, looking for 'form.'
foreach my $name (keys(%persistent_db)) {
next if ($name !~ /^form./);
+ # Kludgification begins!
+ if ($name eq 'form.domains' &&
+ $ENV{'form.searchmode'} eq 'basic' &&
+ $ENV{'form.phase'} ne 'disp_basic') {
+ next;
+ }
+ # End kludge (hopefully)
+ next if (exists($ENV{$name}));
my @values = map {
&Apache::lonnet::unescape($_);
} split(',',$persistent_db{$name});
next if (@values <1);
- if (exists($ENV{$name})) {
- if (ref($ENV{$name}) eq 'ARRAY') {
- # If it is an array, tack @values on the end of it.
- $ENV{$name} = [@$ENV{$name},@values];
- } elsif (! ref($ENV{$name}) && $arrays_allowed{$name}) {
- # if arrays are allowed, turn it into one and add @values
- $ENV{$name} = [$ENV{$name},@values];
- } # otherwise, assume the value in $ENV{$name} is better than ours.
+ if ($arrays_allowed{$name}) {
+ $ENV{$name} = [@values];
} else {
- if ($arrays_allowed{$name}) {
- $ENV{$name} = [@values];
- } else {
- $ENV{$name} = $values[0] if ($values[0]);
- }
+ $ENV{$name} = $values[0] if ($values[0]);
}
- &write_status($r,"Reconstructed $name = $ENV{$name}");
}
untie (%persistent_db);
return 1;
}
+
######################################################################
######################################################################
@@ -668,7 +911,7 @@ sub get_persistent_data {
my @Values; # Return array
return undef if (! -e $filename);
return undef if (! tie(%persistent_db,'GDBM_File',$filename,
- &GDBM_READER,0640));
+ &GDBM_READER(),0640));
foreach my $name (@Vars) {
if (! exists($persistent_db{$name})) {
push @Values, undef;
@@ -677,7 +920,7 @@ sub get_persistent_data {
my @values = map {
&Apache::lonnet::unescape($_);
} split(',',$persistent_db{$name});
- if (@values == 1) {
+ if (@values <= 1) {
push @Values,$values[0];
} else {
push @Values,\@values;
@@ -705,19 +948,15 @@ elements escaped and concatenated in a c
######################################################################
######################################################################
sub make_persistent {
- my $r = shift;
my %save = %{shift()};
my $filename = shift;
return undef if (! tie(%persistent_db,'GDBM_File',
- $filename,&GDBM_WRCREAT,0640));
+ $filename,&GDBM_WRCREAT(),0640));
foreach my $name (keys(%save)) {
- next if (! exists($save{$name}));
- next if (! defined($save{$name}) || $save{$name} eq '');
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
# We handle array references, but not recursively.
my $store = join(',', map { &Apache::lonnet::escape($_); } @values );
$persistent_db{$name} = $store;
- &write_status($r,"Stored $name = $store");
}
untie(%persistent_db);
return 1;
@@ -745,10 +984,10 @@ sub make_form_data_persistent {
my $filename = shift;
my %save;
foreach (keys(%ENV)) {
- next if (! /^form/ || /submit/);
+ next if (!/^form/ || /submit/);
$save{$_} = $ENV{$_};
}
- return &make_persistent($r,\%save,$filename);
+ return &make_persistent(\%save,$filename);
}
######################################################################
@@ -804,11 +1043,11 @@ If $value eq 'on' the box is checked.
###############################################
###############################################
-sub simplecheckbox {
- my ($name,$value)=@_;
- my $checked='';
- $checked="checked" if $value eq 'on';
- return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';
+sub simplecheckbox{
+ my ($name,$value,$checked)=@_;
+ $checked="checked" if ($value eq 'on');
+ return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.
+ $checked.' />';
}
###############################################
@@ -829,7 +1068,7 @@ field heading.
###############################################
sub fieldtitle {
- my $title = uc(shift());
+ my $title = uc(&mt(shift()));
return '<font color="#800000" face="helvetica"><b>'.$title.
': </b></font>';
}
@@ -924,7 +1163,7 @@ END
my $i = 1;
foreach (qw/January February March April May June
July August September October November December /){
- $month .="<option value=\"$i\">$_</option>\n";
+ $month .="<option value=\"$i\">".&mt($_)."</option>\n";
$i++;
}
$month.="</select>\n";
@@ -1001,6 +1240,7 @@ sub selectbox {
my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
if (! defined($functionref)) { $functionref = sub { $_[0]}; }
my $selout='';
+ $title=&mt($title);
if (defined($title)) {
my $uctitle=uc($title);
$selout="\n".'<p><font color="#800000" face="helvetica">'.
@@ -1011,12 +1251,12 @@ sub selectbox {
foreach (@idlist) {
$selout.='<option value="'.$_.'"';
if ($_ eq $default and !/^any$/) {
- $selout.=' selected >'.&{$functionref}($_).'</option>';
+ $selout.=' selected >'.&mt(&{$functionref}($_)).'</option>';
}
elsif ($_ eq $default and /^$anyvalue$/) {
- $selout.=' selected >'.$anytag.'</option>';
+ $selout.=' selected >'.&mt($anytag).'</option>';
}
- else {$selout.='>'.&{$functionref}($_).'</option>';}
+ else {$selout.='>'.&mt(&{$functionref}($_)).'</option>';}
}
return $selout.'</select>'.(defined($title)?'</p>':' ');
}
@@ -1069,7 +1309,7 @@ sub parse_advanced_search {
'lastrevisiondatestart_month','lastrevisiondatestart_day',
'lastrevisiondatestart_year','lastrevisiondateend_month',
'lastrevisiondateend_day','lastrevisiondateend_year',
- 'notes','abstract','mime','language','owner',
+ 'notes','abstract','extension','language','owner',
'custommetadata','customshow','category') {
$ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
@@ -1080,21 +1320,19 @@ sub parse_advanced_search {
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
# Preprocess the category form element.
- if ($ENV{'form.category'} ne 'any') {
- my @extensions = &Apache::loncommon::filecategorytypes
- ($ENV{'form.category'});
- $ENV{'form.mime'} = join ' OR ',@extensions;
- }
+ $ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) ||
+ ref($ENV{'form.category'}));
+ #
# Check to see if enough information was filled in
for my $field ('title','author','subject','keywords','url','version',
- 'notes','abstract','mime','language','owner',
- 'custommetadata') {
+ 'notes','abstract','category','extension','language',
+ 'owner','custommetadata') {
if (&filled($ENV{"form.$field"})) {
$fillflag++;
}
}
unless ($fillflag) {
- &output_blank_field_error($r,$closebutton);
+ &output_blank_field_error($r,$closebutton,'phase=disp_adv');
return ;
}
# Turn the form input into a SQL-based query
@@ -1103,7 +1341,7 @@ sub parse_advanced_search {
my $font = '<font color="#800000" face="helvetica">';
# Evaluate logical expression AND/OR/NOT phrase fields.
foreach my $field ('title','author','subject','notes','abstract','url',
- 'keywords','version','owner','mime') {
+ 'keywords','version','owner') {
if ($ENV{'form.'.$field}) {
my $searchphrase = $ENV{'form.'.$field};
$pretty_search_string .= $font."$field</font> contains <b>".
@@ -1122,10 +1360,30 @@ sub parse_advanced_search {
push @queries,&build_SQL_query($field,$searchphrase);
}
}
- # I dislike the hack below.
- if ($ENV{'form.category'}) {
- $ENV{'form.mime'}='';
+ #
+ # Make the 'mime' from 'form.category' and 'form.extension'
+ #
+ my $searchphrase;
+ if (exists($ENV{'form.category'}) &&
+ $ENV{'form.category'} !~ /^\s*$/ &&
+ $ENV{'form.category'} ne 'any') {
+ my @extensions = &Apache::loncommon::filecategorytypes
+ ($ENV{'form.category'});
+ if (scalar(@extensions) > 0) {
+ $searchphrase = join(' OR ',@extensions);
+ }
+ }
+ if (exists($ENV{'form.extension'}) && $ENV{'form.extension'} !~ /^\s*$/) {
+ $searchphrase .= ' OR ' if (defined($searchphrase));
+ my @extensions = split(/,/,$ENV{'form.extension'});
+ $searchphrase .= join(' OR ',@extensions);
+ }
+ if (defined($searchphrase)) {
+ push @queries,&build_SQL_query('mime',$searchphrase);
+ $pretty_search_string .=$font.'mime</font> contains <b>'.
+ $searchphrase.'</b><br />';
}
+ #####
# Evaluate option lists
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
push @queries,"(language like \"$ENV{'form.language'}\")";
@@ -1166,44 +1424,66 @@ sub parse_advanced_search {
}
# Process form information for custom metadata querying
my $customquery=undef;
- if ($ENV{'form.custommetadata'}) {
- $pretty_search_string .=$font."Custom Metadata Search</font>: <b>".
- $ENV{'form.custommetadata'}."</b><br />\n";
- $customquery=&build_custommetadata_query('custommetadata',
- $ENV{'form.custommetadata'});
- }
+# if ($ENV{'form.custommetadata'}) {
+# $pretty_search_string .=$font."Custom Metadata Search</font>: <b>".
+# $ENV{'form.custommetadata'}."</b><br />\n";
+# $customquery=&build_custommetadata_query('custommetadata',
+# $ENV{'form.custommetadata'});
+# }
my $customshow=undef;
- if ($ENV{'form.customshow'}) {
- $pretty_search_string .=$font."Custom Metadata Display</font>: <b>".
- $ENV{'form.customshow'}."</b><br />\n";
- $customshow=$ENV{'form.customshow'};
- $customshow=~s/[^\w\s]//g;
- my @fields=split(/\s+/,$customshow);
- $customshow=join(" ",@fields);
- }
+# if ($ENV{'form.customshow'}) {
+# $pretty_search_string .=$font."Custom Metadata Display</font>: <b>".
+# $ENV{'form.customshow'}."</b><br />\n";
+# $customshow=$ENV{'form.customshow'};
+# $customshow=~s/[^\w\s]//g;
+# my @fields=split(/\s+/,$customshow);
+# $customshow=join(" ",@fields);
+# }
## ---------------------------------------------------------------
## Deal with restrictions to given domains
##
+ my ($libraries_to_query,$pretty_domains_string) =
+ &parse_domain_restrictions();
+ $pretty_search_string .= $pretty_domains_string."<br />\n";
+ #
+ if (@queries) {
+ $query=join(" AND ",@queries);
+ $query="select * from metadata where $query";
+ } elsif ($customquery) {
+ $query = '';
+ }
+ return ($query,$customquery,$customshow,$libraries_to_query,
+ $pretty_search_string);
+}
+
+sub parse_domain_restrictions {
my $libraries_to_query = undef;
# $ENV{'form.domains'} can be either a scalar or an array reference.
# We need an array.
- my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}
- : ($ENV{'form.domains'}) );
+ if (! exists($ENV{'form.domains'})) {
+ return (undef,'');
+ }
+ my @allowed_domains;
+ if (ref($ENV{'form.domains'})) {
+ @allowed_domains = @{$ENV{'form.domains'}};
+ } else {
+ @allowed_domains = ($ENV{'form.domains'});
+ }
my %domain_hash = ();
my $pretty_domains_string;
foreach (@allowed_domains) {
$domain_hash{$_}++;
}
if ($domain_hash{'any'}) {
- $pretty_domains_string = "Searching all domains.";
+ $pretty_domains_string = "In all LON-CAPA domains.";
} else {
if (@allowed_domains > 1) {
- $pretty_domains_string = "Searching domains:";
+ $pretty_domains_string = "In LON-CAPA domains:";
} else {
- $pretty_domains_string = "Searching domain ";
+ $pretty_domains_string = "In LON-CAPA domain ";
}
foreach (sort @allowed_domains) {
- $pretty_domains_string .= "<b>$_</b> ";
+ $pretty_domains_string .= "<b>".$_."</b> ";
}
foreach (keys(%Apache::lonnet::libserv)) {
if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
@@ -1211,16 +1491,7 @@ sub parse_advanced_search {
}
}
}
- $pretty_search_string .= $pretty_domains_string."<br />\n";
- #
- if (@queries) {
- $query=join(" AND ",@queries);
- $query="select * from metadata where $query";
- } elsif ($customquery) {
- $query = '';
- }
- return ($query,$customquery,$customshow,$libraries_to_query,
- $pretty_search_string);
+ return ($libraries_to_query,$pretty_domains_string);
}
######################################################################
@@ -1248,10 +1519,11 @@ sub parse_basic_search {
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
-
+ my ($libraries_to_query,$pretty_domains_string) =
+ &parse_domain_restrictions();
# Check to see if enough is filled in
unless (&filled($ENV{'form.basicexp'})) {
- &output_blank_field_error($r,$closebutton);
+ &output_blank_field_error($r,$closebutton,'phase=disp_basic');
return OK;
}
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';
@@ -1267,13 +1539,19 @@ sub parse_basic_search {
}
# Build SQL query string based on form page
my $query='';
- my $concatarg=join('," ",',
+ my $concatarg=join(',',
('title', 'author', 'subject', 'notes', 'abstract',
'keywords'));
$concatarg='title' if $ENV{'form.titleonly'};
- $query=&build_SQL_query('concat('.$concatarg.')',$search_string);
+ $query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
+ if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
+ $pretty_search_string .= ' '.$pretty_domains_string;
+ }
$pretty_search_string .= "<br />\n";
- return 'select * from metadata where '.$query,$pretty_search_string;
+ my $final_query = 'SELECT * FROM metadata WHERE '.$query;
+# &Apache::lonnet::logthis($final_query);
+ return ($final_query,$pretty_search_string,
+ $libraries_to_query);
}
@@ -1386,30 +1664,26 @@ sub recursive_SQL_query_build {
my @matches=($pattern=~/(\[[^\]|\[]*\])/g);
return $pattern unless @matches;
foreach my $match (@matches) {
- $match=~/\[ (\w+)\s(.*) \]/;
- my ($key,$value)=($1,$2);
- my $replacement='';
- if ($key eq 'literal') {
- $replacement="($dkey like \"\%$value\%\")";
- }
- elsif ($key eq 'not') {
- $value=~s/like/not like/;
-# $replacement="($dkey not like $value)";
- $replacement="$value";
- }
- elsif ($key eq 'and') {
- $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
- $replacement="($1 AND $2)";
- }
- elsif ($key eq 'or') {
- $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
- $replacement="($1 OR $2)";
+ $match=~/\[ (\w+)\s(.*) \]/;
+ my ($key,$value)=($1,$2);
+ my $replacement='';
+ if ($key eq 'literal') {
+ $replacement="($dkey LIKE \"\%$value\%\")";
+ } elsif (lc($key) eq 'not') {
+ $value=~s/LIKE/NOT LIKE/;
+# $replacement="($dkey not like $value)";
+ $replacement="$value";
+ } elsif ($key eq 'and') {
+ $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
+ $replacement="($1 AND $2)";
+ } elsif ($key eq 'or') {
+ $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
+ $replacement="($1 OR $2)";
}
substr($pattern,
- index($pattern,$match),
- length($match),
- $replacement
- );
+ index($pattern,$match),
+ length($match),
+ $replacement);
}
&recursive_SQL_query_build($dkey,$pattern);
}
@@ -1487,7 +1761,6 @@ sub build_date_queries {
######################################################################
######################################################################
-
sub copyright_check {
my $Metadata = shift;
# Check copyright tags and skip results the user cannot use
@@ -1507,6 +1780,152 @@ sub copyright_check {
return 1;
}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &ensure_db_and_table
+
+Ensure we can get lonmysql to connect to the database and the table we
+need exists.
+
+Inputs: $r, table id
+
+Returns: undef on error, 1 if the table exists.
+
+=cut
+
+######################################################################
+######################################################################
+sub ensure_db_and_table {
+ my ($r,$table) = @_;
+ ##
+ ## Sanity check the table id.
+ ##
+ if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
+ $r->print("Unable to retrieve search results. ".
+ "Unable to determine the table results were stored in. ".
+ "</body></html>");
+ return undef;
+ }
+ ##
+ ## Make sure we can connect and the table exists.
+ ##
+ my $connection_result = &Apache::lonmysql::connect_to_db();
+ if (!defined($connection_result)) {
+ $r->print("Unable to connect to the MySQL database where your results".
+ " are stored. </body></html>");
+ &Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
+ " connect to database.");
+ &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
+ return undef;
+ }
+ my $table_check = &Apache::lonmysql::check_table($table);
+ if (! defined($table_check)) {
+ $r->print("A MySQL error has occurred.</form></body></html>");
+ &Apache::lonnet::logthis("lonmysql was unable to determine the status".
+ " of table ".$table);
+ return undef;
+ } elsif (! $table_check) {
+ $r->print("The table of results could not be found.");
+ &Apache::lonnet::logthis("The user requested a table, ".$table.
+ ", that could not be found.");
+ return undef;
+ }
+ return 1;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &print_sort_form
+
+=cut
+
+######################################################################
+######################################################################
+sub print_sort_form {
+ my ($r,$pretty_query_string) = @_;
+ ##
+ my %SortableFields=&Apache::lonlocal::texthash(
+ id => 'Default',
+ title => 'Title',
+ author => 'Author',
+ subject => 'Subject',
+ url => 'URL',
+ version => 'Version Number',
+ mime => 'Mime type',
+ lang => 'Language',
+ owner => 'Owner/Publisher',
+ copyright => 'Copyright',
+ hostname => 'Host',
+ creationdate => 'Creation Date',
+ lastrevisiondate => 'Revision Date'
+ );
+ ##
+ my $table = $ENV{'form.table'};
+ return if (! &ensure_db_and_table($r,$table));
+ ##
+ ## Get the number of results
+ ##
+ my $total_results = &Apache::lonmysql::number_of_rows($table);
+ if (! defined($total_results)) {
+ $r->print("A MySQL error has occurred.</form></body></html>");
+ &Apache::lonnet::logthis("lonmysql was unable to determine the number".
+ " of rows in table ".$table);
+ &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
+ return;
+ }
+ my $result;
+ $result.=<<END;
+<html>
+<head>
+<script>
+ function change_sort() {
+ var newloc = "/adm/searchcat?phase=results";
+ newloc += "&persistent_db_id=$ENV{'form.persistent_db_id'}";
+ newloc += "&sortby=";
+ newloc += document.forms.statusform.elements.sortby.value;
+ parent.resultsframe.location= newloc;
+ }
+</script>
+<title>Results</title>
+</head>
+$bodytag
+<form name="statusform" action="" method="post">
+<input type="hidden" name="Queue" value="" />
+END
+
+#<h2>Sort Results</h2>
+#Sort by: <select size="1" name="sortby" onchange="javascript:change_sort();">
+# $ENV{'form.sortby'} = 'id' if (! defined($ENV{'form.sortby'}));
+# foreach (keys(%SortableFields)) {
+# $result.="<option name=\"$_\"";
+# if ($_ eq $ENV{'form.sortby'}) {
+# $result.=" selected ";
+# }
+# $result.=" >$SortableFields{$_}</option>\n";
+# }
+# $result.="</select>\n";
+ my $revise = &revise_button();
+ $result.=<<END;
+<p>
+There are $total_results matches to your query. $revise
+</p><p>
+Search:$pretty_query_string
+</p>
+</form>
+</body>
+</html>
+END
+ $r->print($result);
+ return;
+}
+
#####################################################################
#####################################################################
@@ -1521,50 +1940,38 @@ the following format:
=cut
-##
-## Restrictions:
-## columns of type 'text' and 'blob' cannot have defaults.
-## columns of type 'enum' cannot be used for FULLTEXT.
-##
-my @DataOrder = qw/id title author subject url keywords version notes
- abstract mime lang owner copyright creationdate lastrevisiondate hostname
- idx_title idx_author idx_subject idx_abstract idx_mime idx_language
- idx_owner idx_copyright/;
-
-my %Datatypes =
- ( id =>{ type => 'INT',
- restrictions => 'NOT NULL',
- primary_key => 'yes',
- auto_inc => 'yes'
- },
- title =>{ type=>'TEXT'},
- author =>{ type=>'TEXT'},
- subject =>{ type=>'TEXT'},
- url =>{ type=>'TEXT',
- restrictions => 'NOT NULL' },
- keywords =>{ type=>'TEXT'},
- version =>{ type=>'TEXT'},
- notes =>{ type=>'TEXT'},
- abstract =>{ type=>'TEXT'},
- mime =>{ type=>'TEXT'},
- lang =>{ type=>'TEXT'},
- owner =>{ type=>'TEXT'},
- copyright =>{ type=>'TEXT'},
- hostname =>{ type=>'TEXT'},
+#####################################################################
+#####################################################################
+
+my @Datatypes =
+ ( { name => 'id',
+ type => 'MEDIUMINT',
+ restrictions => 'UNSIGNED NOT NULL',
+ primary_key => 'yes',
+ auto_inc => 'yes' },
+ { name => 'title', type=>'TEXT'},
+ { name => 'author', type=>'TEXT'},
+ { name => 'subject', type=>'TEXT'},
+ { name => 'url', type=>'TEXT', restrictions => 'NOT NULL' },
+ { name => 'keywords', type=>'TEXT'},
+ { name => 'version', type=>'TEXT'},
+ { name => 'notes', type=>'TEXT'},
+ { name => 'abstract', type=>'TEXT'},
+ { name => 'mime', type=>'TEXT'},
+ { name => 'lang', type=>'TEXT'},
+ { name => 'owner', type=>'TEXT'},
+ { name => 'copyright', type=>'TEXT'},
+ { name => 'hostname', type=>'TEXT'},
#--------------------------------------------------
- creationdate =>{ type=>'DATETIME'},
- lastrevisiondate =>{ type=>'DATETIME'},
+ { name => 'creationdate', type=>'DATETIME'},
+ { name => 'lastrevisiondate', type=>'DATETIME'},
#--------------------------------------------------
- idx_title =>{ type=>'FULLTEXT', target=>'title'},
- idx_author =>{ type=>'FULLTEXT', target=>'author'},
- idx_subject =>{ type=>'FULLTEXT', target=>'subject'},
- idx_abstract =>{ type=>'FULLTEXT', target=>'abstract'},
- idx_mime =>{ type=>'FULLTEXT', target=>'mime'},
- idx_language =>{ type=>'FULLTEXT', target=>'lang'},
- idx_owner =>{ type=>'FULLTEXT', target=>'owner'},
- idx_copyright =>{ type=>'FULLTEXT', target=>'copyright'},
);
+my @Fullindicies =
+ qw/title/;
+# qw/title author subject abstract mime language owner copyright/;
+
######################################################################
######################################################################
@@ -1585,8 +1992,8 @@ Returns: the identifier of the table on
######################################################################
sub create_results_table {
my $table = &Apache::lonmysql::create_table
- ( { columns => \%Datatypes,
- column_order => \@DataOrder,
+ ( { columns => \@Datatypes,
+ FULLTEXT => [{'columns' => \@Fullindicies},],
} );
if (defined($table)) {
$ENV{'form.table'} = $table;
@@ -1594,24 +2001,85 @@ sub create_results_table {
}
return undef; # Error...
}
+
######################################################################
######################################################################
=pod
-=item &write_status()
+=item Search Status update functions
+
+Each of the following functions changes the values of one of the
+input fields used to display the search status to the user. The names
+should be explanatory.
+
+Inputs: Apache request handler ($r), text to display.
+
+Returns: Nothing.
+
+=over 4
+
+=item &update_count_status()
+
+=item &update_status()
+
+=item &update_seconds()
+
+=back
=cut
######################################################################
######################################################################
-sub write_status {
- my ($r,$string) = @_;
- $string =~ s/(\')/\$1/g;
- $string =~ s/\n//sg;
-# $r->print("<script>alert('$string');</script>\n");
-# $r->rflush();
- return;
+sub update_count_status {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.count.value = ' $text'</script>\n");
+ $r->rflush();
+}
+
+sub update_status {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.status.value = ' $text'</script>\n");
+ $r->rflush();
+}
+
+sub update_seconds {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.seconds.value = ' $text'</script>\n");
+ $r->rflush();
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &revise_button
+
+Inputs: None
+
+Returns: html string for a 'revise search' button.
+
+=cut
+
+######################################################################
+######################################################################
+sub revise_button {
+ my $revise_phase = 'disp_basic';
+ $revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced');
+ my $newloc = '/adm/searchcat'.
+ '?persistent_db_id='.$ENV{'form.persistent_db_id'}.
+ '&cleargroupsort=1'.
+ '&phase='.$revise_phase;
+ my $result = qq{<input type="button" value="Revise search" name="revise"} .
+ qq{ onClick="parent.location='$newloc';" /> };
+ return $result;
}
######################################################################
@@ -1627,36 +2095,63 @@ sub write_status {
######################################################################
sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
+ my $connection = $r->connection;
#
# Timing variables
#
my $starttime = time;
- my $max_time = 120; # seconds for the search to complete
+ my $max_time = 30; # seconds for the search to complete
#
# Print run_search header
#
- $r->print("<html><head><title>Search Status</title></head><body>");
- $r->print("Search: ".$pretty_string."<br />\n");
+ $r->print(<<END);
+<html>
+<head><title>Search Status</title></head>
+$bodytag
+<form name="statusform" action="" method="post">
+<input type="hidden" name="Queue" value="" />
+END
+ # Check to see if $pretty_string has more than one carriage return.
+ # Assume \n s are following <br /> s and truncate the value.
+ # (there is probably a better way)...
+ my @Lines = split /<br \/>/,$pretty_string;
+ if (@Lines > 2) {
+ $pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
+ }
+ $r->print(&mt("Search").": ".$pretty_string);
$r->rflush();
#
# Determine the servers we need to contact.
#
my @Servers_to_contact;
if (defined($serverlist)) {
- @Servers_to_contact = @$serverlist;
+ if (ref($serverlist) eq 'ARRAY') {
+ @Servers_to_contact = @$serverlist;
+ } else {
+ @Servers_to_contact = ($serverlist);
+ }
} else {
@Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
}
my %Server_status;
my $table =$ENV{'form.table'};
- if (! defined($table)) {
- # What do I do now? Print out an error page.
- &Apache::lonnet::logthis("lonmysql attempted to create a table ".
- "and this was the result:".
+ if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
+ $r->print("Unable to determine table id to store search results in.".
+ "The search has been aborted.</body></html>");
+ return;
+ }
+ my $table_status = &Apache::lonmysql::check_table($table);
+ if (! defined($table_status)) {
+ $r->print("Unable to determine status of table.</body></html>");
+ &Apache::lonnet::logthis("Bogus table id of $table for ".
+ "$ENV{'user.name'} @ $ENV{'user.domain'}");
+ &Apache::lonnet::logthis("lonmysql error = ".
&Apache::lonmysql::get_error());
- $r->print("An internal error occured with the database.<br />".
- "The error has been logged, but you should probably alert".
- " your system administrator.");
+ return;
+ }
+ if (! $table_status) {
+ $r->print("The table id,$table, we tried to use is invalid.".
+ "The search has been aborted.</body></html>");
return;
}
##
@@ -1665,55 +2160,79 @@ sub run_search {
my $hitcountsum;
my $server;
my $status;
- while ((time - $starttime < $max_time) &&
+ my $revise = &revise_button();
+ $r->print(<<END);
+<table>
+<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
+<tr>
+<td><input type="text" name="status" value="" size="30" /></td>
+<td><input type="text" name="count" value="" size="10" /></td>
+<td><input type="text" name="seconds" value="" size="8" /></td>
+<td>$revise</td>
+</tr>
+</table>
+</form>
+END
+ $r->rflush();
+ my $time_remaining = $max_time - (time - $starttime) ;
+ my $last_time = $time_remaining;
+ &update_seconds($r,$time_remaining);
+ &update_status($r,'contacting '.$Servers_to_contact[0]);
+ while (($time_remaining > 0) &&
((@Servers_to_contact) || keys(%Server_status))) {
# Send out a search request if it needs to be done.
if (@Servers_to_contact) {
# Contact one server
my $server = shift(@Servers_to_contact);
+ &update_status($r,&mt('contacting').' '.$server);
my $reply=&Apache::lonnet::metadata_query($query,$customquery,
$customshow,[$server]);
($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};
- # $r->print("Contacted:$server:reply:$Server_status{$server}");
- if ($max_time - (time - $starttime) < 20) {
- # If there are less than 20 seconds to go in the search,
- # give the newly contacted servers 20 more seconds to
- # respond....
- $max_time += 20;
- }
} else {
- sleep(1); # wait a sec. to give time for files to be written
+ # wait a sec. to give time for files to be written
+ # This sleep statement is here instead of outside the else
+ # block because we do not want to pause if we have servers
+ # left to contact.
+ if (scalar (keys(%Server_status))) {
+ &update_status($r,
+ &mt('waiting on').' '.(join(' ',keys(%Server_status))));
+ }
+ sleep(1);
}
+ #
+ #
+ # Loop through the servers we have contacted but do not
+ # have results from yet, looking for results.
while (my ($server,$status) = each(%Server_status)) {
+ last if ($connection->aborted());
if ($status eq 'con_lost') {
delete ($Server_status{$server});
- # $r->print("server $server is not responding.");
next;
}
$status=~/^([\.\w]+)$/;
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
if (-e $datafile && ! -e "$datafile.end") {
- # Let the user know we are receiving data from the server
- # $r->print("$server:Receiving file");
+ &update_status($r,&mt('Receiving results from').' '.$server);
next;
}
+ last if ($connection->aborted());
if (-e "$datafile.end") {
+ &update_status($r,&mt('Reading results from').' '.$server);
if (-z "$datafile") {
delete($Server_status{$server});
next;
}
my $fh;
if (!($fh=Apache::File->new($datafile))) {
- # Error opening file...
- # Tell the user and exit...?
- # Should I give up on opening it?
$r->print("Unable to open search results file for ".
"server $server. Omitting from search");
- next;
+ delete($Server_status{$server});
+ next;
}
# Read in the whole file.
while (my $result = <$fh>) {
+ last if ($connection->aborted());
# handle custom fields? Someday we will!
chomp($result);
next unless $result;
@@ -1728,29 +2247,45 @@ sub run_search {
}
# $r->print(&Apache::lonmysql::get_debug());
$hitcountsum ++;
+ $time_remaining = $max_time - (time - $starttime) ;
+ if ($last_time - $time_remaining > 0) {
+ &update_seconds($r,$time_remaining);
+ $last_time = $time_remaining;
+ }
+ if ($hitcountsum % 50 == 0) {
+ &update_count_status($r,$hitcountsum);
+ }
} # End of foreach (@results)
$fh->close();
# $server is only deleted if the results file has been
# found and (successfully) opened. This may be a bad idea.
delete($Server_status{$server});
- # $r->print("Received $new_count more results from ".
- # $server.".");
}
+ last if ($connection->aborted());
+ &update_count_status($r,$hitcountsum);
}
+ last if ($connection->aborted());
# Finished looping through the servers
+ $starttime = time if (@Servers_to_contact);
+ $time_remaining = $max_time - (time - $starttime) ;
+ if ($last_time - $time_remaining > 0) {
+ $last_time = $time_remaining;
+ &update_seconds($r,$time_remaining);
+ }
}
+ &update_status($r,&mt('Search Complete').$server);
+ &update_seconds($r,0);
&Apache::lonmysql::disconnect_from_db();
- # Let the user know
- #
# We have run out of time or run out of servers to talk to and
# results to get.
- $r->print("<h1>Search completed.</h1>");
- if ($hitcountsum) {
- $r->print($hitcountsum." successful matches to your query.<br />");
- } else {
- $r->print("There were no successful matches to your query.<br />");
- }
$r->print("</body></html>");
+ if ($ENV{'form.catalogmode'} ne 'groupsearch') {
+ $r->print("<script>".
+ "window.location='/adm/searchcat?".
+ "phase=sort&".
+ "persistent_db_id=$ENV{'form.persistent_db_id'}';".
+ "</script>");
+ }
return;
}
@@ -1771,7 +2306,7 @@ sub prev_next_buttons {
##
## Prev
my $prev_min = $current_min - $show;
- $prev_min = 0 if $prev_min < 0;
+ $prev_min = 1 if $prev_min < 1;
if ($prev_min < $current_min) {
$links .= qq{
<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>
@@ -1810,8 +2345,9 @@ sub prev_next_buttons {
######################################################################
######################################################################
sub display_results {
- my ($r,$mode,$importbutton,$closebutton) = @_;
- $r->print(&search_results_header());
+ my ($r,$importbutton,$closebutton) = @_;
+ my $connection = $r->connection;
+ $r->print(&search_results_header($importbutton,$closebutton));
##
## Set viewing function
##
@@ -1822,16 +2358,20 @@ sub display_results {
return;
}
##
+ ## $checkbox_num is a count of the number of checkboxes output on the
+ ## page this is used only during catalogmode=groupsearch.
+ my $checkbox_num = 0;
+ ##
## Get the catalog controls setup
##
my $action = "/adm/searchcat?phase=results";
##
- ##
+ ## Deal with groupsearch
##
if ($ENV{'form.catalogmode'} eq 'groupsearch') {
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
- &GDBM_WRCREAT,0640)) {
- $r->print('Unable to tie hash to db file</body></html>');
+ &GDBM_WRCREAT(),0640)) {
+ $r->print('Unable to store import results.</form></body></html>');
$r->rflush();
return;
}
@@ -1840,90 +2380,90 @@ sub display_results {
## Prepare the table for querying
##
my $table = $ENV{'form.table'};
- my $connection_result = &Apache::lonmysql::connect_to_db();
- if (!defined($connection_result)) {
- $r->print(&Apache::lonmysql::get_error());
- }
- my $table_check = &Apache::lonmysql::check_table($table);
- if (! defined($table_check)) {
- $r->print("A MySQL error has occurred.</body></html>");
- &Apache::lonnet::logthis("lonmysql was unable to determine the status".
- " of table ".$table);
- return;
- } elsif (! $table_check) {
- $r->print("The table of results could not be found.");
- &Apache::lonnet::logthis("The user requested a table, ".$table.
- ", that could not be found.");
- return;
- }
+ return if (! &ensure_db_and_table($r,$table));
##
## Get the number of results
##
my $total_results = &Apache::lonmysql::number_of_rows($table);
if (! defined($total_results)) {
- $r->print("A MySQL error has occurred.</body></html>");
+ $r->print("A MySQL error has occurred.</form></body></html>");
&Apache::lonnet::logthis("lonmysql was unable to determine the number".
" of rows in table ".$table);
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
- &Apache::lonnet::logthis(&Apache::lonmysql::get_debug());
- return;
- }
- if ($total_results == 0) {
- $r->print("There were no results matching your query.\n".
- "</form></body></html>");
return;
}
##
## Determine how many results we need to get
##
- $ENV{'form.show'} = 20;
- $ENV{'form.start'} = 0 if (! exists($ENV{'form.start'}));
- $ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'}));
+ $ENV{'form.start'} = 1 if (! exists($ENV{'form.start'}));
+ $ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'}));
my $min = $ENV{'form.start'};
my $max;
if ($ENV{'form.show'} eq 'all') {
$max = $total_results ;
} else {
- $max = $min + $ENV{'form.show'};
+ $max = $min + $ENV{'form.show'} - 1;
$max = $total_results if ($max > $total_results);
}
##
## Output links (if necessary) for 'prev' and 'next' pages.
##
- $r->print("<center>Results $min to $max out of $total_results</center>\n");
$r->print
- ('<br /><center>'.
+ ('<center>'.
&prev_next_buttons($min,$ENV{'form.show'},$total_results,
"table=".$ENV{'form.table'}.
"&phase=results".
"&persistent_db_id=".$ENV{'form.persistent_db_id'})
- ."</center><br />\n"
+ ."</center>\n"
);
+ if ($total_results == 0) {
+ $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
+ '<h3>'.&mt('There are currently no results').'.</h3>'.
+ "</form></body></html>");
+ return;
+ } else {
+ $r->print
+ ("<center>Results $min to $max out of $total_results</center>\n");
+ }
##
## Get results from MySQL table
##
my @Results = &Apache::lonmysql::get_rows($table,
- 'id>'.$min.' AND id<='.$max);
+ 'id>='.$min.' AND id<='.$max);
##
## Loop through the results and output them.
##
foreach my $row (@Results) {
+ if ($connection->aborted()) {
+ &cleanup();
+ return;
+ }
my %Fields = %{&parse_row(@$row)};
my $output="<p>\n";
- $output.=&catalogmode_output($Fields{'title'},$Fields{'url'});
+ my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
+ $Fields{'id'},$checkbox_num++);
# Render the result into html
- $output.= &$viewfunction(%Fields);
- $output.="</p>\n<hr align='left' width='200' noshade />";
+ $output.= &$viewfunction($prefix,%Fields);
# Print them out as they come in.
$r->print($output);
$r->rflush();
}
if (@Results < 1) {
- $r->print("There were no results matching your query");
+ $r->print(&mt("There were no results matching your query"));
+ } else {
+ $r->print
+ ('<center>'.
+ &prev_next_buttons($min,$ENV{'form.show'},$total_results,
+ "table=".$ENV{'form.table'}.
+ "&phase=results".
+ "&persistent_db_id=".
+ $ENV{'form.persistent_db_id'})
+ ."</center>\n"
+ );
}
- $r->print("</body></html>");
+ $r->print("</form></body></html>");
$r->rflush();
- untie %groupsearch_db;
+ untie %groupsearch_db if (tied(%groupsearch_db));
return;
}
@@ -1932,24 +2472,20 @@ sub display_results {
=pod
-=item &catalogmode_output($title,$url)
+=item &catalogmode_output($title,$url,$fnum,$checkbox_num)
Returns html needed for the various catalog modes. Gets inputs from
-$ENV{'form.catalogmode'}. Stores data in %groupsearch_db and $fnum
-(local variable).
+$ENV{'form.catalogmode'}. Stores data in %groupsearch_db.
=cut
######################################################################
######################################################################
-{
-my $fnum;
-
sub catalogmode_output {
my $output = '';
- my ($title,$url) = @_;
+ my ($title,$url,$fnum,$checkbox_num) = @_;
if ($ENV{'form.catalogmode'} eq 'interactive') {
- $title=~ s/\'/\\'/g; # ' Escape single quotes.
+ $title=~ s/\'/\\\'/g;
if ($ENV{'form.catalogmode'} eq 'interactive') {
$output.=<<END
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
@@ -1957,23 +2493,18 @@ onClick="javascript:select_data('$title'
</font>
END
}
- }
- if ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $fnum+=0;
+ } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
$groupsearch_db{"pre_${fnum}_link"}=$url;
$groupsearch_db{"pre_${fnum}_title"}=$title;
$output.=<<END;
<font size='-1'>
<input type="checkbox" name="returnvalues" value="SELECT"
-onClick="javascript:queue($fnum)" />
+onClick="javascript:queue($checkbox_num,$fnum)" />
</font>
END
- $fnum++;
}
return $output;
}
-
-}
######################################################################
######################################################################
@@ -1991,7 +2522,7 @@ sub parse_row {
my @Row = @_;
my %Fields;
for (my $i=0;$i<=$#Row;$i++) {
- $Fields{$DataOrder[$i]}=&Apache::lonnet::unescape($Row[$i]);
+ $Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
}
$Fields{'language'} =
&Apache::loncommon::languagedescription($Fields{'lang'});
@@ -2161,8 +2692,16 @@ Checked for existance & 'edit' mode.
=item 'form.form'
+Contains the name of the form that has the input fields to set
+
=item 'form.element'
+the name of the input field to put the URL into
+
+=item 'form.titleelement'
+
+the name of the input field to put the title into
+
=back
=cut
@@ -2170,6 +2709,7 @@ Checked for existance & 'edit' mode.
######################################################################
######################################################################
sub search_results_header {
+ my ($importbutton,$closebutton) = @_;
my $result = '';
# output beginning of search page
# conditional output of script functions dependent on the mode in
@@ -2181,16 +2721,16 @@ sub search_results_header {
function select_data(title,url) {
changeTitle(title);
changeURL(url);
- self.close();
+ parent.close();
}
function changeTitle(val) {
- if (opener.inf.document.forms.resinfo.elements.t) {
- opener.inf.document.forms.resinfo.elements.t.value=val;
+ if (parent.opener.inf.document.forms.resinfo.elements.t) {
+ parent.opener.inf.document.forms.resinfo.elements.t.value=val;
}
}
function changeURL(val) {
- if (opener.inf.document.forms.resinfo.elements.u) {
- opener.inf.document.forms.resinfo.elements.u.value=val;
+ if (parent.opener.inf.document.forms.resinfo.elements.u) {
+ parent.opener.inf.document.forms.resinfo.elements.u.value=val;
}
}
</script>
@@ -2198,17 +2738,34 @@ SCRIPT
} elsif ($ENV{'form.mode'} eq 'edit') {
my $form = $ENV{'form.form'};
my $element = $ENV{'form.element'};
+ my $titleelement = $ENV{'form.titleelement'};
+ my $changetitle;
+ if (!$titleelement) {
+ $changetitle='function changeTitle(val) {}';
+ } else {
+ $changetitle=<<END;
+function changeTitle(val) {
+ if (parent.targetwin.document) {
+ parent.targetwin.document.forms["$form"].elements["$titleelement"].value=val;
+ } else {
+ var url = 'forms[\"$form\"].elements[\"$titleelement\"].value';
+ alert("Unable to transfer data to "+url);
+ }
+}
+END
+ }
+
$result.=<<SCRIPT;
<script type="text/javascript">
function select_data(title,url) {
changeURL(url);
- self.close();
-}
-function changeTitle(val) {
+ changeTitle(title);
+ parent.close();
}
+$changetitle
function changeURL(val) {
- if (window.opener.document) {
- window.opener.document.forms["$form"].elements["$element"].value=val;
+ if (parent.targetwin.document) {
+ parent.targetwin.document.forms["$form"].elements["$element"].value=val;
} else {
var url = 'forms[\"$form\"].elements[\"$element\"].value';
alert("Unable to transfer data to "+url);
@@ -2220,26 +2777,35 @@ SCRIPT
}
$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
<script type="text/javascript">
- function select_data(title,url) {
-// alert('DEBUG: Should be storing '+title+' and '+url);
- }
- function queue(val) {
- if (eval("document.forms.results.returnvalues["+val+"].checked")) {
- document.forms.results.acts.value+='1a'+val+'b';
- }
- else {
- document.forms.results.acts.value+='0a'+val+'b';
- }
+ function queue(checkbox_num,val) {
+ if (document.forms.results.returnvalues.length != "undefined" &&
+ typeof(document.forms.results.returnvalues.length) == "number") {
+ if (document.forms.results.returnvalues[checkbox_num].checked) {
+ parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+ } else {
+ parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+ }
+ } else {
+ if (document.forms.results.returnvalues.checked) {
+ parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+ } else {
+ parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+ }
+ }
}
function select_group() {
- window.location=
+ parent.window.location=
"/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+
- document.forms.results.acts.value;
+ parent.statusframe.document.forms.statusform.elements.Queue.value;
}
</script>
SCRIPT
$result.=<<END;
</head>
+$bodytag
+<form name="results" method="post" action="" >
+<input type="hidden" name="Queue" value="" />
+$importbutton
END
return $result;
}
@@ -2249,12 +2815,20 @@ END
sub search_status_header {
return <<ENDSTATUS;
<html><head><title>Search Status</title></head>
-<body>
+$bodytag
<h3>Search Status</h3>
Sending search request to LON-CAPA servers.<br />
ENDSTATUS
}
+sub results_link {
+ my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
+ "&persistent_db_id=".$ENV{'form.persistent_db_id'};
+ my $results_link = $basic_link."&phase=results".
+ "&pause=1"."&start=1";
+ return $results_link;
+}
+
######################################################################
######################################################################
sub print_frames_interface {
@@ -2262,11 +2836,14 @@ sub print_frames_interface {
my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
"&persistent_db_id=".$ENV{'form.persistent_db_id'};
my $run_search_link = $basic_link."&phase=run_search";
- my $results_link = $basic_link."&phase=results".
- "&pause=10"."&start=0"."&show=20";
+ my $results_link = &results_link();
my $result = <<"ENDFRAMES";
<html>
<head>
+<script>
+var targetwin = opener;
+var queue = '';
+</script>
<title>LON-CAPA Digital Library Search Results</title>
</head>
<frameset rows="150,*">
@@ -2302,10 +2879,10 @@ extra custom metadata to show.
######################################################################
######################################################################
sub detailed_citation_view {
- my %values = @_;
+ my ($prefix,%values) = @_;
my $result=<<END;
-<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
- target='search_preview'>$values{'title'}</a></h3>
+<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
+ target='search_preview'>$values{'title'}</a></b>
<p>
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
@@ -2320,6 +2897,7 @@ $values{'extrashow'}
<p>
$values{'shortabstract'}
</p>
+<hr align='left' width='200' noshade />
END
return $result;
}
@@ -2335,19 +2913,42 @@ END
######################################################################
######################################################################
sub summary_view {
- my %values = @_;
+ my ($prefix,%values) = @_;
my $result=<<END;
-<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
+$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'author'}</a><br />
$values{'title'}<br />
$values{'owner'} -- $values{'lastrevisiondate'}<br />
$values{'copyrighttag'}<br />
$values{'extrashow'}
</p>
+<hr align='left' width='200' noshade />
+END
+ return $result;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &compact_view()
+
+=cut
+
+######################################################################
+######################################################################
+sub compact_view {
+ my ($prefix,%values) = @_;
+ my $result=<<END;
+$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'>
+$values{'title'}</a>
+<b>$values{'author'}</b><br />
END
return $result;
}
+
######################################################################
######################################################################
@@ -2360,8 +2961,9 @@ END
######################################################################
######################################################################
sub fielded_format_view {
- my %values = @_;
+ my ($prefix,%values) = @_;
my $result=<<END;
+$prefix
<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'url'}</a>
<br />
@@ -2380,6 +2982,7 @@ sub fielded_format_view {
<b>Abstract:</b> $values{'shortabstract'}<br />
$values{'extrashow'}
</p>
+<hr align='left' width='200' noshade />
END
return $result;
}
@@ -2398,8 +3001,9 @@ END
######################################################################
######################################################################
sub xml_sgml_view {
- my %values = @_;
+ my ($prefix,%values) = @_;
my $result=<<END;
+$prefix
<pre>
<LonCapaResource>
<url>$values{'url'}</url>
@@ -2428,6 +3032,7 @@ sub xml_sgml_view {
</LonCapaResource>
</pre>
$values{'extrashow'}
+<hr align='left' width='200' noshade />
END
return $result;
}
@@ -2460,12 +3065,21 @@ sub filled {
=item &output_blank_field_error()
+Output a complete page that indicates the user has not filled in enough
+information to do a search.
+
+Inputs: $r (Apache request handle), $closebutton, $parms.
+
+Returns: nothing
+
+$parms is extra information to include in the 'Revise search request' link.
+
=cut
######################################################################
######################################################################
sub output_blank_field_error {
- my ($r,$closebutton)=@_;
+ my ($r,$closebutton,$parms)=@_;
# make query information persistent to allow for subsequent revision
$r->print(<<BEGINNING);
<html>
@@ -2474,21 +3088,20 @@ sub output_blank_field_error {
BEGINNING
$r->print(<<RESULTS);
</head>
-<body bgcolor="#ffffff">
+$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">
$hidden_fields
-<a href="/adm/searchcat?persistent_db_id=$ENV{'form.persistent_db_id'}"
+<a href="/adm/searchcat?$parms&persistent_db_id=$ENV{'form.persistent_db_id'}"
>Revise search request</a>
$closebutton
<hr />
-<h3>Helpful Message</h3>
+<h3>Unactionable search query.</h3>
<p>
-Incorrect search query due to blank entry fields.
-You need to fill in the relevant
-fields on the search page in order for a query to be
-processed.
+You did not fill in enough information for the search to be started.
+You need to fill in relevant fields on the search page in order
+for a query to be processed.
</p>
</body>
</html>
@@ -2522,7 +3135,7 @@ sub output_date_error {
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#ffffff">
+$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">
@@ -2531,7 +3144,7 @@ $hidden_fields
onClick='this.form.submit();' />
$closebutton
<hr />
-<h3>Helpful Message</h3>
+<h3>Error</h3>
<p>
$message
</p>
@@ -2568,6 +3181,17 @@ sub start_fresh_session {
1;
+sub cleanup {
+ if (tied(%groupsearch_db)) {
+ &Apache::lonnet::logthis('Cleanup searchcat: groupsearch_db');
+ unless (untie(%groupsearch_db)) {
+ &Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
+ }
+ }
+ &untiehash();
+ &Apache::lonmysql::disconnect_from_db();
+}
+
__END__
=pod