--- loncom/interface/lonsearchcat.pm 2002/06/24 16:45:22 1.128
+++ loncom/interface/lonsearchcat.pm 2002/07/30 20:26:05 1.149
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.128 2002/06/24 16:45:22 harris41 Exp $
+# $Id: lonsearchcat.pm,v 1.149 2002/07/30 20:26:05 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@
=head1 NAME
-lonsearchcat
+lonsearchcat - LONCAPA Search Interface
=head1 SYNOPSIS
@@ -87,8 +87,10 @@ use Apache::lonnet();
use Apache::File();
use CGI qw(:standard);
use Text::Query;
+use DBI;
use GDBM_File;
use Apache::loncommon();
+use Apache::lonmysql();
# ---------------------------------------- variables used throughout the module
@@ -101,23 +103,26 @@ use Apache::loncommon();
=over 4
-=item $closebutton
-
-button that closes the search window
-
=item $importbutton
-button to take the selecte results and go to group sorting
+button to take the select results and go to group sorting
-=item %hash
+=item %groupsearch_db
-The ubiquitous database hash
+Database hash used to save values for the groupsearch RAT interface.
=item $diropendb
The full path to the (temporary) search database file. This is set and
used in &handler() and is also used in &output_results().
+=item %Views
+
+Hash which associates an output view description with the function
+that produces it. Adding a new view type should be as easy as
+adding a line to the definition of this hash and making sure the function
+takes the proper parameters.
+
=back
=cut
@@ -126,13 +131,18 @@ used in &handler() and is also used in &
######################################################################
# -- 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
# -- miscellaneous variables
-my %hash; # database hash
+my %groupsearch_db; # database hash
my $diropendb = ""; # db file
-
+# View Description Function Pointer
+my %Views = ("Detailed Citation View" => \&detailed_citation_view,
+ "Summary View" => \&summary_view,
+ "Fielded Format" => \&fielded_format_view,
+ "XML/SGML" => \&xml_sgml_view );
+my %persistent_db;
+my $hidden_fields;
######################################################################
######################################################################
@@ -160,26 +170,60 @@ string that holds portions of the screen
######################################################################
sub handler {
my $r = shift;
- untie %hash;
-
+ #
+ my $closebutton; # button that closes the search window
+ # This button is different for the RAT compared to
+ # normal invocation.
+ #
$r->content_type('text/html');
$r->send_http_header;
return OK if $r->header_only;
-
+ ##
+ ## 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']);
+ ##
+ ## 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
+ ## printing the results. We only need (theoretically) to do
+ ## this once, so the pause indicator is deleted
+ ##
+ if (exists($ENV{'form.pause'})) {
+ sleep(3);
+ 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";
-
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['catalogmode','launch','acts','mode','form','element',
- 'reqinterface']);
+ #
+ # 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.launch'} eq '1')) {
+ $ENV{'form.persistent_db_id'} = time;
+ }
+ 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';
##
- ## Clear out old values from database
+ if (! &get_persistent_form_data($r,$persistent_db_file)) {
+ &write_status($r,"Unable to get persistent data");
+ }
##
+ ## Clear out old values from groupsearch database
+ ##
+ untie %groupsearch_db if (tied(%groupsearch_db));
if ($ENV{'form.launch'} eq '1') {
- if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+ if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();
- untie %hash;
+ untie %groupsearch_db;
} else {
$r->print('<html><head></head><body>Unable to tie hash to db '.
'file</body></html>');
@@ -187,23 +231,15 @@ sub handler {
}
}
##
- ## Produce some output, so people know it is working
- ##
- $r->print("\n");
- $r->rflush;
- ##
## Configure dynamic components of interface
##
- my $hidden; # Holds 'hidden' html forms
+ $hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
+ $ENV{'form.persistent_db_id'}.'" />';
+ ##
if ($ENV{'form.catalogmode'} eq 'interactive') {
- $hidden="<input type='hidden' name='catalogmode' value='interactive'>".
- "\n";
$closebutton="<input type='button' name='close' value='CLOSE' ".
"onClick='self.close()'>"."\n";
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $hidden=<<END;
-<input type='hidden' name='catalogmode' value='groupsearch'>
-END
$closebutton=<<END;
<input type='button' name='close' value='CLOSE' onClick='self.close()'>
END
@@ -211,29 +247,86 @@ END
<input type='button' name='import' value='IMPORT'
onClick='javascript:select_group()'>
END
+ } else {
+ $closebutton = '';
+ $importbutton = '';
}
- $hidden .= <<END;
-<input type='hidden' name='mode' value='$ENV{'form.mode'}'>
-<input type='hidden' name='form' value='$ENV{'form.form'}'>
-<input type='hidden' name='element' value='$ENV{'form.element'}'>
-<input type='hidden' name='date' value='2'>
-END
##
- ## What are we doing?
+ ## Sanity checks on form elements
##
- if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
- # Perform basic search and give results
- return &basicsearch($r,\%ENV,$hidden);
- } elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
- # Perform advanced search and give results
- return &advancedsearch($r,\%ENV,$hidden);
- } elsif ($ENV{'form.reqinterface'} eq 'advanced') {
- # Output the advanced interface
- $r->print(&advanced_search_form($closebutton,$hidden));
- return OK;
- } else {
- # Output normal search interface
- $r->print(&basic_search_form($closebutton,$hidden));
+ if (!defined($ENV{'form.viewselect'})) {
+ $ENV{'form.viewselect'} ="Detailed Citation View";
+ }
+ $ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
+ ##
+ ## Switch on the phase
+ ##
+ if ($ENV{'form.phase'} eq 'disp_basic') {
+ &print_basic_search_form($r,$closebutton);
+ } elsif ($ENV{'form.phase'} eq 'disp_adv') {
+ &print_advanced_search_form($r,$closebutton);
+ } elsif ($ENV{'form.phase'} eq 'results') {
+ &display_results($r,$importbutton,$closebutton);
+ } elsif($ENV{'form.phase'} eq '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);
+ } elsif(($ENV{'form.phase'} eq 'basic_search') ||
+ ($ENV{'form.phase'} eq 'adv_search')) {
+ # Set up table
+ if (! defined(&create_results_table())) {
+ $r->print(<<END);
+<html><head><title>Search Error</title></head>
+<body>
+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)) {
+ $r->print(<<END);
+<html><head><title>Search Error</title></head>
+<body>
+Unable to properly store search information. The search has been aborted.
+</body>
+</html>
+END
+ return OK;
+ }
+ #
+ # We are running a search
+ my ($query,$customquery,$customshow,$libraries) =
+ (undef,undef,undef,undef);
+ my $pretty_string;
+ if ($ENV{'form.phase'} eq 'basic_search') {
+ ($query,$pretty_string) = &parse_basic_search($r,$closebutton);
+ } else { # Advanced search
+ ($query,$customquery,$customshow,$libraries,$pretty_string)
+ = &parse_advanced_search($r,$closebutton);
+ return OK if (! defined($query));
+ }
+ &make_persistent($r,
+ { query => $query,
+ customquery => $customquery,
+ customshow => $customshow,
+ libraries => $libraries,
+ pretty_string => $pretty_string },
+ $persistent_db_file);
+ ##
+ ## Print out the frames interface
+ ##
+ &print_frames_interface($r);
}
return OK;
}
@@ -243,7 +336,7 @@ END
=pod
-=item &basic_search_form()
+=item &print_basic_search_form()
Returns a scalar which holds html for the basic search form.
@@ -252,8 +345,8 @@ Returns a scalar which holds html for th
######################################################################
######################################################################
-sub basic_search_form{
- my ($closebutton,$hidden) = @_;
+sub print_basic_search_form{
+ my ($r,$closebutton) = @_;
my $scrout=<<"ENDDOCUMENT";
<html>
<head>
@@ -270,10 +363,12 @@ sub basic_search_form{
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">
-$hidden
+<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.
+Enter terms or phrases separated by AND, OR, or NOT
+then press SEARCH below.
</p>
<p>
<table>
@@ -283,28 +378,29 @@ ENDDOCUMENT
' ';
# $scrout.=&simplecheckbox('allversions',$ENV{'form.allversions'});
# $scrout.='<font color="#800000">Search historic archives</font>';
- $scrout.=<<ENDDOCUMENT;
-</td><td><a href="/adm/searchcat?reqinterface=advanced">Advanced Search</a></td></tr></table>
+ my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
+ $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>
+</table>
</p>
<p>
<input type="submit" name="basicsubmit" value='SEARCH' />
$closebutton
-<!-- basic view selection -->
-<select name='basicviewselect'>
-<option value='Detailed Citation View' selected="true">
-Detailed Citation View</option>
-<option value='Summary View'>Summary View</option>
-<option value='Fielded Format'>Fielded Format</option>
-<option value='XML/SGML'>XML/SGML</option>
-</select>
-<!-- end of basic view selection -->
+END
+ $scrout.=&selectbox(undef,'viewselect',
+ $ENV{'form.viewselect'},
+ undef,undef,undef,
+ sort(keys(%Views)));
+ $scrout.=<<ENDDOCUMENT;
<input type="button" value="HELP" onClick="openhelp()" />
</p>
</form>
</body>
</html>
ENDDOCUMENT
- return $scrout;
+ $r->print($scrout);
+ return;
}
######################################################################
######################################################################
@@ -320,8 +416,19 @@ Returns a scalar which holds html for th
######################################################################
######################################################################
-sub advanced_search_form{
- my ($closebutton,$hidden) = @_;
+sub print_advanced_search_form{
+ my ($r,$closebutton) = @_;
+ my $advanced_buttons = <<"END";
+<p>
+<input type="submit" name="advancedsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
+$closebutton
+<input type="button" value="HELP" onClick="openhelp()" />
+</p>
+END
+ if (!defined($ENV{'form.viewselect'})) {
+ $ENV{'form.viewselect'} ="Detailed Citation View";
+ }
my $scrout=<<"ENDHEADER";
<html>
<head>
@@ -336,35 +443,77 @@ sub advanced_search_form{
</head>
<body bgcolor="#FFFFFF">
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
-<form method="post" action="/adm/searchcat">
-$hidden
+<h1>Advanced Catalog Search</h1>
<hr />
-<h3>Advanced Search</h3>
+Enter terms or phrases separated by search operators
+such as AND, OR, or NOT.<br />
+<form method="post" action="/adm/searchcat">
+$advanced_buttons
+$hidden_fields
+<input type="hidden" name="phase" value="adv_search" />
+<table>
+<tr><td><font color="#800000" face="helvetica"><b>VIEW:</b></font></td>
+<td>
ENDHEADER
- $scrout.=&searchphrasefield('Limit by title','title',
- $ENV{'form.title'});
- $scrout.=&searchphrasefield('Limit by author','author',
- $ENV{'form.author'});
- $scrout.=&searchphrasefield('Limit by subject','subject',
- $ENV{'form.subject'});
- $scrout.=&searchphrasefield('Limit by keywords','keywords',
- $ENV{'form.keywords'});
- $scrout.=&searchphrasefield('Limit by URL','url',
- $ENV{'form.url'});
-# $scrout.=&searchphrasefield('Limit by version','version',
-# $ENV{'form.version'});
- $scrout.=&searchphrasefield('Limit by notes','notes',
- $ENV{'form.notes'});
- $scrout.=&searchphrasefield('Limit by abstract','abstract',
- $ENV{'form.abstract'});
- $ENV{'form.mime'}='any' unless length($ENV{'form.mime'});
- $scrout.=&selectbox('Limit by MIME type','mime',
- $ENV{'form.mime'},
- 'any','Any type',
- \&{Apache::loncommon::filedescriptionex},
- (&Apache::loncommon::fileextensions));
+ $scrout.=&selectbox(undef,'viewselect',
+ $ENV{'form.viewselect'},
+ undef,undef,undef,
+ sort(keys(%Views)));
+ $scrout.="</td><td>Related<br />Words</td></tr>\n";
+ $scrout.=&searchphrasefield_with_related('title', 'title' ,
+ $ENV{'form.title'});
+ $scrout.=&searchphrasefield('author', 'author' ,$ENV{'form.author'});
+ $scrout.=&searchphrasefield_with_related('subject', 'subject' ,
+ $ENV{'form.subject'});
+ $scrout.=&searchphrasefield_with_related('keywords','keywords',
+ $ENV{'form.keywords'});
+ $scrout.=&searchphrasefield('URL', 'url' ,$ENV{'form.url'});
+ $scrout.=&searchphrasefield_with_related('notes', 'notes' ,
+ $ENV{'form.notes'});
+ $scrout.=&searchphrasefield_with_related('abstract','abstract',
+ $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.="<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'});
+ $scrout.=&selectbox('File Category','category',
+ $ENV{'form.category'},
+ 'any','Any category',
+ undef,
+ (&Apache::loncommon::filecategories()));
$ENV{'form.language'}='any' unless length($ENV{'form.language'});
+ #----------------------------------------------------------------
+ # Allow restriction to multiple domains.
+ # I make the crazy assumption that there will never be a domain 'any'.
+ #
+ $ENV{'form.domains'} = 'any' if (! exists($ENV{'form.domains'}));
+ my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}
+ : ($ENV{'form.domains'}) );
+ my %domain_hash = ();
+ foreach (@allowed_domains) {
+ $domain_hash{$_}++;
+ }
+ 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);
+ $scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
+ 'DOMAINS</b></font><br />'.
+ '<select name="domains" size="'.$size.'" multiple>'."\n".
+ '<option name="any" value="any" '.
+ ($domain_hash{'any'}? 'selected ' :'').
+ '>all domains</option>'."\n";
+ foreach my $dom (sort @domains) {
+ $scrout.="<option name=\"$dom\" ".
+ ($domain_hash{$dom} ? 'selected ' :'').">$dom</option>\n";
+ }
+ $scrout.="</select>\n";
+ #----------------------------------------------------------------
$scrout.=&selectbox('Limit by language','language',
$ENV{'form.language'},'any','Any Language',
\&{Apache::loncommon::languagedescription},
@@ -410,8 +559,6 @@ LASTREVISIONDATEEND
$ENV{'form.lastrevisiondateend_year'},
);
$scrout.='</p>';
- $scrout.=&searchphrasefield('Limit by publisher/owner','owner',
- $ENV{'form.owner'});
$ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});
$scrout.=&selectbox('Limit by copyright/distribution','copyright',
$ENV{'form.copyright'},
@@ -440,26 +587,13 @@ in a fielded listing for each record res
CUSTOMSHOW
$scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
$scrout.=<<ENDDOCUMENT;
-<p>
-<input type="submit" name="advancedsubmit" value='SEARCH' />
-<input type="reset" name="reset" value='RESET' />
-$closebutton
-<!-- advance view select -->
-<select name='advancedviewselect'>
-<option value='Detailed Citation View' selected="true">
-Detailed Citation View</option>
-<option value='Summary View'>Summary View</option>
-<option value='Fielded Format'>Fielded Format</option>
-<option value='XML/SGML'>XML/SGML</option>
-</select>
-<!-- end of advanced view select -->
-<input type="button" value="HELP" onClick="openhelp()" />
-</p>
+$advanced_buttons
</form>
</body>
</html>
ENDDOCUMENT
- return $scrout;
+ $r->print($scrout);
+ return;
}
######################################################################
@@ -467,36 +601,169 @@ ENDDOCUMENT
=pod
-=item &make_persistent()
+=item &get_persistent_form_data
-Returns a scalar which holds the current ENV{'form.*'} values in
-a 'hidden' html input tag. This allows search interface information
-to be somewhat persistent.
+Inputs: filename of database
+
+Outputs: returns undef on database errors.
+
+This function is the reverse of &make_persistent() for form data.
+Retrieve persistent data from %persistent_db. Retrieved items will have their
+values unescaped. If a form value already exists in $ENV, it will not be
+overwritten. Form values that are array references may have values appended
+to them.
=cut
######################################################################
######################################################################
+sub get_persistent_form_data {
+ my $r = shift;
+ my $filename = shift;
+ return 0 if (! -e $filename);
+ return undef if (! tie(%persistent_db,'GDBM_File',$filename,
+ &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);
+ #
+ # Loop through the keys, looking for 'form.'
+ foreach my $name (keys(%persistent_db)) {
+ next if ($name !~ /^form./);
+ 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.
+ } else {
+ if ($arrays_allowed{$name}) {
+ $ENV{$name} = [@values];
+ } else {
+ $ENV{$name} = $values[0] if ($values[0]);
+ }
+ }
+ }
+ untie (%persistent_db);
+ return 1;
+}
+######################################################################
+######################################################################
-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.=<<END;
-<input type="hidden" name="$name" value="$ENV{$key}" />
-END
+=pod
+
+=item &get_persistent_data
+
+Inputs: filename of database, ref to array of values to recover.
+
+Outputs: array of values. Returns undef on error.
+
+This function is the reverse of &make_persistent();
+Retrieve persistent data from %persistent_db. Retrieved items will have their
+values unescaped. If the item contains commas (before unescaping), the
+returned value will be an array pointer.
+
+=cut
+
+######################################################################
+######################################################################
+sub get_persistent_data {
+ my $filename = shift;
+ my @Vars = @{shift()};
+ my @Values; # Return array
+ return undef if (! -e $filename);
+ return undef if (! tie(%persistent_db,'GDBM_File',$filename,
+ &GDBM_READER(),0640));
+ foreach my $name (@Vars) {
+ if (! exists($persistent_db{$name})) {
+ push @Values, undef;
+ next;
}
+ my @values = map {
+ &Apache::lonnet::unescape($_);
+ } split(',',$persistent_db{$name});
+ if (@values == 1) {
+ push @Values,$values[0];
+ } else {
+ push @Values,\@values;
+ }
+ }
+ untie (%persistent_db);
+ return @Values;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &make_persistent()
+
+Inputs: Hash of values to save, filename of persistent database.
+
+Store variables away to the %persistent_db.
+Values will be escaped. Values that are array pointers will have their
+elements escaped and concatenated in a comma seperated string.
+
+=cut
+
+######################################################################
+######################################################################
+sub make_persistent {
+ my $r = shift;
+ my %save = %{shift()};
+ my $filename = shift;
+ return undef if (! tie(%persistent_db,'GDBM_File',
+ $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;
}
- return $persistent;
+ untie(%persistent_db);
+ return 1;
}
+######################################################################
+######################################################################
+
+=pod
+
+=item &make_form_data_persistent()
+
+Inputs: filename of persistent database.
+
+Store most form variables away to the %persistent_db.
+Values will be escaped. Values that are array pointers will have their
+elements escaped and concatenated in a comma seperated string.
+
+=cut
######################################################################
######################################################################
+sub make_form_data_persistent {
+ my $r = shift;
+ my $filename = shift;
+ my %save;
+ foreach (keys(%ENV)) {
+ next if (! /^form/ || /submit/);
+ $save{$_} = $ENV{$_};
+ }
+ return &make_persistent($r,\%save,$filename);
+}
+
+######################################################################
+# HTML form building functions #
+######################################################################
=pod
@@ -504,6 +771,13 @@ END
=over 4
+=cut
+
+###############################################
+###############################################
+
+=pod
+
=item &simpletextfield()
Inputs: $name,$value,$size
@@ -511,6 +785,23 @@ Inputs: $name,$value,$size
Returns a text input field with the given name, value, and size.
If size is not specified, a value of 20 is used.
+=cut
+
+###############################################
+###############################################
+
+sub simpletextfield {
+ my ($name,$value,$size)=@_;
+ $size = 20 if (! defined($size));
+ return '<input type="text" name="'.$name.
+ '" size="'.$size.'" value="'.$value.'" />';
+}
+
+###############################################
+###############################################
+
+=pod
+
=item &simplecheckbox()
Inputs: $name,$value
@@ -518,56 +809,107 @@ Inputs: $name,$value
Returns a simple check box with the given $name.
If $value eq 'on' the box is checked.
-=item &searchphrasefield()
+=cut
-Inputs: $title,$name,$value
+###############################################
+###############################################
-Returns html for a title line and an input field for entering search terms.
-the instructions "Enter terms or phrases separated by search operators such
-as AND, OR, or NOT." are given following the title. The entry field (which
-is where the $name and $value are used) is an 80 column simpletextfield.
+sub simplecheckbox {
+ my ($name,$value)=@_;
+ my $checked='';
+ $checked="checked" if $value eq 'on';
+ return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';
+}
-=item &dateboxes()
+###############################################
+###############################################
-Returns html selection form elements for the specification of
-the day, month, and year.
+=pod
-=item &selectbox()
+=item &fieldtitle()
-Returns html selection form.
+Input: $title
-=back
+Returns a scalar with html which will display $title as a search
+field heading.
=cut
-######################################################################
-######################################################################
+###############################################
+###############################################
-sub simpletextfield {
- my ($name,$value,$size)=@_;
- $size = 20 if (! defined($size));
- return '<input type="text" name="'.$name.
- '" size="'.$size.'" value="'.$value.'" />';
+sub fieldtitle {
+ my $title = uc(shift());
+ return '<font color="#800000" face="helvetica"><b>'.$title.
+ ': </b></font>';
}
-sub simplecheckbox {
- my ($name,$value)=@_;
- my $checked='';
- $checked="CHECKED" if $value eq 'on';
- return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';
-}
+###############################################
+###############################################
+=pod
+
+=item &searchphrasefield()
+
+Inputs: $title,$name,$value
+
+Returns html for a title line and an input field for entering search terms.
+The entry field (which is where the $name and $value are used) is a 50 column
+simpletextfield. The html returned is for a row in a three column table.
+
+=cut
+
+###############################################
+###############################################
+
sub searchphrasefield {
my ($title,$name,$value)=@_;
- my $instruction=<<END;
-Enter terms or phrases separated by search operators such as AND, OR, or NOT.
-END
- my $uctitle=uc($title);
- return "\n".
- '<p><font color="#800000" face="helvetica"><b>'.$uctitle.':</b>'.
- "</FONT> $instruction<br />".&simpletextfield($name,$value,80);
+ return '<tr><td>'.&fieldtitle($title).'</td><td>'.
+ &simpletextfield($name,$value,50)."</td><td> </td></tr>\n";
}
+###############################################
+###############################################
+
+=pod
+
+=item &searchphrasefield_with_related()
+
+Inputs: $title,$name,$value
+
+Returns html for a title line and an input field for entering search terms
+and a check box for 'related words'. The entry field (which is where the
+$name and $value are used) is a 50 column simpletextfield. The name of
+the related words checkbox is "$name_related".
+
+=cut
+
+###############################################
+###############################################
+
+sub searchphrasefield_with_related {
+ my ($title,$name,$value)=@_;
+ return '<tr><td>'.&fieldtitle($title).'</td><td>'.
+ &simpletextfield($name,$value,50).'</td><td align="center"> '.
+ &simplecheckbox($name.'_related',$ENV{'form.'.$name.'_related'}).
+ " </td></tr>\n";
+}
+
+###############################################
+###############################################
+
+=pod
+
+=item &dateboxes()
+
+Returns html selection form elements for the specification of
+the day, month, and year.
+
+=cut
+
+###############################################
+###############################################
+
sub dateboxes {
my ($name,$defaultmonth,$defaultday,$defaultyear,
$currentmonth,$currentday,$currentyear)=@_;
@@ -612,41 +954,123 @@ END
return "$month$day$year";
}
+###############################################
+###############################################
+
+=pod
+
+=item &selectbox()
+
+Returns a scalar containing an html <select> form.
+
+Inputs:
+
+=over 4
+
+=item $title
+
+Printed above the select box, in uppercase. If undefined, only a select
+box will be returned, with no additional html.
+
+=item $name
+
+The name element of the <select> tag.
+
+=item $default
+
+The default value of the form. Can be $anyvalue, or in @idlist.
+
+=item $anyvalue
+
+The <option value="..."> used to indicate a default of
+none of the values. Can be undef.
+
+=item $anytag
+
+The text associate with $anyvalue above.
+
+=item $functionref
+
+Each element in @idlist will be passed as a parameter
+to the function referenced here. The return value of the function should
+be a scalar description of the items. If this value is undefined the
+description of each item in @idlist will be the item name.
+
+=item @idlist
+
+The items to be selected from. One of these or $anyvalue will be the
+value returned by the form element, $ENV{form.$name}.
+
+=back
+
+=cut
+
+###############################################
+
sub selectbox {
- my ($title,$name,$value,$anyvalue,$anytag,$functionref,@idlist)=@_;
- my $uctitle=uc($title);
- my $selout="\n".'<p><font color="#800000" face="helvetica">'.
- '<b>'.$uctitle.':</b></font><br /><select name="'.$name.'">';
- foreach ($anyvalue,@idlist) {
+ my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
+ if (! defined($functionref)) { $functionref = sub { $_[0]}; }
+ my $selout='';
+ if (defined($title)) {
+ my $uctitle=uc($title);
+ $selout="\n".'<p><font color="#800000" face="helvetica">'.
+ '<b>'.$uctitle.': </b></font>';
+ }
+ $selout .= '<select name="'.$name.'">';
+ unshift @idlist,$anyvalue if (defined($anyvalue));
+ foreach (@idlist) {
$selout.='<option value="'.$_.'"';
- if ($_ eq $value and !/^any$/) {
+ if ($_ eq $default and !/^any$/) {
$selout.=' selected >'.&{$functionref}($_).'</option>';
}
- elsif ($_ eq $value and /^$anyvalue$/) {
+ elsif ($_ eq $default and /^$anyvalue$/) {
$selout.=' selected >'.$anytag.'</option>';
}
else {$selout.='>'.&{$functionref}($_).'</option>';}
}
- return $selout.'</select>';
+ return $selout.'</select>'.(defined($title)?'</p>':' ');
}
######################################################################
+# End of HTML form building functions #
+######################################################################
+
+=pod
+
+=back
+
+=cut
+
+
+######################################################################
######################################################################
=pod
-=item &advancedsearch()
+=item &parse_advanced_search()
+
+Parse advanced search form and return the following:
+
+=over 4
+
+=item $query Scalar containing an SQL query.
+
+=item $customquery Scalar containing a custom query.
-Parse advanced search results.
+=item $customshow Scalar containing commands to show custom metadata.
+
+=item $libraries_to_query Reference to array of domains to search.
+
+=back
=cut
######################################################################
######################################################################
-sub advancedsearch {
- my ($r,$envhash,$hidden)=@_;
- my %ENV=%{$envhash};
+sub parse_advanced_search {
+ my ($r,$closebutton)=@_;
my $fillflag=0;
+ my $pretty_search_string = "<br />\n";
# Clean up fields for safety
for my $field ('title','author','subject','keywords','url','version',
'creationdatestart_month','creationdatestart_day',
@@ -656,7 +1080,7 @@ sub advancedsearch {
'lastrevisiondatestart_year','lastrevisiondateend_month',
'lastrevisiondateend_day','lastrevisiondateend_year',
'notes','abstract','mime','language','owner',
- 'custommetadata','customshow') {
+ 'custommetadata','customshow','category') {
$ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
foreach ('mode','form','element') {
@@ -665,6 +1089,12 @@ sub advancedsearch {
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
$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;
+ }
# Check to see if enough information was filled in
for my $field ('title','author','subject','keywords','url','version',
'notes','abstract','mime','language','owner',
@@ -674,29 +1104,52 @@ sub advancedsearch {
}
}
unless ($fillflag) {
- &output_blank_field_error($r);
- return OK;
+ &output_blank_field_error($r,$closebutton);
+ return ;
}
# Turn the form input into a SQL-based query
my $query='';
my @queries;
+ 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') {
+ 'keywords','version','owner','mime') {
if ($ENV{'form.'.$field}) {
- push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
- }
+ my $searchphrase = $ENV{'form.'.$field};
+ $pretty_search_string .= $font."$field</font> contains <b>".
+ $searchphrase."</b>";
+ if ($ENV{'form.'.$field.'_related'}) {
+ my @New_Words;
+ ($searchphrase,@New_Words) = &related_version($searchphrase);
+ if (@New_Words) {
+ $pretty_search_string .= " with related words: ".
+ "<b>@New_Words</b>.";
+ } else {
+ $pretty_search_string .= " with no related words.";
+ }
+ }
+ $pretty_search_string .= "<br />\n";
+ push @queries,&build_SQL_query($field,$searchphrase);
+ }
+ }
+ # I dislike the hack below.
+ if ($ENV{'form.category'}) {
+ $ENV{'form.mime'}='';
}
# Evaluate option lists
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
push @queries,"(language like \"$ENV{'form.language'}\")";
- }
- if ($ENV{'form.mime'} and $ENV{'form.mime'} ne 'any') {
- push @queries,"(mime like \"$ENV{'form.mime'}\")";
+ $pretty_search_string.=$font."language</font>= ".
+ &Apache::loncommon::languagedescription($ENV{'form.language'}).
+ "<br />\n";
}
if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
push @queries,"(copyright like \"$ENV{'form.copyright'}\")";
+ $pretty_search_string.=$font."copyright</font> = ".
+ &Apache::loncommon::copyrightdescription($ENV{'form.copyright'}).
+ "<br \>\n";
}
+ #
# Evaluate date windows
my $datequery=&build_date_queries(
$ENV{'form.creationdatestart_month'},
@@ -714,50 +1167,70 @@ sub advancedsearch {
);
# Test to see if date windows are legitimate
if ($datequery=~/^Incorrect/) {
- &output_date_error($r,$datequery);
- return OK;
- }
- elsif ($datequery) {
+ &output_date_error($r,$datequery,$closebutton);
+ return ;
+ } elsif ($datequery) {
+ # Here is where you would set up pretty_search_string to output
+ # date query information.
push @queries,$datequery;
}
# Process form information for custom metadata querying
- my $customquery='';
+ 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'});
}
- my $customshow='';
+ 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);
}
- # Send query statements over the network to be processed by either the SQL
- # database or a recursive scheme of 'grep'-like actions (for custom
- # metadata).
+ ## ---------------------------------------------------------------
+ ## Deal with restrictions to given domains
+ ##
+ 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'}) );
+ my %domain_hash = ();
+ my $pretty_domains_string;
+ foreach (@allowed_domains) {
+ $domain_hash{$_}++;
+ }
+ if ($domain_hash{'any'}) {
+ $pretty_domains_string = "Searching all domains.";
+ } else {
+ if (@allowed_domains > 1) {
+ $pretty_domains_string = "Searching domains:";
+ } else {
+ $pretty_domains_string = "Searching domain ";
+ }
+ foreach (sort @allowed_domains) {
+ $pretty_domains_string .= "<b>$_</b> ";
+ }
+ foreach (keys(%Apache::lonnet::libserv)) {
+ if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
+ push @$libraries_to_query,$_;
+ }
+ }
+ }
+ $pretty_search_string .= $pretty_domains_string."<br />\n";
+ #
if (@queries) {
$query=join(" AND ",@queries);
$query="select * from metadata where $query";
- my $reply; # reply hash reference
- unless ($customquery or $customshow) {
- $reply=&Apache::lonnet::metadata_query($query);
- }
- else {
- $reply=&Apache::lonnet::metadata_query($query,
- $customquery,$customshow);
- }
- &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
- return OK;
} elsif ($customquery) {
- my $reply; # reply hash reference
- $reply=&Apache::lonnet::metadata_query('',
- $customquery,$customshow);
- &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
- return OK;
+ $query = '';
}
- # should not get to this point
- return 'Error. Should not have gone to this point.';
+ return ($query,$customquery,$customshow,$libraries_to_query,
+ $pretty_search_string);
}
######################################################################
@@ -765,17 +1238,16 @@ sub advancedsearch {
=pod
-=item &basicsearch()
+=item &parse_basic_search()
-Parse basic search form.
+Parse the basic search form and return a scalar containing an sql query.
=cut
######################################################################
######################################################################
-sub basicsearch {
- my ($r,$envhash,$hidden)=@_;
- my %ENV=%{$envhash};
+sub parse_basic_search {
+ my ($r,$closebutton)=@_;
# Clean up fields for safety
for my $field ('basicexp') {
$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
@@ -789,30 +1261,64 @@ sub basicsearch {
# Check to see if enough is filled in
unless (&filled($ENV{'form.basicexp'})) {
- &output_blank_field_error($r);
+ &output_blank_field_error($r,$closebutton);
return OK;
}
-
+ my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';
+ my $search_string = $ENV{'form.basicexp'};
+ if ($ENV{'form.related'}) {
+ my @New_Words;
+ ($search_string,@New_Words) = &related_version($ENV{'form.basicexp'});
+ if (@New_Words) {
+ $pretty_search_string .= " with related words: <b>@New_Words</b>.";
+ } else {
+ $pretty_search_string .= " with no related words.";
+ }
+ }
# Build SQL query string based on form page
my $query='';
my $concatarg=join('," ",',
('title', 'author', 'subject', 'notes', 'abstract',
'keywords'));
$concatarg='title' if $ENV{'form.titleonly'};
+ $query=&build_SQL_query('concat('.$concatarg.')',$search_string);
+ $pretty_search_string .= "<br />\n";
+ return 'select * from metadata where '.$query,$pretty_search_string;
+}
- $query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});
- # Get reply (either a hash reference to filehandles or bad connection)
-# &Apache::lonnet::logthis("metadata query started:".time);
- my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);
-# &Apache::lonnet::logthis("metadata query finished:".time);
- # Output search results
+######################################################################
+######################################################################
- &output_results('Basic',$r,$envhash,$query,$reply,$hidden);
+=pod
- return OK;
-}
+=item &related_version
+
+Modifies an input string to include related words. Words in the string
+are replaced with parenthesized lists of 'OR'd words. For example
+"torque" is replaced with "(torque OR word1 OR word2 OR ...)".
+Note: Using this twice on a string is probably silly.
+
+=cut
+
+######################################################################
+######################################################################
+sub related_version {
+ my $search_string = shift;
+ my $result = $search_string;
+ my %New_Words = ();
+ while ($search_string =~ /(\w+)/cg) {
+ my $word = $1;
+ next if (lc($word) =~ /\b(or|and|not)\b/);
+ my @Words = &Apache::loncommon::get_related_words($word);
+ @Words = ($#Words>4? @Words[0..4] : @Words);
+ foreach (@Words) { $New_Words{$_}++;}
+ my $replacement = join " OR ", ($word,@Words);
+ $result =~ s/(\b)$word(\b)/$1($replacement)$2/g;
+ }
+ return $result,sort(keys(%New_Words));
+}
######################################################################
######################################################################
@@ -983,238 +1489,604 @@ sub build_date_queries {
######################################################################
######################################################################
-=pod
+=pod
+
+=item ©right_check()
+
+=cut
+
+######################################################################
+######################################################################
+
+sub copyright_check {
+ my $Metadata = shift;
+ # Check copyright tags and skip results the user cannot use
+ my (undef,undef,$resdom,$resname) = split('/',
+ $Metadata->{'url'});
+ # Check for priv
+ if (($Metadata->{'copyright'} eq 'priv') &&
+ (($ENV{'user.name'} ne $resname) &&
+ ($ENV{'user.domain'} ne $resdom))) {
+ return 0;
+ }
+ # Check for domain
+ if (($Metadata->{'copyright'} eq 'domain') &&
+ ($ENV{'user.domain'} ne $resdom)) {
+ return 0;
+ }
+ return 1;
+}
-=item &output_results()
+#####################################################################
+#####################################################################
-Format and output results based on a reply list.
-There are two windows that this function writes to. The main search
-window ("srch") has a listing of the results. A secondary window ("popwin")
-gives the status of the network search (time elapsed, number of machines
-contacted, etc.)
+=pod
+
+=item MySQL Table Description
+
+MySQL table creation requires a precise description of the data to be
+stored. The use of the correct types to hold data is vital to efficient
+storage and quick retrieval of records. The columns must be described in
+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/;
+
+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'},
+ #--------------------------------------------------
+ creationdate =>{ type=>'DATETIME'},
+ lastrevisiondate =>{ type=>'DATETIME'},
+ #--------------------------------------------------
+ );
+
+my @Fullindicies =
+ qw/title author subject abstract mime language owner copyright/;
+
######################################################################
######################################################################
-sub output_results {
-# &Apache::lonnet::logthis("output_results:".time);
- my $fnum; # search result counter
- my ($mode,$r,$envhash,$query,$replyref,$hidden)=@_;
- my %ENV=%{$envhash};
- my %rhash=%{$replyref};
- my $compiledresult='';
- my $timeremain=300; # (seconds)
- my $elapsetime=0;
- my $resultflag=0;
- my $tflag=1;
- #
- # make query information persistent to allow for subsequent revision
- my $persistent=&make_persistent();
- # spit out the generic header
- $r->print(&search_results_header());
+
+=pod
+
+=item &create_results_table()
+
+Creates the table of search results by calling lonmysql. Stores the
+table id in $ENV{'form.table'}
+
+Inputs: none.
+
+Returns: the identifier of the table on success, undef on error.
+
+=cut
+
+######################################################################
+######################################################################
+sub create_results_table {
+ my $table = &Apache::lonmysql::create_table
+ ( { columns => \%Datatypes,
+ column_order => \@DataOrder,
+ fullindex => \@Fullindicies,
+ } );
+ if (defined($table)) {
+ $ENV{'form.table'} = $table;
+ return $table;
+ }
+ return undef; # Error...
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &write_status()
+
+=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;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=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.
+
+=over 4
+
+=item &update_count_status()
+
+=item &update_contact_status()
+
+=item &update_read_status()
+
+=back
+
+=cut
+
+######################################################################
+######################################################################
+sub update_count_status {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.count.value = ' $text'</script>\n");
$r->rflush();
- # begin showing the cataloged results
- $r->print(<<CATALOGBEGIN);
-</head>
-<body bgcolor="#ffffff">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Search Catalog</h1>
-CATALOGBEGIN
- $r->print(<<CATALOGCONTROLS);
-<form name='results' method="post" action="/adm/searchcat">
-$hidden
-<input type='hidden' name='acts' value='' />
-<input type='button' value='Revise search request'
-onClick='this.form.submit();' />
-$importbutton
-$closebutton
-$persistent
-<hr />
-<h3>Search Query</h3>
-CATALOGCONTROLS
+}
+
+sub update_contact_status {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.c_server.value = ' $text'</script>\n");
+ $r->rflush();
+}
+
+sub update_read_status {
+ my ($r,$text) = @_;
+ $text =~ s/\'/\\\'/g;
+ $r->print
+ ("<script>document.statusform.r_server.value = ' $text'</script>\n");
+ $r->rflush();
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &run_search
+
+=cut
+
+######################################################################
+######################################################################
+sub run_search {
+ my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
+ my $c = $r->connection;
#
- # Remind them what they searched for
+ # Timing variables
#
- if ($mode eq 'Basic') {
- $r->print('<p><b>Basic search:</b> '.$ENV{'form.basicexp'}.'</p>');
- } elsif ($mode eq 'Advanced') {
- $r->print('<p><b>Advanced search</b> '.$query.'</p>');
- }
- $r->print('<h3>Search Results</h3>');
- $r->rflush();
+ my $starttime = time;
+ my $max_time = 120; # seconds for the search to complete
#
- # make the pop-up window for status
+ # Print run_search header
#
- $r->print(&make_popwin(%rhash));
+ $r->print("<html><head><title>Search Status</title></head><body>");
+ $r->print("Search: ".$pretty_string."\n");
$r->rflush();
+ #
+ # Determine the servers we need to contact.
+ #
+ my @Servers_to_contact;
+ if (defined($serverlist)) {
+ @Servers_to_contact = @$serverlist;
+ } else {
+ @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
+ }
+ my %Server_status;
+ my $table =$ENV{'form.table'};
+ if (! defined($table) || $table eq '') {
+ $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());
+ return;
+ }
+ if (! $table_status) {
+ $r->print("The table id,$table, we tried to use is invalid.".
+ "The search has been aborted.</body></html>");
+ return;
+ }
##
- ## Prepare for the main loop below
+ ## Prepare for the big loop.
##
- my $servercount=0;
- my $hitcountsum=0;
- my $servernum=(keys %rhash);
- my $serversleft=$servernum;
- ##
- ## Run until we run out of time or we run out of servers
- ##
- while($serversleft && $timeremain) {
- ##
- ## %rhash has servers deleted from it as results come in
- ## (within the foreach loop below).
- ##
- foreach my $rkey (sort keys %rhash) {
-# &Apache::lonnet::logthis("Server $rkey:".time);
- $servercount++;
- $compiledresult='';
- my $reply=$rhash{$rkey};
- my @results;
- if ($reply eq 'con_lost') {
- &popwin_imgupdate($r,$rkey,"srvbad.gif");
- $serversleft--;
- delete $rhash{$rkey};
- } else {
- # must do since 'use strict' checks for tainting
- $reply=~/^([\.\w]+)$/;
- my $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
- $reply=~/(.*?)\_/;
- for (my $counter=0;$counter<2;$counter++) {
- if (-e $replyfile && ! -e "$replyfile.end") {
- &popwin_imgupdate($r,$rkey,"srvhalf.gif");
- &popwin_js($r,'popwin.hc["'.$rkey.'"]='.
- '"still transferring..."'.';');
- }
- # Are we finished transferring data?
- if (-e "$replyfile.end") {
- $serversleft--;
- delete $rhash{$rkey};
- if (-s $replyfile) {
- &popwin_imgupdate($r,$rkey,"srvgood.gif");
- my $fh;
- unless ($fh=Apache::File->new($replyfile)){
- # Is it really appropriate to die on this error?
- $r->print('ERROR: file '.
- $replyfile.' cannot be opened');
- return OK;
- }
- @results=<$fh> if $fh;
- my $hits =@results;
- &popwin_js($r,'popwin.hc["'.$rkey.'"]='.
- $hits.';');
- $hitcountsum+=$hits;
- &popwin_js($r,'popwin.document.forms.popremain.'.
- 'numhits.value='.$hitcountsum.';');
- } else {
- &popwin_imgupdate($r,$rkey,"srvempty.gif");
- &popwin_js($r,'popwin.hc["'.$rkey.'"]=0;');
- }
- last;
- } # end of if ( -e "$replyfile.end")
- last unless $timeremain;
- sleep 1; # wait for daemons to write files?
- $timeremain--;
- $elapsetime++;
- &popwin_js($r,"popwin.document.popremain.".
- "elapsetime.value=$elapsetime;");
- }
- &popwin_js($r,'popwin.document.whirly.'.
- 'src="/adm/lonIcons/lonanimend.gif";');
- } # end of if ($reply eq 'con_lost') else statement
- my %Fields = undef; # Holds the data to be sent to the various
- # *_view routines.
- my ($extrashow,$customfields,$customhash) = &handle_custom_fields(\@results);
- my @customfields = @$customfields;
- my %customhash = %$customhash;
- untie %hash if (keys %hash);
- #
- if (! tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
- $r->print('<html><head></head><body>Unable to tie hash to db '.
- 'file</body></html>');
+ my $hitcountsum;
+ my $server;
+ my $status;
+ $r->print(<<END);
+<form name="statusform" action="" method="post">
+<table>
+<tr><th>Contacting</th><th>Receiving</th><th>Total Matches</th></tr>
+<tr>
+<td><input type="text" name="c_server" value="" size="15" /></td>
+<td><input type="text" name="r_server" value="" size="15" /></td>
+<td><input type="text" name="count" value="" size="10" /></td>
+</tr>
+</table>
+</form>
+END
+ $r->rflush();
+ while ((time - $starttime < $max_time) &&
+ ((@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);
+ my $reply=&Apache::lonnet::metadata_query($query,$customquery,
+ $customshow,[$server]);
+ ($server) = keys(%$reply);
+ $Server_status{$server} = $reply->{$server};
+ &update_contact_status($r,$server);
} else {
- if ($ENV{'form.launch'} eq '1') {
- &start_fresh_session();
- }
- foreach my $result (@results) {
- next if $result=~/^custom\=/;
- chomp $result;
- next unless $result;
- %Fields = &parse_raw_result($result,$rkey);
- $Fields{'extrashow'}=$extrashow;
- if ($extrashow) {
- foreach my $field (@customfields) {
- my $value='';
- $value = $1 if ($customhash{$Fields{'url'}}=~/\<{$field}[^\>]*\>(.*?)\<\/{$field}[^\>]*\>/s);
- $Fields{'extrashow'}=~s/\<\!\-\- $field \-\-\>/ $value/g;
- }
+ &update_contact_status($r,'none');
+ sleep(1); # wait a sec. to give time for files to be written
+ }
+ while (my ($server,$status) = each(%Server_status)) {
+ last if ($c->aborted());
+ if ($status eq 'con_lost') {
+ delete ($Server_status{$server});
+ next;
+ }
+ $status=~/^([\.\w]+)$/;
+ my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
+ if (-e $datafile && ! -e "$datafile.end") {
+ next;
+ }
+ last if ($c->aborted());
+ if (-e "$datafile.end") {
+ &update_read_status($r,$server);
+ if (-z "$datafile") {
+ delete($Server_status{$server});
+ next;
}
- if ($compiledresult or $servercount!=$servernum) {
- $compiledresult.="<hr align='left' width='200' noshade />";
+ 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;
}
- $compiledresult.="\n<p>\n";
- if ($ENV{'form.catalogmode'} eq 'interactive') {
- my $titleesc=$Fields{'title'};
- $titleesc=~s/\'/\\'/; # '
- $compiledresult.=<<END if ($ENV{'form.catalogmode'} eq 'interactive');
+ # Read in the whole file.
+ while (my $result = <$fh>) {
+ last if ($c->aborted());
+ # handle custom fields? Someday we will!
+ chomp($result);
+ next unless $result;
+ # Parse the result.
+ my %Fields = &parse_raw_result($result,$server);
+ $Fields{'hostname'} = $server;
+ next if (! ©right_check(\%Fields));
+ # Store the result in the mysql database
+ my $result = &Apache::lonmysql::store_row($table,\%Fields);
+ if (! defined($result)) {
+ $r->print(&Apache::lonmysql::get_error());
+ }
+ # $r->print(&Apache::lonmysql::get_debug());
+ $hitcountsum ++;
+ &update_count_status($r,$hitcountsum) if ($hitcountsum % 50 == 0);
+ } # 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 ($c->aborted());
+ &update_count_status($r,$hitcountsum);
+ }
+ last if ($c->aborted());
+ # Finished looping through the servers
+ }
+ &update_read_status($r,'none');
+ &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("<b>Search Completed.</b> ");
+ if ($hitcountsum) {
+ $r->print($hitcountsum." matches were found.");
+ } else {
+ $r->print("There were no successful matches to your query.");
+ }
+ $r->print("</body></html>");
+ return;
+}
+
+######################################################################
+######################################################################
+=pod
+
+=item &prev_next_buttons
+
+=cut
+
+######################################################################
+######################################################################
+sub prev_next_buttons {
+ my ($current_min,$show,$total,$parms) = @_;
+ return '' if ($show eq 'all'); # No links if you get them all at once.
+ my $links;
+ ##
+ ## Prev
+ my $prev_min = $current_min - $show;
+ $prev_min = 0 if $prev_min < 0;
+ if ($prev_min < $current_min) {
+ $links .= qq{
+<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>
+};
+ } else {
+ $links .= 'prev';
+ }
+ ##
+ ## Pages.... Someday.
+ ##
+ $links .= qq{
+<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">reload</a>
+};
+ ##
+ ## Next
+ my $next_min = $current_min + $show;
+ $next_min = $current_min if ($next_min > $total);
+ if ($next_min != $current_min) {
+ $links .= qq{
+<a href="/adm/searchcat?$parms&start=$next_min&show=$show">next</a>
+};
+ } else {
+ $links .= ' next';
+ }
+ return $links;
+}
+######################################################################
+######################################################################
+
+=pod
+
+=item &display_results
+
+=cut
+
+######################################################################
+######################################################################
+sub display_results {
+ my ($r,$mode,$importbutton,$closebutton) = @_;
+ $r->print(&search_results_header());
+ ##
+ ## Set viewing function
+ ##
+ my $viewfunction = $Views{$ENV{'form.viewselect'}};
+ if (!defined($viewfunction)) {
+ $r->print("Internal Error - Bad view selected.\n");
+ $r->rflush();
+ return;
+ }
+ ##
+ ## 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>');
+ $r->rflush();
+ return;
+ }
+ }
+ ##
+ ## 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;
+ }
+ ##
+ ## 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>");
+ &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'}));
+ my $min = $ENV{'form.start'};
+ my $max;
+ if ($ENV{'form.show'} eq 'all') {
+ $max = $total_results ;
+ } else {
+ $max = $min + $ENV{'form.show'};
+ $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
+ ('<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"
+ );
+ ##
+ ## Get results from MySQL table
+ ##
+ my @Results = &Apache::lonmysql::get_rows($table,
+ 'id>'.$min.' AND id<='.$max);
+ ##
+ ## Loop through the results and output them.
+ ##
+ foreach my $row (@Results) {
+ my %Fields = %{&parse_row(@$row)};
+ my $output="<p>\n";
+ $output.=&catalogmode_output($Fields{'title'},$Fields{'url'});
+ # Render the result into html
+ $output.= &$viewfunction(%Fields);
+ $output.="</p>\n<hr align='left' width='200' noshade />";
+ # Print them out as they come in.
+ $r->print($output);
+ $r->rflush();
+ }
+ if (@Results < 1) {
+ $r->print("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->rflush();
+ untie %groupsearch_db;
+ return;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &catalogmode_output($title,$url)
+
+Returns html needed for the various catalog modes. Gets inputs from
+$ENV{'form.catalogmode'}. Stores data in %groupsearch_db and $fnum
+(local variable).
+
+=cut
+
+######################################################################
+######################################################################
+{
+my $fnum;
+
+sub catalogmode_output {
+ my $output = '';
+ my ($title,$url) = @_;
+ if ($ENV{'form.catalogmode'} eq 'interactive') {
+ $title=~ s/\'/\\'/g; # ' Escape single quotes.
+ if ($ENV{'form.catalogmode'} eq 'interactive') {
+ $output.=<<END
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
-onClick="javascript:select_data('$titleesc','$Fields{'url'}')">
+onClick="javascript:select_data('$title','$url')">
</font>
-<br />
END
- }
- if ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $fnum+=0;
- $hash{"pre_${fnum}_link"}=$Fields{'url'};
- $hash{"pre_${fnum}_title"}=$Fields{'title'};
- $compiledresult.=<<END;
+ }
+ }
+ if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ $fnum+=0;
+ $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)" />
</font>
-<br />
END
-# <input type="hidden" name="title$fnum" value="$title" />
-# <input type="hidden" name="url$fnum" value="$url" />
- $fnum++;
- }
- 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 => $rkey );
- }
- elsif ($viewselect eq 'Summary View') {
- $compiledresult.=&summary_view
- (%Fields, hostname => $rkey );
- }
- elsif ($viewselect eq 'Fielded Format') {
- $compiledresult.=&fielded_format_view
- (%Fields, hostname => $rkey );
- }
- elsif ($viewselect eq 'XML/SGML') {
- $compiledresult.=&xml_sgml_view
- (%Fields, hostname => $rkey );
- }
- }
- untie %hash;
- }
- if ($compiledresult) {
- $resultflag=1;
- $r->print($compiledresult);
- }
- my $percent=sprintf('%3.0f',($servercount/$servernum*100));
- } # End of foreach loop over servers remaining
- } # End of big loop - while($serversleft && $timeremain)
- unless ($resultflag) {
- $r->print("\nThere were no results that matched your query\n");
+ $fnum++;
}
-# $r->print('<script type="text/javascript">'.'popwin.close()</script>'."\n"); $r->rflush();
- $r->print("</body>\n</html>\n");
- return;
+ return $output;
+}
+
+}
+######################################################################
+######################################################################
+
+=pod
+
+=item &parse_row
+
+Parse a row returned from the database.
+
+=cut
+
+######################################################################
+######################################################################
+sub parse_row {
+ my @Row = @_;
+ my %Fields;
+ for (my $i=0;$i<=$#Row;$i++) {
+ $Fields{$DataOrder[$i]}=&Apache::lonnet::unescape($Row[$i]);
+ }
+ $Fields{'language'} =
+ &Apache::loncommon::languagedescription($Fields{'lang'});
+ $Fields{'copyrighttag'} =
+ &Apache::loncommon::copyrightdescription($Fields{'copyright'});
+ $Fields{'mimetag'} =
+ &Apache::loncommon::filedescription($Fields{'mime'});
+ return \%Fields;
}
###########################################################
@@ -1277,12 +2149,16 @@ sub parse_raw_result {
&Apache::loncommon::copyrightdescription($Fields{'copyright'});
$Fields{'mimetag'} =
&Apache::loncommon::filedescription($Fields{'mime'});
+ if ($Fields{'author'}=~/^(\s*|error)$/) {
+ $Fields{'author'}="Unknown Author";
+ }
# Put spaces in the keyword list, if needed.
$Fields{'keywords'}=~ s/,([A-z])/, $1/g;
if ($Fields{'title'}=~ /^\s*$/ ) {
$Fields{'title'}='Untitled';
}
unless ($ENV{'user.adv'}) {
+ # What is this anyway?
$Fields{'keywords'} = '- not displayed -';
$Fields{'notes'} = '- not displayed -';
$Fields{'abstract'} = '- not displayed -';
@@ -1347,10 +2223,18 @@ sub handle_custom_fields {
=item &search_results_header
-Output the proper javascript code to deal with different calling modes.
+Output the proper html headers and javascript code to deal with different
+calling modes.
+
+Takes most inputs directly from %ENV, except $mode.
+
+=over 4
+
+=item $mode is either (at this writing) 'Basic' or 'Advanced'
-Takes inputs directly from from %ENV. The following environment variables
-are checked:
+=back
+
+The following environment variables are checked:
=over 4
@@ -1375,11 +2259,6 @@ Checked for existance & 'edit' mode.
sub search_results_header {
my $result = '';
# output beginning of search page
- $result.=<<BEGINNING;
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-BEGINNING
# conditional output of script functions dependent on the mode in
# which the search was invoked
if ($ENV{'form.catalogmode'} eq 'interactive'){
@@ -1446,118 +2325,46 @@ SCRIPT
}
</script>
SCRIPT
- $result.=<<SCRIPT;
-<script type="text/javascript">
- function displayinfo(val) {
- popwin.document.forms.popremain.sdetails.value=val;
- }
- function openhelp(val) {
- openhelpwin=open('/adm/help/searchcat.html','helpscreen',
- 'scrollbars=1,width=400,height=300');
- openhelpwin.focus();
- }
- function abortsearch(val) {
- popwin.close();
- }
-</script>
-SCRIPT
+ $result.=<<END;
+</head>
+END
return $result;
}
######################################################################
######################################################################
-
-=pod
-
-=item &make_popwin()
-
-Returns html with javascript in it to open up the status window.
-
-=cut
+sub search_status_header {
+ return <<ENDSTATUS;
+<html><head><title>Search Status</title></head>
+<body>
+<h3>Search Status</h3>
+Sending search request to LON-CAPA servers.<br />
+ENDSTATUS
+}
######################################################################
######################################################################
-sub make_popwin {
- my %rhash = @_;
- my $servernum=(keys %rhash);
- my $hcinit;
- my $grid="'<br />'+\n";
- # $sn is the server number, used ONLY to make sure we have
- # rows of 10 each. No longer used to index images.
- my $sn=1;
- foreach my $sk (sort keys %rhash) {
- # '<a href="
- $grid.="'<a href=\"";
- # javascript:displayinfo('+
- $grid.="javascript:opener.displayinfo('+";
- # "'"+'key
- $grid.="\"'\"+'";
- $grid.=$sk;
- my $hc;
- if ($rhash{$sk} eq 'con_lost') {
- $hc="BAD CONNECTION, CONTACT SYSTEM ADMINISTRATOR ";
- }
- else {
- $hc="'+\"'\"+\"+hc['$sk']+\"+\"'\"+'";
- $hcinit.="hc[\"$sk\"]=\"not yet connected...\";";
- }
- $grid.=" hitcount=".$hc;
- $grid.=" domain=".$Apache::lonnet::hostdom{$sk};
- $grid.=" IP=".$Apache::lonnet::hostip{$sk};
- # '+"'"+'">'+
- $grid.="'+\"'\"+')\">'+";
- $grid.="\n";
- $grid.="'<img border=\"0\" name=\"img_".$Apache::lonnet::hostdom{$sk}.
- '_'.$sk."\" src=\"/adm/lonIcons/srvnull.gif\" alt=\"".$sk.
- "\" /></a>'+\n";
- $grid.="'<br />'+\n" unless $sn%10;
- $sn++;
- }
- my $result.=<<ENDPOP;
-<script type="text/javascript">
- popwin=open('','popwin','scrollbars=1,width=400,height=220');
- popwin.focus();
- popwin.document.writeln('<'+'html>');
- popwin.document.writeln('<'+'head>');
- popwin.document.writeln('<'+'script>');
- popwin.document.writeln('hc=new Array();$hcinit');
- popwin.document.writeln('<'+'/script>');
- popwin.document.writeln('<'+'/head>'+
- '<'+'body bgcolor="#FFFFFF">'+
- '<'+'image name="whirly" align="right" src="/adm/lonIcons/'+
- 'lonanim.gif" '+
- 'alt="animated logo" />'+
- '<'+'h3>Search Results Progress<'+'/h3>'+
- '<'+'form name="popremain">'+
- '<'+'tt>'+
- '<'+'br clear="all"/><i>PLEASE BE PATIENT</i>'+
- '<'+'br />SCANNING $servernum SERVERS'+
- '<'+'br clear="all" />Number of record hits found '+
- '<'+'input type="text" size="10" name="numhits"'+
- ' value="0" />'+
- '<'+'br clear="all" />Time elapsed '+
- '<'+'input type="text" size="10" name="elapsetime"'+
- ' value="0" />'+
- '<'+'br />'+
- 'SERVER GRID (click on any cell for details)'+
- $grid
- '<'+'br />'+
- 'Server details '+
- '<'+'input type="text" size="35" name="sdetails"'+
- ' value="" />'+
- '<'+'br />'+
- ' <'+'input type="button" name="button"'+
- ' value="close this window" '+
- ' onClick="javascript:opener.abortsearch()" />'+
- ' <'+'input type="button" name="button"'+
- ' value="help" onClick="javascript:opener.openhelp()" />'+
- '<'+'/tt>'+
- '<'+'/form>'+
- '<'+'/body><'+'/html>');
- popwin.document.close();
-</script>
-ENDPOP
- return $result;
+sub print_frames_interface {
+ my $r = shift;
+ 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 $result = <<"ENDFRAMES";
+<html>
+<head>
+<title>LON-CAPA Digital Library Search Results</title>
+</head>
+<frameset rows="150,*">
+ <frame name="statusframe" src="$run_search_link">
+ <frame name="resultsframe" src="$results_link">
+</frameset>
+</html>
+ENDFRAMES
+
+ $r->print($result);
+ return;
}
######################################################################
@@ -1584,30 +2391,17 @@ extra custom metadata to show.
sub detailed_citation_view {
my %values = @_;
my $result=<<END;
-<i>$values{'owner'}</i>, last revised $values{'lastrevisiondate'}
<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'title'}</a></h3>
-<h3>$values{'author'}</h3>
-</p>
<p>
-<b>Subject:</b> $values{'subject'}<br />
-<b>Keyword(s):</b> $values{'keywords'}<br />
-<b>Notes:</b> $values{'notes'}<br />
-<b>MIME Type:</b>
-END
- $result.=&Apache::loncommon::filedescription($values{'mime'});
- $result.=<<END;
-<br />
-<b>Language:</b>
-END
- $result.=&Apache::loncommon::languagedescription($values{'lang'});
- $result.=<<END;
-<br />
-<b>Copyright/Distribution:</b>
-END
- $result.=&Apache::loncommon::copyrightdescription($values{'copyright'});
- $result.=<<END;
-<br />
+<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
+
+<b>Subject: </b> $values{'subject'}<br />
+<b>Keyword(s): </b> $values{'keywords'}<br />
+<b>Notes: </b> $values{'notes'}<br />
+<b>MIME Type: </b> $values{'mimetag'}<br />
+<b>Language: </b> $values{'language'}<br />
+<b>Copyright/Distribution:</b> $values{'cprtag'}<br />
</p>
$values{'extrashow'}
<p>
@@ -1625,7 +2419,6 @@ END
=item &summary_view()
=cut
-
######################################################################
######################################################################
sub summary_view {
@@ -1759,10 +2552,8 @@ sub filled {
######################################################################
######################################################################
sub output_blank_field_error {
- my ($r)=@_;
+ my ($r,$closebutton)=@_;
# make query information persistent to allow for subsequent revision
- my $persistent=&make_persistent();
-
$r->print(<<BEGINNING);
<html>
<head>
@@ -1774,9 +2565,9 @@ BEGINNING
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">
-$persistent
-<input type='button' value='Revise search request'
-onClick='this.form.submit();' />
+$hidden_fields
+<a href="/adm/searchcat?persistent_db_id=$ENV{'form.persistent_db_id'}"
+>Revise search request</a>
$closebutton
<hr />
<h3>Helpful Message</h3>
@@ -1800,15 +2591,19 @@ RESULTS
Output a full html page with an error message.
+Inputs:
+
+ $r, the request pointer.
+ $message, the error message for the user.
+ $closebutton, the specialized close button needed for groupsearch.
+
=cut
######################################################################
######################################################################
sub output_date_error {
- my ($r,$message)=@_;
+ my ($r,$message,$closebutton)=@_;
# make query information persistent to allow for subsequent revision
- my $persistent=&make_persistent();
-
$r->print(<<RESULTS);
<html>
<head>
@@ -1818,7 +2613,7 @@ sub output_date_error {
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">
-$persistent
+$hidden_fields
<input type='button' value='Revise search request'
onClick='this.form.submit();' />
$closebutton
@@ -1839,7 +2634,7 @@ RESULTS
=item &start_fresh_session()
-Cleans the global %hash by removing all fields which begin with
+Cleans the global %groupsearch_db by removing all fields which begin with
'pre_' or 'store'.
=cut
@@ -1847,62 +2642,17 @@ Cleans the global %hash by removing all
######################################################################
######################################################################
sub start_fresh_session {
- delete $hash{'mode_catalog'};
- foreach (keys %hash) {
+ delete $groupsearch_db{'mode_catalog'};
+ foreach (keys %groupsearch_db) {
if ($_ =~ /^pre_/) {
- delete $hash{$_};
+ delete $groupsearch_db{$_};
}
if ($_ =~ /^store/) {
- delete $hash{$_};
+ delete $groupsearch_db{$_};
}
}
}
-######################################################################
-######################################################################
-
-=pod
-
-=item &popwin_js() send javascript to popwin
-
-=cut
-
-######################################################################
-######################################################################
-sub popwin_js {
- # Print javascript out to popwin, but make sure we dont generate
- # any javascript errors in doing so.
- my ($r,$text) = @_;
- $r->print(<<"END");
-<script type="text/javascript">
- if (! popwin.closed) {
- $text
- }
-</script>
-END
- $r->rflush();
-}
-
-######################################################################
-######################################################################
-
-=pod
-
-=item &popwin_imgupdate()
-
-Send a given image (and its location) out to the browser. Takes as
-input $r, loncapa server id, and an icon URL.
-
-=cut
-
-######################################################################
-######################################################################
-sub popwin_imgupdate {
- my ($r,$server,$icon) = @_;
- &popwin_js($r,'popwin.document.img_'.$Apache::lonnet::hostdom{$server}.
- '_'.$server.'.'.'src="/adm/lonIcons/'.$icon.'";');
-}
-
1;
__END__