--- loncom/interface/lonsearchcat.pm 2003/12/22 22:40:37 1.196
+++ loncom/interface/lonsearchcat.pm 2014/12/14 22:11:03 1.344
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.196 2003/12/22 22:40:37 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.344 2014/12/14 22:11:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,12 +48,10 @@ described at http://www.lon-capa.org.
lonsearchcat presents the user with an interface to search the LON-CAPA
digital library. lonsearchcat also initiates the execution of a search
by sending the search parameters to LON-CAPA servers. The progress of
-search (on a server basis) is displayed to the user in a seperate window.
+search (on a server basis) is displayed to the user in a separate window.
=head1 Internals
-=over 4
-
=cut
###############################################################################
@@ -63,14 +61,23 @@ package Apache::lonsearchcat;
use strict;
use Apache::Constants qw(:common :http);
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::File();
use CGI qw(:standard);
use Text::Query;
use GDBM_File;
use Apache::loncommon();
use Apache::lonmysql();
+use Apache::lonmeta;
+use Apache::lonhtmlcommon;
use Apache::lonlocal;
+use LONCAPA::lonmetadata();
+use HTML::Entities();
+use Parse::RecDescent;
+use Apache::lonnavmaps;
+use Apache::lonindexer();
+use Apache::lonwishlist();
+use LONCAPA;
######################################################################
######################################################################
@@ -83,22 +90,22 @@ my %groupsearch_db; # Database hash use
# groupsearch RAT interface.
my %persistent_db; # gdbm hash which holds data which is supposed to
# persist across calls to lonsearchcat.pm
-## %Views:
-## Hash which associates an output view description with the function
-## that produces it.
-# View Description/Name Function Pointer
-my %Views = ("Detailed Citation View" => \&detailed_citation_view,
- "Summary View" => \&summary_view,
- "Fielded Format" => \&fielded_format_view,
- "XML/SGML" => \&xml_sgml_view,
- "Compact View" => \&compact_view);
+# The different view modes and associated functions
+
+my %Views = ("detailed" => \&detailed_citation_view,
+ "detailedpreview" => \&detailed_citation_preview,
+ "summary" => \&summary_view,
+ "summarypreview" => \&summary_preview,
+ "fielded" => \&fielded_format_view,
+ "xml" => \&xml_sgml_view,
+ "compact" => \&compact_view);
######################################################################
######################################################################
sub handler {
my $r = shift;
- &set_defaults();
+# &set_defaults();
#
# set form defaults
#
@@ -109,13 +116,8 @@ sub handler {
my $diropendb; # The full path to the (temporary) search database file.
# This is set and used in &handler() and is also used in
# &output_results().
- my $bodytag; # LON-CAPA standard body tag, gotten from
- # &Apache::lonnet::bodytag.
- # No title, no table, just a <body> tag.
-
- 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.
@@ -133,68 +135,96 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element','pause',
'phase','persistent_db_id','table','start','show',
- 'cleargroupsort','titleelement']);
+ 'cleargroupsort','titleelement','area','inhibitmenu']);
##
## 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'})) {
+ if (exists($env{'form.pause'})) {
sleep(1);
- delete($ENV{'form.pause'});
+ delete($env{'form.pause'});
}
##
## Initialize global variables
##
my $domain = $r->dir_config('lonDefDomain');
- $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
+ my $temp_file_dir = LONCAPA::tempdir();
+ $diropendb= $temp_file_dir .
+ "$env{'user.domain'}_$env{'user.name'}_sel_res.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.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';
- ##
- 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;
+ # $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 = $temp_file_dir .
+ &escape($domain).
+ '_'.&escape($env{'user.name'}).
+ '_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
+ ##
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+
+ my @allowed_searches = ('portfolio');
+ if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+ push(@allowed_searches,'res');
+ }
+ my $crumb_text = 'Portfolio Search';
+ if (@allowed_searches ==2) {
+ $crumb_text = 'Portfolio and Catalog Search';
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/searchcat?'.
+ &Apache::loncommon::inhibit_menu_check().
+ '&catalogmode='.$env{'form.catalogmode'}.
+ '&launch='.$env{'form.launch'}.
+ '&mode='.$env{'form.mode'},
+ text=>"$crumb_text",
+ target=>'_top',
+ bug=>'Searching',});
+ #
+ if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
+ 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);
+ my $msg =
+ &mt('We were unable to retrieve data describing your search.').
+ ' '.&mt('This is a serious error and has been logged.').
+ '<br />'.
+ &mt('Please alert your LON-CAPA administrator.');
+ &Apache::loncommon::simple_error_page(
+ $r,'Search Error',
+ $msg,
+ {'no_auto_mt_msg' => 1});
+ return OK;
+ }
}
+ } else {
+ &clean_up_environment();
}
##
## Clear out old values from groupsearch database
##
untie %groupsearch_db if (tied(%groupsearch_db));
- if (($ENV{'form.cleargroupsort'} eq '1') ||
- (($ENV{'form.launch'} eq '1') &&
- ($ENV{'form.catalogmode'} eq 'groupsearch'))) {
+ if (($env{'form.cleargroupsort'} eq '1') ||
+ (($env{'form.launch'} eq '1') &&
+ ($env{'form.catalogmode'} eq 'import'))) {
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();
untie %groupsearch_db;
- delete($ENV{'form.cleargroupsort'});
+ delete($env{'form.cleargroupsort'});
} else {
# 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>');
+ my $msg = 'Unable to tie hash to db file.';
+ &Apache::loncommon::simple_error_page($r,'Search Error',
+ $msg);
return OK;
}
}
@@ -202,49 +232,51 @@ END
## Configure hidden fields
##
$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
- $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";
+ $env{'form.persistent_db_id'}.'" />'."\n";
+ if (exists($env{'form.catalogmode'})) {
+ $hidden_fields .= &hidden_field('catalogmode');
+ }
+ if (exists($env{'form.form'})) {
+ $hidden_fields .= &hidden_field('form');
+ }
+ if (exists($env{'form.element'})) {
+ $hidden_fields .= &hidden_field('element');
+ }
+ if (exists($env{'form.titleelement'})) {
+ $hidden_fields .= &hidden_field('titleelement');
+ }
+ if (exists($env{'form.mode'})) {
+ $hidden_fields .= &hidden_field('mode');
+ }
+ if (exists($env{'form.area'})) {
+ $hidden_fields .= &hidden_field('area');
+ }
+ if (exists($env{'form.inhibitmenu'})) {
+ $hidden_fields .= &hidden_field('inhibitmenu');
}
##
## Configure dynamic components of interface
##
- if ($ENV{'form.catalogmode'} eq 'interactive') {
- $closebutton="<input type='button' name='close' value='CLOSE' ";
- if ($ENV{'form.phase'} =~ /(results|run_search)/) {
- $closebutton .="onClick='parent.close()'";
+ if ($env{'form.catalogmode'} eq 'interactive') {
+ $closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
+ if ($env{'form.phase'} =~ /(results|run_search)/) {
+ $closebutton .="onclick='parent.close()'";
} else {
- $closebutton .="onClick='self.close()'";
+ $closebutton .="onclick='self.close()'";
}
- $closebutton .=">\n";
- } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $closebutton="<input type='button' name='close' value='CLOSE' ";
- if ($ENV{'form.phase'} =~ /(results|run_search)/) {
- $closebutton .="onClick='parent.close()'";
+ $closebutton .=" />\n";
+ } elsif ($env{'form.catalogmode'} eq 'import') {
+ $closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
+ if ($env{'form.phase'} =~ /(results|run_search)/) {
+ $closebutton .="onclick='parent.close()'";
} else {
- $closebutton .="onClick='self.close()'";
+ $closebutton .="onclick='self.close()'";
}
- $closebutton .= ">";
+ $closebutton .= " />";
+ my $txt_import = &mt('IMPORT');
$importbutton=<<END;
-<input type='button' name='import' value='IMPORT'
-onClick='javascript:select_group()'>
+<input type='button' name='import' value='$txt_import'
+onclick='javascript:select_group()' />
END
} else {
$closebutton = '';
@@ -253,77 +285,68 @@ END
##
## Sanity checks on form elements
##
- if (!defined($ENV{'form.viewselect'})) {
- if (($ENV{'form.catalogmode'} eq 'groupsearch') ||
- ($ENV{'form.catalogmode'} eq 'interactive')) {
- $ENV{'form.viewselect'} ="Compact View";
- } else {
- $ENV{'form.viewselect'} ="Detailed Citation View";
- }
+ if (!defined($env{'form.viewselect'})) {
+ $env{'form.viewselect'} ="summary";
}
- $ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
- $ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
+ $env{'form.phase'} = 'disp_basic' if (! exists($env{'form.phase'}));
+ $env{'form.show'} = 20 if (! exists($env{'form.show'}));
+ #
+ $env{'form.searchmode'} = 'basic' if (! exists($env{'form.searchmode'}));
+ if ($env{'form.phase'} eq 'adv_search' ||
+ $env{'form.phase'} eq 'disp_adv') {
+ $env{'form.searchmode'} = 'advanced';
+ }
+ #
+ if ($env{'form.searchmode'} eq 'advanced') {
+ my $srchtype = 'Catalog';
+ if ($env{'form.area'} eq 'portfolio') {
+ $srchtype = 'Portfolio';
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+ '&phase=disp_adv'.
+ '&catalogmode='.$env{'form.catalogmode'}.
+ '&launch='.$env{'form.launch'}.
+ '&mode='.$env{'form.mode'},
+ text=>"Advanced $srchtype Search",
+ bug=>'Searching',});
+ }
##
## Switch on the phase
##
- if ($ENV{'form.phase'} eq 'disp_basic') {
+ if ($env{'form.phase'} eq 'disp_basic') {
&print_basic_search_form($r,$closebutton,$hidden_fields);
- } elsif ($ENV{'form.phase'} eq 'disp_adv') {
+ } elsif ($env{'form.phase'} eq 'disp_adv') {
&print_advanced_search_form($r,$closebutton,$hidden_fields);
- } elsif ($ENV{'form.phase'} eq 'results') {
- &display_results($r,$importbutton,$closebutton,$diropendb);
- } elsif ($ENV{'form.phase'} =~ /^(sort|run_search)$/) {
- my ($query,$customquery,$customshow,$libraries,$pretty_string) =
+ } elsif ($env{'form.phase'} eq 'results') {
+ &display_results($r,$importbutton,$closebutton,$diropendb,
+ $env{'form.area'});
+ } elsif ($env{'form.phase'} =~ /^(sort|run_search)$/) {
+ my ($query,$customquery,$customshow,$libraries,$pretty_string,$domainsref) =
&get_persistent_data($persistent_db_file,
['query','customquery','customshow',
- 'libraries','pretty_string']);
- if ($ENV{'form.phase'} eq 'sort') {
+ 'libraries','pretty_string','domains']);
+ if ($env{'form.phase'} eq 'sort') {
&print_sort_form($r,$pretty_string);
- } elsif ($ENV{'form.phase'} eq 'run_search') {
+ } 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())) {
- $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)) {
- $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;
+ $libraries,$pretty_string,$env{'form.area'},$domainsref);
}
+ } elsif(($env{'form.phase'} eq 'basic_search') ||
+ ($env{'form.phase'} eq 'adv_search')) {
#
- # We are running a search
- my ($query,$customquery,$customshow,$libraries) =
- (undef,undef,undef,undef);
+ # We are running a search, try to parse it
+ my ($query,$customquery,$customshow,$libraries,$domains) =
+ (undef,undef,undef,undef,undef);
my $pretty_string;
- if ($ENV{'form.phase'} eq 'basic_search') {
- ($query,$pretty_string,$libraries) =
+ if ($env{'form.phase'} eq 'basic_search') {
+ ($query,$pretty_string,$libraries,$domains) =
&parse_basic_search($r,$closebutton,$hidden_fields);
+ return OK if (! defined($query));
+ &make_persistent({ basicexp => $env{'form.basicexp'}},
+ $persistent_db_file);
} else { # Advanced search
- ($query,$customquery,$customshow,$libraries,$pretty_string)
+ ($query,$customquery,$customshow,$libraries,$pretty_string,$domains)
= &parse_advanced_search($r,$closebutton,$hidden_fields);
return OK if (! defined($query));
}
@@ -331,246 +354,196 @@ END
customquery => $customquery,
customshow => $customshow,
libraries => $libraries,
- pretty_string => $pretty_string },
+ pretty_string => $pretty_string,
+ domains => $domains },
$persistent_db_file);
+ #
+ # Set up table
+ if (! defined(&create_results_table($env{'form.area'}))) {
+ my $errorstring=&Apache::lonmysql::get_error();
+ &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
+ 'needed table. lonmysql error:'.
+ $errorstring);
+
+ my $msg =
+ 'Unable to create table in which to save search results. '.
+ 'The search has been aborted.';
+ &Apache::loncommon::simple_error_page($r,'Search Error',
+ $msg);
+ return OK;
+ }
+ delete($env{'form.launch'});
+ if (! &make_form_data_persistent($r,$persistent_db_file)) {
+ my $msg=
+ 'Unable to properly save search information. '.
+ 'The search has been aborted.';
+ &Apache::loncommon::simple_error_page($r,'Search Error',
+ $msg);
+ return OK;
+ }
##
## Print out the frames interface
##
- &print_frames_interface($r);
+ if (defined($query)) {
+ &print_frames_interface($r);
+ }
}
return OK;
}
-######################################################################
-######################################################################
-##
-## Course Search
-##
-######################################################################
-######################################################################
-{ # Scope the course search to avoid global variables
#
-# Variables For course search
-my %alreadyseen;
-my %hash;
-my $totalfound;
-
-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
- undef %alreadyseen;
- %alreadyseen=();
- my $c=$r->connection;
- if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
- &GDBM_READER(),0640)) {
- foreach (keys %hash) {
- if ($c->aborted()) { last; }
- if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
- &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,
- @allwords);
+# The mechanism used to store values away and retrieve them does not
+# handle the case of missing environment variables being significant.
+#
+# This routine sets non existant checkbox form elements to ''.
+#
+sub clean_up_environment {
+ if ($env{'form.phase'} eq 'basic_search') {
+ if (! exists($env{'form.related'})) {
+ $env{'form.related'} = '';
+ }
+ if (! exists($env{'form.domains'})) {
+ $env{'form.domains'} = '';
+ }
+ } elsif ($env{'form.phase'} eq 'adv_search') {
+ foreach my $field ('title','keywords','notes',
+ 'abstract','standards','mime') {
+ if (! exists($env{'form.'.$field.'_related'})) {
+ $env{'form.'.$field.'_related'} = '';
}
}
- untie(%hash);
- }
- unless ($totalfound) {
- $r->print('<p>'.&mt('No resources found').'.</p>');
- }
-# =================================================== Done going through course
- $r->print('</body></html>');
-}
-
-# =============================== 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);
- }
+ } elsif ($env{'form.phase'} eq 'course_search') {
+ if (! exists($env{'form.crsrelated'})) {
+ $env{'form.crsrelated'} = '';
+ }
}
}
-sub untiehash {
- if (tied(%hash)) {
- untie(%hash);
+sub hidden_field {
+ my ($name,$value) = @_;
+ if (! defined($value)) {
+ $value = $env{'form.'.$name};
}
+ return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'.$/;
}
-} # End of course search scoping
-
-######################################################################
######################################################################
-=pod
+=pod
+=over 4
+
=item &print_basic_search_form()
-Returns a scalar which holds html for the basic search form.
+Prints the form for the basic search. Sorry the name is so cryptic.
=cut
######################################################################
######################################################################
-
-sub print_basic_search_form{
+sub print_basic_search_form {
my ($r,$closebutton,$hidden_fields) = @_;
- my $bodytag=&Apache::loncommon::bodytag('Search');
- my $scrout=<<"ENDDOCUMENT";
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript">
- function openhelp(val) {
- openhelpwin=open('/adm/help/searchcat.html','helpscreen',
- 'scrollbars=1,width=600,height=300');
- openhelpwin.focus();
- }
-</script>
-</head>
-$bodytag
-ENDDOCUMENT
-if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
- my $CatalogSearch=&mt('Catalog Search');
- my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below');
- $scrout.=(<<ENDDOCUMENT);
-<h1>$CatalogSearch</h1>
-<form name="loncapa_search" method="post" action="/adm/searchcat">
-<input type="hidden" name="phase" value="basic_search" />
-$hidden_fields
-<p>
-$Statement.
-</p>
-<p>
-<table>
-<tr><td>
-ENDDOCUMENT
- $scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
- ' ';
- my $relatedcheckbox = &simplecheckbox('related','related',$ENV{'form.related'});
- my $domain = $r->dir_config('lonDefDomain');
- my $domaincheckbox = &simplecheckbox('domains',$domain);
- my $srch=&mt('Search');
- my $header=&mt('Advanced Search');
- my $userelatedwords=&mt('use related words');
- my $onlysearchdomain=&mt('only search domain');
- $scrout.=<<END;
-</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 $userelatedwords</td>
- <td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>
-</table>
-</p>
-<p>
- <input type="submit" name="basicsubmit" value='$srch' />
-$closebutton
-END
- $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;
-</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 name="course_search" 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
+ my $result = ($env{'form.catalogmode'} ne 'import');
+ my $bread_crumb =
+ &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
+ $env{'form.catalogmode'} ne 'import');
+ my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
+# Search form for resource space
+ if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+ $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
+ $scrout .= '<hr /><br />';
+ }
+# Search form for accessible portfolio files
+ $scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
+ $scrout .= &Apache::loncommon::end_page();
$r->print($scrout);
return;
}
+
+sub setup_basic_search {
+ my ($r,$area,$hidden_fields,$closebutton) = @_;
+ # Define interface components
+ my %lt = &Apache::lonlocal::texthash (
+ res => 'LON-CAPA Catalog Search',
+ portfolio => 'Portfolio Search',
+ );
+ my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
+
+ $userelatedwords = '<label>'
+ .&Apache::lonhtmlcommon::checkbox(
+ 'related',
+ $env{'form.related'},
+ 'related')
+ .' '
+ .&mt('use related words')
+ .'</label>';
+
+ $onlysearchdomain = '<label>'
+ .&Apache::lonhtmlcommon::checkbox(
+ 'domains',
+ $env{'form.domains'},
+ $r->dir_config('lonDefDomain'))
+ .' '
+ .&mt('only search domain [_1]'
+ ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+ .'</label>';
+
+ $adv_search_link = '<a href="/adm/searchcat?'.
+ &Apache::loncommon::inhibit_menu_check().
+ '&phase=disp_adv'.
+ '&catalogmode='.$env{'form.catalogmode'}.
+ '&launch='.$env{'form.launch'}.
+ '&mode='.$env{'form.mode'}.
+ '&area='.$area.
+ '&form='.$env{'form.form'}.
+ '&titleelement='.$env{'form.titleelement'}.
+ '&element='.$env{'form.element'}.
+ '">'.&mt('Advanced Search').'</a>';
+ #
+ $scrout.='<form name="loncapa_search" method="post" '.
+ 'action="/adm/searchcat">'.
+ '<input type="hidden" name="phase" value="basic_search" />'.
+ $hidden_fields;
+ if (!exists($env{'form.area'})) {
+ $scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
+ }
+ #
+ $scrout .= '<div align="center">'.$/;
+# if ($env{'request.course.id'}) {
+ $scrout .= '<h1>'.$lt{$area}.'</h1>';
+# } else {
+ # No need to tell them they are searching
+# $scrout.= ('<br />'x2);
+# }
+ $scrout.='<table>'.
+ '<tr><td align="center" valign="top">'.
+ &Apache::lonhtmlcommon::textbox('basicexp',
+ $env{'form.basicexp'},50).
+ '<br />'.
+ '<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
+ '<td>'.
+ '<span class="LC_nobreak">'.(' 'x3).$adv_search_link.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$userelatedwords.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$onlysearchdomain.'</span>'.'<br />'.
+ '<span class="LC_nobreak">'.(' 'x1).$inclext.'</span>'.'<br />'.
+ '</td>'.
+ '</tr>'.
+ '</table>'.$/;
+ #
+ $scrout .= '<p>'
+ .&viewoptions()
+ .'</p>'
+ .'<p>'
+ .'<input type="submit" name="basicsubmit" '
+ .'value="'.&mt('Search').'" />'
+ .' '
+ .$closebutton
+ .'</p>';
+ #
+ $scrout .= '</div>'.'</form>';
+ return $scrout;
+}
+
######################################################################
######################################################################
@@ -578,194 +551,295 @@ ENDDOCUMENT
=item &advanced_search_form()
-Returns a scalar which holds html for the advanced search form.
+Prints the advanced search form.
=cut
######################################################################
######################################################################
-
sub print_advanced_search_form{
my ($r,$closebutton,$hidden_fields) = @_;
- my $advanced_buttons = <<"END";
+ my $bread_crumb =
+ &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Advanced',
+ $env{'form.catalogmode'} ne 'import');
+ my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
+ 'reset' => 'Reset',
+ 'help' => 'Help');
+ my $advanced_buttons=<<"END";
<p>
-<input type="submit" name="advancedsubmit" value='SEARCH' />
-<input type="reset" name="reset" value='RESET' />
+<input type="submit" name="advancedsubmit" value='$lt{"srch"}' />
+<input type="reset" name="reset" value='$lt{"reset"}' />
$closebutton
-<input type="button" value="HELP" onClick="openhelp()" />
</p>
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>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript">
- function openhelp(val) {
- openhelpwin=open('/adm/help/searchcat.html','helpscreen',
- 'scrollbars=1,width=600,height=300');
- openhelpwin.focus();
- }
-</script>
-</head>
-$bodytag
-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.=&selectbox(undef,'viewselect',
- $ENV{'form.viewselect'},
- undef,undef,undef,
- sort(keys(%Views)));
- $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'});
- $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','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' if (! defined($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 $srchtype = 'Catalog';
+ my $jscript;
+ if ($env{'form.area'} eq 'portfolio') {
+ $srchtype = 'Portfolio';
+ $jscript = '<script type="text/javascript">
+// <![CDATA[
+function additional_metadata() {
+ if (document.advsearch.newfield.checked) {
+ document.advsearch.phase.value = "disp_adv";
+ document.advsearch.numaddedfields.value = parseInt(document.advsearch.numaddedfields.value) +1;
+ document.advsearch.submit();
+ }
+}
+// ]]>
+</script>';
+ }
+ my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
+ $jscript);
+ $scrout .= $bread_crumb;
+
+ $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
+ .$hidden_fields
+ .'<input type="hidden" name="phase" value="adv_search" />';
+
+ $scrout .= '<fieldset>'."\n"
+ .'<legend>'.&mt('Display Options').'</legend>'."\n"
+ .&viewoptions()
+ .'</fieldset>';
+
+ $scrout .= $advanced_buttons;
+
+ $scrout .= &Apache::lonhtmlcommon::start_pick_box();
+
+ my %fields=&Apache::lonmeta::fieldnames();
+
+ # Standard Metadata
+ $scrout .= &Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.&mt("Standard $srchtype Metadata").'</h3>'
+ .&searchhelp()
+ .&Apache::lonhtmlcommon::row_closure();
+ my %related_word_search =
+ ('title' => 1,
+ 'author' => 0,
+ 'owner' => 0,
+ 'authorspace' => 0,
+ 'modifyinguser'=> 0,
+ 'keywords' => 1,
+ 'notes' => 1,
+ 'abstract' => 1,
+ 'standards'=> 1,
+ 'mime' => 1,
+ 'subject' => 1,
+ );
+ #
+ foreach my $field ('title','author','subject','owner','authorspace',
+ 'modifyinguser','keywords','notes','abstract',
+ 'standards','mime') {
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+ .&Apache::lonmeta::prettyinput($field,
+ $env{'form.'.$field},
+ $field,
+ 'advsearch',
+ $related_word_search{$field},
+ '',
+ $env{'form.'.$field.'_related'},
+ 50);
+ if ($related_word_search{$field}) {
+ $scrout .= &mt('related words');
+ } else {
+ $scrout .= '';
+ }
+ $scrout .= &Apache::lonhtmlcommon::row_closure();
}
- my @domains =&Apache::loncommon::get_domains();
- # adjust the size of the select box
- my $size = 4;
- $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
- $scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
- 'DOMAINS TO BE SEARCHED</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,
- (&Apache::loncommon::languageids),
- );
-# ------------------------------------------------ Compute date selection boxes
- $scrout.=<<CREATIONDATESTART;
-<p>
-<font color="#800000" face="helvetica"><b>LIMIT BY CREATION DATE RANGE:</b>
-</font>
-<br />
-between:
-CREATIONDATESTART
- $scrout.=&dateboxes('creationdatestart',1,1,1976,
- $ENV{'form.creationdatestart_month'},
- $ENV{'form.creationdatestart_day'},
- $ENV{'form.creationdatestart_year'},
- );
- $scrout.="and:\n";
- $scrout.=&dateboxes('creationdateend',12,31,2051,
- $ENV{'form.creationdateend_month'},
- $ENV{'form.creationdateend_day'},
- $ENV{'form.creationdateend_year'},
- );
- $scrout.="</p>";
- $scrout.=<<LASTREVISIONDATESTART;
-<p>
-<font color="#800000" face="helvetica"><b>LIMIT BY LAST REVISION DATE RANGE:
-</b></font>
-<br />between:
-LASTREVISIONDATESTART
- $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976,
- $ENV{'form.lastrevisiondatestart_month'},
- $ENV{'form.lastrevisiondatestart_day'},
- $ENV{'form.lastrevisiondatestart_year'},
- );
- $scrout.=<<LASTREVISIONDATEEND;
-and:
-LASTREVISIONDATEEND
- $scrout.=&dateboxes('lastrevisiondateend',12,31,2051,
- $ENV{'form.lastrevisiondateend_month'},
- $ENV{'form.lastrevisiondateend_day'},
- $ENV{'form.lastrevisiondateend_year'},
- );
- $scrout.='</p>';
- $ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});
- $scrout.=&selectbox('Limit by copyright/distribution','copyright',
- $ENV{'form.copyright'},
- 'any','Any copyright/distribution',
- \&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.=<<ENDDOCUMENT;
-$advanced_buttons
-</form>
-</body>
-</html>
-ENDDOCUMENT
+ foreach my $field ('lowestgradelevel','highestgradelevel') {
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+ .&Apache::lonmeta::prettyinput($field,
+ $env{'form.'.$field},
+ $field,
+ 'advsearch',
+ 0)
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('MIME Type Category')))
+ .&Apache::loncommon::filecategoryselect('category',
+ $env{'form.category'})
+ .&Apache::lonhtmlcommon::row_closure();
+
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')))
+ .&Apache::loncommon::domain_select('domains',
+ $env{'form.domains'},1)
+ .&Apache::lonhtmlcommon::row_closure();
+
+ # Misc metadata
+ if ($env{'form.area'} ne 'portfolio') {
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
+ .&Apache::lonmeta::selectbox('copyright',
+ $env{'form.copyright'},
+ \&Apache::loncommon::copyrightdescription,
+ ( undef,
+ &Apache::loncommon::copyrightids)
+ )
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
+ .&Apache::lonmeta::selectbox('language',
+ $env{'form.language'},
+ \&Apache::loncommon::languagedescription,
+ ('any',&Apache::loncommon::languageids)
+ )
+ .&Apache::lonhtmlcommon::row_closure();
+
+ # Portfolio Metadata
+ if ($env{'form.area'} eq 'portfolio') {
+ # Added fields
+ my $curnumadd = $env{'form.numaddedfields'};
+ if ($curnumadd eq '') {
+ $curnumadd = 1;
+ }
+ $scrout .= &Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.&mt('Custom Metadata fields').'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title('')
+ .&mt('Field Name').' | '.&mt('Field Value(s)')
+ .&Apache::lonhtmlcommon::row_closure();
+
+ for (my $j=0; $j<$curnumadd; $j++) {
+ my $num = $j+1;
+ $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Custom metadata [_1]',$num))
+ .'<input type="text"'
+ .' name="addedfield_'.$j.'" size="10"'
+ .' value="'.$env{'form.addedfield_'.$j}.'" />'
+ .' '
+ .'<input type="text" '
+ .'name="addedvalues_'.$j.'" size="15"'
+ .' value="'.$env{'form.addedvalues_'.$j}.'" />'
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+ $scrout .= &Apache::lonhtmlcommon::row_title('')
+ .'<label>'
+ .'<input type="checkbox" name="newfield"'
+ .' value="1" onclick="javascript:additional_metadata()" />'
+ .&mt('Another custom field/value pair?').'</label>'
+ .'<input type="hidden" name="numaddedfields"'
+ .' value="'.$curnumadd.'" />'
+ .&Apache::lonhtmlcommon::row_closure();
+} else {
+ #
+ # Dynamic metadata
+ $scrout .= &Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.&mt('Problem Statistics').'</h3>'
+ .&Apache::lonhtmlcommon::row_closure();
+ $scrout .= &Apache::lonhtmlcommon::row_title('')
+ .&mt('Minimum').' | '.&mt('Maximum')
+ .&Apache::lonhtmlcommon::row_closure();
+ foreach my $statistic
+ ({ name=>'count',
+ description=>'Network-wide number of accesses (hits)',},
+ { name=>'stdno',
+ description=>
+ 'Statistics calculated for number of students',},
+ { name => 'avetries',
+ description=>'Average number of tries till solved',},
+ { name => 'difficulty',
+ description=>'Degree of difficulty',},
+ { name => 'disc',
+ description=>'Degree of discrimination'}) {
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($statistic->{'description'})))
+ .'<input type="text" name="'.$statistic->{'name'}
+ .'_min" value="" size="6" />'
+ .' '
+ .'<input type="text" name="'.$statistic->{'name'}
+ .'_max" value="" size="6" />'
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+
+ $scrout .= &Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.&mt('Evaluation Data').'</h3>'
+ .&Apache::lonhtmlcommon::row_closure();
+ $scrout .= &Apache::lonhtmlcommon::row_title('')
+ .&mt('Minimum').' | '.&mt('Maximum')
+ .&Apache::lonhtmlcommon::row_closure();
+ foreach my $evaluation
+ ( { name => 'clear',
+ description => 'Material presented in clear way'},
+ { name =>'depth',
+ description => 'Material covered with sufficient depth'},
+ { name => 'helpful',
+ description => 'Material is helpful'},
+ { name => 'correct',
+ description => 'Material appears to be correct'},
+ { name => 'technical',
+ description => 'Resource is technically correct'}){
+ $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($evaluation->{'description'})))
+ .'<input type="text" name="'
+ .$evaluation->{'name'}.'_min" value="" size="6" />'
+ .' '
+ .'<input type="text" name="'
+ .$evaluation->{'name'}.'_max" value="" size="6" />'
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+ }
+ #
+ # Creation/Modification date limits
+ $scrout .= &Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.&mt('Creation and Modification dates').'</h3>'
+ .&Apache::lonhtmlcommon::row_closure();
+ $scrout .= &Apache::lonhtmlcommon::row_title('')
+ .&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)
+ .&Apache::lonhtmlcommon::row_closure();
+
+ my $cafter =
+ &Apache::lonhtmlcommon::date_setter('advsearch', # formname
+ 'creationdate1', # fieldname
+ 0, # current value
+ '', # special
+ 1, # includeempty
+ '', # state
+ 1, # no_hh_mm_ss
+ );
+ my $cbefore =
+ &Apache::lonhtmlcommon::date_setter('advsearch', # formname
+ 'creationdate2', # fieldname
+ 0, # current value
+ '', # special
+ 1, # includeempty
+ '', # state
+ 1, # no_hh_mm_ss
+ );
+ $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Created between'))
+ .$cafter
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title(&mt('and'))
+ .$cbefore
+ .&Apache::lonhtmlcommon::row_closure();
+
+ my $lafter =
+ &Apache::lonhtmlcommon::date_setter('advsearch',
+ 'revisiondate1',
+ 0, # current value
+ '', # special
+ 1, # includeempty
+ '', # state
+ 1, # no_hh_mm_ss
+ );
+ my $lbefore =
+ &Apache::lonhtmlcommon::date_setter('advsearch',
+ 'revisiondate2',
+ 0, # current value
+ '', # special
+ 1, # includeempty
+ '', # state
+ 1, # no_hh_mm_ss
+ );
+ $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Last modified between'))
+ .$lafter
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title(&mt('and'))
+ .$lbefore
+ .&Apache::lonhtmlcommon::row_closure(1); # Last row of total pick_box
+
+ $scrout .= &Apache::lonhtmlcommon::end_pick_box();
+
+ $scrout .= $advanced_buttons
+ .'</form>';
+
+ $scrout .= &Apache::loncommon::end_page();
$r->print($scrout);
return;
}
@@ -775,7 +849,111 @@ ENDDOCUMENT
=pod
-=item &get_persistent_form_data
+=item &titlefield()
+
+Inputs: title text
+
+Outputs: titletext with font wrapper
+
+=cut
+
+######################################################################
+######################################################################
+sub titlefield {
+ my $title=shift;
+ return $title;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item viewoptiontext()
+
+Inputs: codename for view option
+
+Outputs: displayed text
+
+=cut
+
+######################################################################
+######################################################################
+sub viewoptiontext {
+ my $code=shift;
+ my %desc=&Apache::lonlocal::texthash
+ ('detailed' => "Detailed Citation View",
+ 'xml' => 'XML/SGML',
+ 'compact' => 'Compact View',
+ 'fielded' => 'Fielded Format',
+ 'summary' => 'Summary View',
+ 'summarypreview' => 'Summary Preview',
+ 'detailedpreview' => 'Detailed Citation Preview');
+ return $desc{$code};
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item viewoptions()
+
+Inputs: none
+
+Outputs: text for box with view options
+
+=cut
+
+######################################################################
+######################################################################
+sub viewoptions {
+ my $scrout;
+ if (! defined($env{'form.viewselect'})) {
+ $env{'form.viewselect'}='detailed';
+ }
+ $scrout .= '<span class="LC_nobreak">'
+ .&mt('Type:').' '
+ .&Apache::lonmeta::selectbox('viewselect',
+ $env{'form.viewselect'},
+ \&viewoptiontext,
+ sort(keys(%Views)))
+ .'</span>';
+ my $countselect = &Apache::lonmeta::selectbox('show',
+ $env{'form.show'},
+ undef,
+ (10,20,50,100,1000,10000));
+ $scrout .= ' <span class="LC_nobreak">'
+ .&mt('Records per Page:').' '.$countselect
+ .'</span>'.$/;
+ return $scrout;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item searchhelp()
+
+Inputs: none
+
+Outputs: return little blurb on how to enter searches
+
+=cut
+
+######################################################################
+######################################################################
+sub searchhelp {
+ return &mt('Enter words and quoted phrases');
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &get_persistent_form_data()
Inputs: filename of database
@@ -783,7 +961,7 @@ Outputs: returns undef on database error
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
+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.
@@ -805,20 +983,20 @@ sub get_persistent_form_data {
next if ($name !~ /^form./);
# Kludgification begins!
if ($name eq 'form.domains' &&
- $ENV{'form.searchmode'} eq 'basic' &&
- $ENV{'form.phase'} ne 'disp_basic') {
+ $env{'form.searchmode'} eq 'basic' &&
+ $env{'form.phase'} ne 'disp_basic') {
next;
}
# End kludge (hopefully)
- next if (exists($ENV{$name}));
+ next if (exists($env{$name}));
my @values = map {
- &Apache::lonnet::unescape($_);
+ &unescape($_);
} split(',',$persistent_db{$name});
next if (@values <1);
if ($arrays_allowed{$name}) {
- $ENV{$name} = [@values];
+ $env{$name} = [@values];
} else {
- $ENV{$name} = $values[0] if ($values[0]);
+ $env{$name} = $values[0] if ($values[0]);
}
}
untie (%persistent_db);
@@ -830,7 +1008,7 @@ sub get_persistent_form_data {
=pod
-=item &get_persistent_data
+=item &get_persistent_data()
Inputs: filename of database, ref to array of values to recover.
@@ -838,8 +1016,9 @@ Outputs: array of values. Returns undef
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.
+values unescaped. If the item is 'domains; then the returned
+value will be a hash pointer. Otherwise, if the item contains
+commas (before unescaping), the returned value will be an array pointer.
=cut
@@ -857,13 +1036,25 @@ sub get_persistent_data {
push @Values, undef;
next;
}
- my @values = map {
- &Apache::lonnet::unescape($_);
- } split(',',$persistent_db{$name});
- if (@values <= 1) {
- push @Values,$values[0];
+ if ($name eq 'domains') {
+ my %valueshash;
+ my @items= map { &unescape($_); } split(',',$persistent_db{$name});
+ foreach my $item (@items) {
+ if ($item =~ /=/) {
+ my ($key,$val) = map { &unescape($_); } split(/=/,$item);
+ $valueshash{$key} = $val;
+ }
+ }
+ push(@Values,\%valueshash);
} else {
- push @Values,\@values;
+ my @values = map {
+ &unescape($_);
+ } split(',',$persistent_db{$name});
+ if (@values <= 1) {
+ push @Values,$values[0];
+ } else {
+ push @Values,\@values;
+ }
}
}
untie (%persistent_db);
@@ -881,7 +1072,9 @@ Inputs: Hash of values to save, filename
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.
+elements escaped and concatenated in a comma separated string. Values
+that are hash pointers will have their keys and values escaped and
+concatenated in a comma separated string.
=cut
@@ -893,9 +1086,18 @@ sub make_persistent {
return undef if (! tie(%persistent_db,'GDBM_File',
$filename,&GDBM_WRCREAT(),0640));
foreach my $name (keys(%save)) {
- my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
- # We handle array references, but not recursively.
- my $store = join(',', map { &Apache::lonnet::escape($_); } @values );
+ my @values=();
+ if (ref($save{$name}) eq 'ARRAY') {
+ @values = @{$save{$name}};
+ } elsif (ref($save{$name}) eq 'HASH') {
+ foreach my $key (%{$save{$name}}) {
+ push(@values,&escape($key).'='.&escape($save{$name}{$key}));
+ }
+ } else {
+ @values = $save{$name};
+ }
+ # We handle array and hash references, but not recursively.
+ my $store = join(',', map { &escape($_); } @values );
$persistent_db{$name} = $store;
}
untie(%persistent_db);
@@ -913,7 +1115,7 @@ 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.
+elements escaped and concatenated in a comma separated string.
=cut
@@ -923,296 +1125,14 @@ sub make_form_data_persistent {
my $r = shift;
my $filename = shift;
my %save;
- foreach (keys(%ENV)) {
+ foreach (keys(%env)) {
next if (!/^form/ || /submit/);
- $save{$_} = $ENV{$_};
+ $save{$_} = $env{$_};
}
return &make_persistent(\%save,$filename);
}
######################################################################
-# HTML form building functions #
-######################################################################
-
-=pod
-
-=item HTML form building functions
-
-=over 4
-
-=cut
-
-###############################################
-###############################################
-
-=pod
-
-=item &simpletextfield()
-
-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,$checked
-
-Returns a simple check box with the given $name.
-If $value eq 'on' the box is checked.
-
-=cut
-
-###############################################
-###############################################
-
-sub simplecheckbox{
- my ($name,$value,$checked)=@_;
- $checked="checked" if ($value eq $checked || $value eq 'on');
- return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.
- $checked.' />';
-}
-
-###############################################
-###############################################
-
-=pod
-
-=item &fieldtitle()
-
-Input: $title
-
-Returns a scalar with html which will display $title as a search
-field heading.
-
-=cut
-
-###############################################
-###############################################
-
-sub fieldtitle {
- my $title = uc(&mt(shift()));
- return '<font color="#800000" face="helvetica"><b>'.$title.
- ': </b></font>';
-}
-
-###############################################
-###############################################
-
-=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)=@_;
- 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)=@_;
- ($defaultmonth,$defaultday,$defaultyear)=('','','');
- #
- # Day
- my $day=<<END;
-<select name="${name}_day">
-<option value='$defaultday'> </option>
-END
- for (my $i = 1; $i<=31; $i++) {
- $day.="<option value=\"$i\">$i</option>\n";
- }
- $day.="</select>\n";
- $day=~s/(\"$currentday\")/$1 SELECTED/ if length($currentday);
- #
- # Month
- my $month=<<END;
-<select name="${name}_month">
-<option value='$defaultmonth'> </option>
-END
- my $i = 1;
- foreach (qw/January February March April May June
- July August September October November December /){
- $month .="<option value=\"$i\">".&mt($_)."</option>\n";
- $i++;
- }
- $month.="</select>\n";
- $month=~s/(\"$currentmonth\")/$1 SELECTED/ if length($currentmonth);
- #
- # Year (obviously)
- my $year=<<END;
-<select name="${name}_year">
-<option value='$defaultyear'> </option>
-END
- my $maxyear = 2051;
- for (my $i = 1976; $i<=$maxyear; $i++) {
- $year.="<option value=\"$i\">$i</option>\n";
- }
- $year.="</select>\n";
- $year=~s/(\"$currentyear\")/$1 SELECTED/ if length($currentyear);
- 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,$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">'.
- '<b>'.$uctitle.': </b></font>';
- }
- $selout .= '<select name="'.$name.'">';
- unshift @idlist,$anyvalue if (defined($anyvalue));
- foreach (@idlist) {
- $selout.='<option value="'.$_.'"';
- if ($_ eq $default and !/^any$/) {
- $selout.=' selected >'.&mt(&{$functionref}($_)).'</option>';
- }
- elsif ($_ eq $default and /^$anyvalue$/) {
- $selout.=' selected >'.&mt($anytag).'</option>';
- }
- else {$selout.='>'.&mt(&{$functionref}($_)).'</option>';}
- }
- return $selout.'</select>'.(defined($title)?'</p>':' ');
-}
-
-######################################################################
-# End of HTML form building functions #
-######################################################################
-
-=pod
-
-=back
-
-=cut
-
-
-######################################################################
######################################################################
=pod
@@ -1239,40 +1159,69 @@ Parse advanced search form and return th
######################################################################
sub parse_advanced_search {
my ($r,$closebutton,$hidden_fields)=@_;
+ my @BasicFields = ('title','author','subject','keywords','url','version',
+ 'notes','abstract','extension','owner','authorspace',
+# 'custommetadata','customshow',
+ 'modifyinguser','standards','mime');
+ my @StatsFields = &statfields();
+ my @EvalFields = &evalfields();
my $fillflag=0;
- my $pretty_search_string = "<br />\n";
+ my $pretty_search_string = "";
# Clean up fields for safety
- for my $field ('title','author','subject','keywords','url','version',
- 'creationdatestart_month','creationdatestart_day',
+ for my $field (@BasicFields,
+ 'creationdatestart_month','creationdatestart_day',
'creationdatestart_year','creationdateend_month',
'creationdateend_day','creationdateend_year',
'lastrevisiondatestart_month','lastrevisiondatestart_day',
'lastrevisiondatestart_year','lastrevisiondateend_month',
- 'lastrevisiondateend_day','lastrevisiondateend_year',
- 'notes','abstract','extension','language','owner',
- 'custommetadata','customshow','category') {
- $ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+ 'lastrevisiondateend_day','lastrevisiondateend_year') {
+ $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.\*]//g;
}
foreach ('mode','form','element') {
# is this required? Hmmm.
- next unless (exists($ENV{"form.$_"}));
- $ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
- $ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+ next if (! exists($env{'form.'.$_}));
+ $env{'form.'.$_}=&unescape($env{'form.'.$_});
+ $env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
# Preprocess the category form element.
- $ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) ||
- ref($ENV{'form.category'}));
+ $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','category','extension','language',
- 'owner','custommetadata') {
- if (&filled($ENV{"form.$field"})) {
+ foreach my $field (@BasicFields) {
+ if (&filled($env{'form.'.$field})) {
$fillflag++;
}
}
- unless ($fillflag) {
- &output_blank_field_error($r,$closebutton,'phase=disp_adv',$hidden_fields);
+ foreach my $field (@StatsFields,@EvalFields) {
+ if (&filled($env{'form.'.$field.'_max'})) {
+ $fillflag++;
+ }
+ if (&filled($env{'form.'.$field.'_min'})) {
+ $fillflag++;
+ }
+ }
+
+ for my $field ('lowestgradelevel','highestgradelevel') {
+ if ( $env{'form.'.$field} =~ /^\d+$/ &&
+ $env{'form.'.$field} > 0) {
+ $fillflag++;
+ }
+ }
+ if ($env{'form.area'} eq 'portfolio') {
+ # Added metadata fields
+ for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
+ my $field = $env{'form.addedfield_'.$i};
+ $field =~ s/^\s*(\S*)\s*$/$1/;
+ $field =~ s/\W/_/g;
+ if ($field ne '') {
+ $fillflag++;
+ }
+ }
+ }
+ if (! $fillflag) {
+ &output_blank_field_error($r,$closebutton,
+ 'phase=disp_adv',$hidden_fields);
return ;
}
# Turn the form input into a SQL-based query
@@ -1280,158 +1229,262 @@ sub parse_advanced_search {
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') {
- if ($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>.";
+ foreach my $field (@BasicFields) {
+ next if (!defined($env{'form.'.$field}) || $env{'form.'.$field} eq '');
+ my ($error,$SQLQuery) =
+ &process_phrase_input($env{'form.'.$field},
+ $env{'form.'.$field.'_related'},$field);
+ if (defined($error)) {
+ &output_unparsed_phrase_error($r,$closebutton,'phase=disp_adv',
+ $hidden_fields,$field);
+ return;
+ } else {
+ $pretty_search_string .=
+ $font.$field.'</font>: '.$env{'form.'.$field};
+ if ($env{'form.'.$field.'_related'}) {
+ my @Words =
+ &Apache::loncommon::get_related_words
+ ($env{'form.'.$field});
+ if (@Words) {
+ $pretty_search_string.= ' with related words: '.
+ join(', ',@Words[0..4]);
} else {
- $pretty_search_string .= " with no related words.";
+ $pretty_search_string.= ' with related words.';
}
}
- $pretty_search_string .= "<br />\n";
- push @queries,&build_SQL_query($field,$searchphrase);
+ $pretty_search_string .= '<br />';
+ push (@queries,$SQLQuery);
}
}
#
# 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') {
+ if (exists($env{'form.category'}) &&
+ $env{'form.category'} !~ /^\s*$/ &&
+ $env{'form.category'} ne 'any') {
my @extensions = &Apache::loncommon::filecategorytypes
- ($ENV{'form.category'});
+ ($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);
+ my ($error,$SQLsearch) = &process_phrase_input($searchphrase,0,'mime');
+ push @queries,$SQLsearch;
$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'}\")";
+ if ($env{'form.lowestgradelevel'} &&
+ $env{'form.lowestgradelevel'} ne '0' &&
+ $env{'form.lowestgradelevel'} =~ /^\d+$/) {
+ push(@queries,
+ '(lowestgradelevel>='.$env{'form.lowestgradelevel'}.')');
+ $pretty_search_string.="lowestgradelevel>=".
+ $env{'form.lowestgradelevel'}."<br />\n";
+ }
+ if ($env{'form.highestgradelevel'} &&
+ $env{'form.highestgradelevel'} ne '0' &&
+ $env{'form.highestgradelevel'} =~ /^\d+$/) {
+ push(@queries,
+ '(highestgradelevel<='.$env{'form.highestgradelevel'}.')');
+ $pretty_search_string.="highestgradelevel<=".
+ $env{'form.highestgradelevel'}."<br />\n";
+ }
+ if ($env{'form.language'} and $env{'form.language'} ne 'any') {
+ push @queries,"(language like \"$env{'form.language'}\")";
$pretty_search_string.=$font."language</font>= ".
- &Apache::loncommon::languagedescription($ENV{'form.language'}).
+ &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'}\")";
+ 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";
+ &Apache::loncommon::copyrightdescription($env{'form.copyright'}).
+ "<br />\n";
+ }
+ if ($env{'form.area'} eq 'portfolio') {
+ #
+ # Added metadata fields
+ for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
+ my $field = $env{'form.addedfield_'.$i};
+ $field =~ s/^\s*(\S*)\s*$/$1/;
+ $field =~ s/\W/_/g;
+ $field =~ tr/A-Z/a-z/;
+ if ($field ne '') {
+ my $value = $env{'form.addedvalues_'.$i};
+ if ($value ne '') {
+ $value =~ s/'/''/g; #' stupid emacs
+ my ($error,$query) =
+ &process_phrase_input($value,0,'pf.value');
+ if (!defined($error)) {
+ push(@queries,"pf.field = '$field' AND $query");
+ $pretty_search_string .=
+ $font.$field.'</font>: '.
+ $env{'form.addedvalues_'.$i}.'<br />';
+ }
+ } else {
+ push(@queries,"pf.field = '$field' AND pf.value IS NULL");
+ }
+ }
+ }
+ } else {
+ #
+ # Statistics
+ foreach my $field (@StatsFields,@EvalFields) {
+ my ($min,$max);
+ if (exists($env{'form.'.$field.'_min'}) &&
+ $env{'form.'.$field.'_min'} ne '') {
+ $min = $env{'form.'.$field.'_min'};
+ }
+ if (exists($env{'form.'.$field.'_max'}) &&
+ $env{'form.'.$field.'_max'} ne '') {
+ $max = $env{'form.'.$field.'_max'};
+ }
+ next if (! defined($max) && ! defined($min));
+ if (defined($min) && defined($max)) {
+ ($min,$max) = sort {$a <=>$b} ($min,$max);
+ }
+ if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+ push(@queries,'('.$field.'>'.$min.')');
+ $pretty_search_string.=$font.$field.'</font>>'.$min.'<br />';
+ }
+ if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+ push(@queries,'('.$field.'<'.$max.')');
+ $pretty_search_string.=$font.$field.'</font><'.$max.'<br />';
+ }
+ }
}
#
# Evaluate date windows
- my $datequery=&build_date_queries(
- $ENV{'form.creationdatestart_month'},
- $ENV{'form.creationdatestart_day'},
- $ENV{'form.creationdatestart_year'},
- $ENV{'form.creationdateend_month'},
- $ENV{'form.creationdateend_day'},
- $ENV{'form.creationdateend_year'},
- $ENV{'form.lastrevisiondatestart_month'},
- $ENV{'form.lastrevisiondatestart_day'},
- $ENV{'form.lastrevisiondatestart_year'},
- $ENV{'form.lastrevisiondateend_month'},
- $ENV{'form.lastrevisiondateend_day'},
- $ENV{'form.lastrevisiondateend_year'},
- );
- # Test to see if date windows are legitimate
- if ($datequery=~/^Incorrect/) {
- &output_date_error($r,$datequery,$closebutton,$hidden_fields);
- return ;
- } elsif ($datequery) {
+ my $cafter =
+ &Apache::lonhtmlcommon::get_date_from_form('creationdate1');
+ my $cbefore =
+ &Apache::lonhtmlcommon::get_date_from_form('creationdate2');
+ if ($cafter > $cbefore) {
+ my $tmp = $cafter;
+ $cafter = $cbefore;
+ $cbefore = $tmp;
+ }
+ my $mafter =
+ &Apache::lonhtmlcommon::get_date_from_form('revisiondate1');
+ my $mbefore =
+ &Apache::lonhtmlcommon::get_date_from_form('revisiondate2');
+ if ($mafter > $mbefore) {
+ my $tmp = $mafter;
+ $mafter = $mbefore;
+ $mbefore = $tmp;
+ }
+ my ($datequery,$error,$prettydate)=&build_date_queries($cafter,$cbefore,
+ $mafter,$mbefore);
+ if (defined($error)) {
+ &output_date_error($r,$error,$closebutton,$hidden_fields);
+ } elsif (defined($datequery)) {
# Here is where you would set up pretty_search_string to output
# date query information.
+ $pretty_search_string .= '<br />'.$prettydate.'<br />';
push @queries,$datequery;
}
+ #
# 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'});
-# }
+ ##
+ ## The custom metadata search was removed q long time ago mostly
+ ## because I was unable to figureout exactly how it worked and could
+ ## not imagine people actually using it. MH
+ ##
+ # 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) =
+ my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
&parse_domain_restrictions();
- $pretty_search_string .= $pretty_domains_string."<br />\n";
+ if ($pretty_domains_string) {
+ $pretty_search_string .= $pretty_domains_string."<br />\n";
+ }
#
if (@queries) {
- $query=join(" AND ",@queries);
- $query="select * from metadata where $query";
+ if ($env{'form.area'} eq 'portfolio') {
+ $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
+ } else {
+ $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
+ }
} elsif ($customquery) {
$query = '';
}
+ #&Apache::lonnet::logthis('advanced query = '.$/.$query);
return ($query,$customquery,$customshow,$libraries_to_query,
- $pretty_search_string);
+ $pretty_search_string,$domains_to_query);
}
sub parse_domain_restrictions {
my $libraries_to_query = undef;
- # $ENV{'form.domains'} can be either a scalar or an array reference.
+ my $domains_to_query = undef;
+ # $env{'form.domains'} can be either a scalar or an array reference.
# We need an array.
- 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'});
+ if (! exists($env{'form.domains'}) || $env{'form.domains'} eq '') {
+ return (undef,'',undef);
}
+ my @allowed_domains = &Apache::loncommon::get_env_multiple('form.domains');
+ #
my %domain_hash = ();
my $pretty_domains_string;
foreach (@allowed_domains) {
$domain_hash{$_}++;
}
if ($domain_hash{'any'}) {
- $pretty_domains_string = "In all LON-CAPA domains.";
+ $pretty_domains_string = &mt("in all LON-CAPA domains.");
} else {
if (@allowed_domains > 1) {
- $pretty_domains_string = "In LON-CAPA domains:";
+ $pretty_domains_string = &mt("in LON-CAPA domains:");
} else {
- $pretty_domains_string = "In LON-CAPA domain ";
+ $pretty_domains_string = &mt("in LON-CAPA 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,$_;
+ my %library_servers = &Apache::lonnet::get_unique_servers(\@allowed_domains,
+ 'library');
+ my (%older_library_servers,%okdoms,%domains_for_id);
+ map { $okdoms{$_} = 1; } @allowed_domains;
+ foreach my $key (keys(%library_servers)) {
+ if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
+ my $major = $1;
+ my $minor = $2;
+ if (($major < 2) || (($major == 2) && ($minor < 11))) {
+ map { $older_library_servers{$_} = 1; }
+ &Apache::lonnet::machine_ids($library_servers{$key});
+ } else {
+ my %possdoms;
+ map { $possdoms{$_}=1 if ($okdoms{$_}); }
+ &Apache::lonnet::machine_domains($library_servers{$key});
+ $domains_for_id{$key} = join(',',sort(keys(%possdoms)));
+ }
}
}
- }
- return ($libraries_to_query,$pretty_domains_string);
+ my %servers = (%library_servers,%older_library_servers);
+ $libraries_to_query = [keys(%servers)];
+ $domains_to_query = \%domains_for_id;
+ }
+ return ($libraries_to_query,
+ $pretty_domains_string,
+ $domains_to_query);
}
######################################################################
@@ -1449,58 +1502,253 @@ Parse the basic search form and return a
######################################################################
sub parse_basic_search {
my ($r,$closebutton)=@_;
+ #
# Clean up fields for safety
for my $field ('basicexp') {
- $ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
+ $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
}
foreach ('mode','form','element') {
# is this required? Hmmm.
- next unless (exists($ENV{"form.$_"}));
- $ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
- $ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+ next unless (exists($env{"form.$_"}));
+ $env{"form.$_"}=&unescape($env{"form.$_"});
+ $env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
}
- my ($libraries_to_query,$pretty_domains_string) =
+ my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
&parse_domain_restrictions();
- # Check to see if enough is filled in
- unless (&filled($ENV{'form.basicexp'})) {
+ #
+ # Check to see if enough of a query is filled in
+ my $search_string = $env{'form.basicexp'};
+ if (! &filled($search_string)) {
&output_blank_field_error($r,$closebutton,'phase=disp_basic');
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.";
- }
+ my $pretty_search_string=$search_string;
+ my @Queries;
+ my @fields = ('title','author','subject','notes','abstract','keywords');
+ my $searchfield;
+ if ($env{'form.area'} eq 'portfolio') {
+ $searchfield = 'concat_ws(" ",pm.'.join(',pm.',@fields).')';
+ } else {
+ $searchfield = 'concat_ws(" ",'.join(',',@fields).')';
+ }
+ my ($error,$SQLQuery) = &process_phrase_input($search_string,
+ $env{'form.related'},
+ $searchfield);
+ if ($error) {
+ &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic',
+ '','basicexp');
+ return;
+ }
+ push(@Queries,$SQLQuery);
+ #foreach my $q (@Queries) {
+ # &Apache::lonnet::logthis(' '.$q);
+ #}
+ my $final_query;
+ if ($env{'form.area'} eq 'portfolio') {
+ $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
+ } else {
+ $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
+ }
+ #
+ if ($env{'form.related'}) {
+ $pretty_search_string.=' '.&mt('(including 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_ws(" ",'.$concatarg.')',$search_string);
if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
$pretty_search_string .= ' '.$pretty_domains_string;
}
$pretty_search_string .= "<br />\n";
- my $final_query = 'SELECT * FROM metadata WHERE '.$query;
-# &Apache::lonnet::logthis($final_query);
+ $pretty_search_string =~ s:^<br /> and ::;
+ &Apache::lonnet::logthis('simple search final query = '.$/.$final_query);
return ($final_query,$pretty_search_string,
- $libraries_to_query);
+ $libraries_to_query,$domains_to_query);
+}
+
+
+###############################################################
+###############################################################
+
+my @Phrases;
+
+sub concat {
+ my ($item) = @_;
+ my $results = '';
+ foreach (@$item) {
+ if (ref($_) eq 'ARRAY') {
+ $results .= join(' ',@$_);
+ }
+ }
+ return $results;
}
+sub process_phrase_input {
+ my ($phrase,$related,$field)=@_;
+ #&Apache::lonnet::logthis('phrase = :'.$phrase.':');
+ my $grammar = <<'ENDGRAMMAR';
+ searchphrase:
+ expression /^\Z/ {
+ # &Apache::lonsearchcat::print_item(\@item,0);
+ [@item];
+ }
+ expression:
+ phrase(s) {
+ [@item];
+ }
+ phrase:
+ orword {
+ [@item];
+ }
+ | andword {
+ [@item];
+ }
+ | minusword {
+ unshift(@::Phrases,$item[1]->[0]);
+ unshift(@::Phrases,$item[1]->[1]);
+ [@item];
+ }
+ | word {
+ unshift(@::Phrases,$item[1]);
+ [@item];
+ }
+ #
+ orword:
+ word 'OR' phrase {
+ unshift(@::Phrases,'OR');
+ unshift(@::Phrases,$item[1]);
+ [@item];
+ }
+ | word 'or' phrase {
+ unshift(@::Phrases,'OR');
+ unshift(@::Phrases,$item[1]);
+ [@item];
+ }
+ | minusword 'OR' phrase {
+ unshift(@::Phrases,'OR');
+ unshift(@::Phrases,$item[1]->[0]);
+ unshift(@::Phrases,$item[1]->[1]);
+ [@item];
+ }
+ | minusword 'or' phrase {
+ unshift(@::Phrases,'OR');
+ unshift(@::Phrases,$item[1]->[0]);
+ unshift(@::Phrases,$item[1]->[1]);
+ [@item];
+ }
+ andword:
+ word phrase {
+ unshift(@::Phrases,'AND');
+ unshift(@::Phrases,$item[1]);
+ [@item];
+ }
+ | minusword phrase {
+ unshift(@::Phrases,'AND');
+ unshift(@::Phrases,$item[1]->[0]);
+ unshift(@::Phrases,$item[1]->[1]);
+ [@item];
+ }
+ #
+ minusword:
+ '-' word {
+ [$item[2],'NOT'];
+ }
+ word:
+ "'" term(s) "'" {
+ &Apache::lonsearchcat::concat(\@item);
+ }
+ | '"' term(s) '"' {
+ &Apache::lonsearchcat::concat(\@item);
+ }
+ | term {
+ $item[1];
+ }
+ term:
+ /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
+ $item[1];
+ }
+ENDGRAMMAR
+ #
+ # The end result of parsing the phrase with the grammar is an array
+ # @::Phrases.
+ # $phrase = "gene splicing" or cat -> "gene splicing","OR","cat"
+ # $phrase = "genetic engineering" -dna ->
+ # "genetic engineering","AND","NOT","dna"
+ # $phrase = cat or dog -poodle -> "cat","OR","dog","AND","NOT","poodle"
+ undef(@::Phrases);
+ my $p = new Parse::RecDescent($grammar);
+ if (! defined($p->searchphrase($phrase))) {
+ &Apache::lonnet::logthis('lonsearchcat:unable to process:'.$phrase);
+ return 'Unable to process phrase '.$phrase;
+ }
+ #
+ # Go through the phrases and make sense of them.
+ # Apply modifiers NOT OR and AND to the phrases.
+ my @NewPhrases;
+ while(@::Phrases) {
+ my $phrase = shift(@::Phrases);
+ # &Apache::lonnet::logthis('phrase = '.$phrase);
+ my $phrasedata;
+ if ($phrase =~ /^(NOT|OR|AND)$/) {
+ if ($phrase eq 'OR') {
+ $phrasedata->{'or'}++;
+ if (! @::Phrases) { $phrasedata = undef; last; }
+ $phrase = shift(@::Phrases);
+ } elsif ($phrase eq 'AND') {
+ $phrasedata->{'and'}++;
+ if (! @::Phrases) { $phrasedata = undef; last; }
+ $phrase = shift(@::Phrases);
+ }
+ if ($phrase eq 'NOT') {
+ $phrasedata->{'negate'}++;
+ if (! @::Phrases) { $phrasedata = undef; last; }
+ $phrase = shift(@::Phrases);
+ }
+ }
+ $phrasedata->{'phrase'} = $phrase;
+ if ($related) {
+ my @NewWords;
+ (undef,@NewWords) = &related_version($phrasedata->{'phrase'});
+ $phrasedata->{'related_words'} = \@NewWords;
+ }
+ push(@NewPhrases,$phrasedata);
+ }
+ #
+ # Actually build the sql query from the phrases
+ my $SQLQuery;
+ foreach my $phrase (@NewPhrases) {
+ my $query;
+ if ($phrase->{'negate'}) {
+ $query .= $field.' NOT LIKE "%'.$phrase->{'phrase'}.'%"';
+ } else {
+ $query .= $field.' LIKE "%'.$phrase->{'phrase'}.'%"';
+ }
+ foreach my $related (@{$phrase->{'related_words'}}) {
+ if ($phrase->{'negate'}) {
+ $query .= ' AND '.$field.' NOT LIKE "%'.$related.'%"';
+ } else {
+ $query .= ' OR '.$field.' LIKE "%'.$related.'%"';
+ }
+ }
+ if ($SQLQuery) {
+ if ($phrase->{'or'}) {
+ $SQLQuery .= ' OR ('.$query.')';
+ } else {
+ $SQLQuery .= ' AND ('.$query.')';
+ }
+ } else {
+ $SQLQuery = '('.$query.')';
+ }
+ }
+ #
+ # &Apache::lonnet::logthis("SQLQuery = $SQLQuery");
+ #
+ return undef,$SQLQuery;
+}
######################################################################
######################################################################
=pod
-=item &related_version
+=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
@@ -1513,45 +1761,15 @@ Note: Using this twice on a string is pr
######################################################################
######################################################################
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));
+ my ($word) = @_;
+ return (undef) if (lc($word) =~ /\b(or|and|not)\b/);
+ my @Words = &Apache::loncommon::get_related_words($word);
+ # Only use 4 related words
+ @Words = ($#Words>4? @Words[0..4] : @Words);
+ my $result = join " OR ", ($word,@Words);
+ return $result,sort(@Words);
}
-######################################################################
-######################################################################
-
-=pod
-
-=item &build_SQL_query()
-
-Builds a SQL query string from a logical expression with AND/OR keywords
-using Text::Query and &recursive_SQL_query_builder()
-
-=cut
-
-######################################################################
-######################################################################
-sub build_SQL_query {
- my ($field_name,$logic_statement)=@_;
- my $q=new Text::Query('abc',
- -parse => 'Text::Query::ParseAdvanced',
- -build => 'Text::Query::Build');
- $q->prepare($logic_statement);
- my $matchexp=${$q}{'matchexp'}; chomp $matchexp;
- my $sql_query=&recursive_SQL_query_build($field_name,$matchexp);
- return $sql_query;
-}
######################################################################
######################################################################
@@ -1586,47 +1804,6 @@ sub build_custommetadata_query {
return $matchexp;
}
-######################################################################
-######################################################################
-
-=pod
-
-=item &recursive_SQL_query_build()
-
-Recursively constructs an SQL query. Takes as input $dkey and $pattern.
-
-=cut
-
-######################################################################
-######################################################################
-sub recursive_SQL_query_build {
- my ($dkey,$pattern)=@_;
- 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 (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);
- }
- &recursive_SQL_query_build($dkey,$pattern);
-}
######################################################################
######################################################################
@@ -1643,51 +1820,73 @@ Also reports errors (check for /^Incorre
######################################################################
######################################################################
sub build_date_queries {
- my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2,
- $lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_;
- my @queries;
- if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) {
- unless ($cmonth1 and $cday1 and $cyear1 and
- $cmonth2 and $cday2 and $cyear2) {
- return "Incorrect entry for the creation date. You must specify ".
- "a starting month, day, and year and an ending month, ".
- "day, and year.";
- }
- my $cnumeric1=sprintf("%d%2d%2d",$cyear1,$cmonth1,$cday1);
- $cnumeric1+=0;
- my $cnumeric2=sprintf("%d%2d%2d",$cyear2,$cmonth2,$cday2);
- $cnumeric2+=0;
- if ($cnumeric1>$cnumeric2) {
- return "Incorrect entry for the creation date. The starting ".
- "date must occur before the ending date.";
- }
- my $cquery="(creationdate BETWEEN '$cyear1-$cmonth1-$cday1' AND '".
- "$cyear2-$cmonth2-$cday2 23:59:59')";
- push @queries,$cquery;
- }
- if ($lmonth1 or $lday1 or $lyear1 or $lmonth2 or $lday2 or $lyear2) {
- unless ($lmonth1 and $lday1 and $lyear1 and
- $lmonth2 and $lday2 and $lyear2) {
- return "Incorrect entry for the last revision date. You must ".
- "specify a starting month, day, and year and an ending ".
- "month, day, and year.";
- }
- my $lnumeric1=sprintf("%d%2d%2d",$lyear1,$lmonth1,$lday1);
- $lnumeric1+=0;
- my $lnumeric2=sprintf("%d%2d%2d",$lyear2,$lmonth2,$lday2);
- $lnumeric2+=0;
- if ($lnumeric1>$lnumeric2) {
- return "Incorrect entry for the last revision date. The ".
- "starting date must occur before the ending date.";
- }
- my $lquery="(lastrevisiondate BETWEEN '$lyear1-$lmonth1-$lday1' AND '".
- "$lyear2-$lmonth2-$lday2 23:59:59')";
- push @queries,$lquery;
+ my ($cafter,$cbefore,$mafter,$mbefore) = @_;
+ my ($result,$error,$pretty_string);
+ #
+ # Verify the input
+ if (! defined($cafter) && ! defined($cbefore) &&
+ ! defined($mafter) && ! defined($mbefore)) {
+ # This is an okay situation, so return undef for the error
+ return (undef,undef,undef);
+ }
+ if ((defined($cafter) && ! defined($cbefore)) ||
+ (defined($cbefore) && ! defined($cafter))) {
+ # This is bad, so let them know
+ $error = &mt('Incorrect entry for the creation date. '.
+ 'You must specify both the beginning and ending dates.');
+ }
+ if (! defined($error) &&
+ ((defined($mafter) && ! defined($mbefore)) ||
+ (defined($mbefore) && ! defined($mafter)))) {
+ # This is also bad, so let them know
+ $error = &mt('Incorrect entry for the last revision date. '.
+ 'You must specify both the beginning and ending dates.');
}
- if (@queries) {
- return join(" AND ",@queries);
+ if (! defined($error)) {
+ #
+ # Build the queries
+ my @queries;
+ if (defined($cbefore) && defined($cafter)) {
+ my (undef,undef,undef,$caday,$camon,$cayear) = localtime($cafter);
+ my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore);
+ # Correct for year being relative to 1900
+ $cayear+=1900; $cbyear+=1900;
+ my $cquery=
+ '(creationdate BETWEEN '.
+ "'".$cayear.'-'.$camon.'-'.$caday."'".
+ ' AND '.
+ "'".$cbyear.'-'.$cbmon.'-'.$cbday." 23:59:59')";
+ $pretty_string .= '<br />' if (defined($pretty_string));
+ $pretty_string .=
+ &mt('created between [_1] and [_2]',
+ &Apache::lonlocal::locallocaltime($cafter),
+ &Apache::lonlocal::locallocaltime($cbefore+24*60*60-1));
+ push(@queries,$cquery);
+ $pretty_string =~ s/ 00:00:00//g;
+ }
+ if (defined($mbefore) && defined($mafter)) {
+ my (undef,undef,undef,$maday,$mamon,$mayear) = localtime($mafter);
+ my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore);
+ # Correct for year being relative to 1900
+ $mayear+=1900; $mbyear+=1900;
+ my $mquery=
+ '(lastrevisiondate BETWEEN '.
+ "'".$mayear.'-'.$mamon.'-'.$maday."'".
+ ' AND '.
+ "'".$mbyear.'-'.$mbmon.'-'.$mbday." 23:59:59')";
+ push(@queries,$mquery);
+ $pretty_string .= '<br />' if (defined($pretty_string));
+ $pretty_string .=
+ &mt('last revised between [_1] and [_2]',
+ &Apache::lonlocal::locallocaltime($mafter),
+ &Apache::lonlocal::locallocaltime($mbefore+24*60*60-1));
+ $pretty_string =~ s/ 00:00:00//g;
+ }
+ if (@queries) {
+ $result .= join(" AND ",@queries);
+ }
}
- return '';
+ return ($result,$error,$pretty_string);
}
######################################################################
@@ -1697,6 +1896,11 @@ sub build_date_queries {
=item ©right_check()
+Inputs: $Metadata, a hash pointer of metadata for a resource.
+
+Returns: 1 if the resource is available to the user making the query,
+ 0 otherwise.
+
=cut
######################################################################
@@ -1708,25 +1912,28 @@ sub copyright_check {
$Metadata->{'url'});
# Check for priv
if (($Metadata->{'copyright'} eq 'priv') &&
- (($ENV{'user.name'} ne $resname) &&
- ($ENV{'user.domain'} ne $resdom))) {
+ (($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)) {
+ ($env{'user.domain'} ne $resdom)) {
return 0;
}
+ # Check for custom rights
+ if ($Metadata->{'copyright'} eq 'custom') {
+ return &Apache::lonnet::customaccess('bre',$Metadata->{'url'});
+ }
return 1;
}
-
######################################################################
######################################################################
=pod
-=item &ensure_db_and_table
+=item &ensure_db_and_table()
Ensure we can get lonmysql to connect to the database and the table we
need exists.
@@ -1745,9 +1952,15 @@ sub ensure_db_and_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>");
+ $r->print(&Apache::loncommon::start_page('Error')
+ .'<p class="LC_error">'
+ .&mt('Unable to retrieve search results. '
+ .'Unable to determine the table results were saved in.')
+ .'</p>'
+ . '<p>'.&mt('Internal info:').'</p>'
+ .'<pre>'.$table.'</pre>'
+ .&Apache::loncommon::end_page()
+ );
return undef;
}
##
@@ -1755,8 +1968,12 @@ sub ensure_db_and_table {
##
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>");
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('Unable to connect to the MySQL database where your results are saved.')
+ .'</p>'
+ .&Apache::loncommon::end_page()
+ );
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
" connect to database.");
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
@@ -1764,12 +1981,20 @@ sub ensure_db_and_table {
}
my $table_check = &Apache::lonmysql::check_table($table);
if (! defined($table_check)) {
- $r->print("A MySQL error has occurred.</form></body></html>");
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('A MySQL error has occurred.')
+ .'</p></form>'
+ .&Apache::loncommon::end_page());
&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.");
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('The table of results could not be found.')
+ .'</p>'
+ );
&Apache::lonnet::logthis("The user requested a table, ".$table.
", that could not be found.");
return undef;
@@ -1782,7 +2007,10 @@ sub ensure_db_and_table {
=pod
-=item &print_sort_form
+=item &print_sort_form()
+
+The sort feature is not implemented at this time. This form just prints
+a link to change the search query.
=cut
@@ -1790,7 +2018,7 @@ sub ensure_db_and_table {
######################################################################
sub print_sort_form {
my ($r,$pretty_query_string) = @_;
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+
##
my %SortableFields=&Apache::lonlocal::texthash(
id => 'Default',
@@ -1808,62 +2036,65 @@ sub print_sort_form {
lastrevisiondate => 'Revision Date'
);
##
- my $table = $ENV{'form.table'};
+ 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>");
+ $r->print("A MySQL error has occurred.</form>".
+ &Apache::loncommon::end_page());
&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>
+ my $js =<<END;
+<script type="text/javascript">
+// <![CDATA[
function change_sort() {
var newloc = "/adm/searchcat?phase=results";
- newloc += "&persistent_db_id=$ENV{'form.persistent_db_id'}";
+ 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
+
+ my $start_page = &Apache::loncommon::start_page('Results',$js);
+ my $breadcrumbs=
+ &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+ $env{'form.catalogmode'} ne 'import');
+
+ my $result = <<END;
+$start_page
+$breadcrumbs
+<form name="statusform" action="" method="post" target="_top">
+<input type="hidden" name="catalogmode" value="import" />
+<input type="hidden" name="acts" 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'}));
+# $env{'form.sortby'} = 'id' if (! defined($env{'form.sortby'}));
# foreach (keys(%SortableFields)) {
# $result.="<option name=\"$_\"";
-# if ($_ eq $ENV{'form.sortby'}) {
+# 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);
+ $result.='<p>'
+ .&mt('Total of [quant,_1,match,matches] to your query.',$total_results)
+ .' '.$revise.'</p>'
+ .'<p>'.&mt('Search: ').$pretty_query_string
+ .'</p></form>';
+ $r->print($result.&Apache::loncommon::end_page());
return;
}
@@ -1883,35 +2114,11 @@ the following format:
#####################################################################
#####################################################################
-
-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'},
- #--------------------------------------------------
- { name => 'creationdate', type=>'DATETIME'},
- { name => 'lastrevisiondate', type=>'DATETIME'},
- #--------------------------------------------------
- );
-
-my @Fullindicies =
- qw/title/;
-# qw/title author subject abstract mime language owner copyright/;
+#
+# These should probably be scoped but I don't have time right now...
+#
+my @Datatypes;
+my @Fullindicies;
######################################################################
######################################################################
@@ -1921,9 +2128,9 @@ my @Fullindicies =
=item &create_results_table()
Creates the table of search results by calling lonmysql. Stores the
-table id in $ENV{'form.table'}
+table id in $env{'form.table'}
-Inputs: none.
+Inputs: search area - either res or portfolio
Returns: the identifier of the table on success, undef on error.
@@ -1931,13 +2138,34 @@ Returns: the identifier of the table on
######################################################################
######################################################################
+sub set_up_table_structure {
+ my ($tabletype) = @_;
+ my ($datatypes,$fullindicies) =
+ &LONCAPA::lonmetadata::describe_metadata_storage($tabletype);
+ # Copy the table description before modifying it...
+ @Datatypes = @{$datatypes};
+ unshift(@Datatypes,{name => 'id',
+ type => 'MEDIUMINT',
+ restrictions => 'UNSIGNED NOT NULL',
+ primary_key => 'yes',
+ auto_inc => 'yes' });
+ @Fullindicies = @{$fullindicies};
+ return;
+}
+
sub create_results_table {
+ my ($area) = @_;
+ if ($area eq 'portfolio') {
+ &set_up_table_structure('portfolio_search');
+ } else {
+ &set_up_table_structure('metadata');
+ }
my $table = &Apache::lonmysql::create_table
( { columns => \@Datatypes,
FULLTEXT => [{'columns' => \@Fullindicies},],
} );
if (defined($table)) {
- $ENV{'form.table'} = $table;
+ $env{'form.table'} = $table;
return $table;
}
return undef; # Error...
@@ -1975,25 +2203,67 @@ Returns: Nothing.
sub update_count_status {
my ($r,$text) = @_;
$text =~ s/\'/\\\'/g;
- $r->print
- ("<script>document.statusform.count.value = ' $text'</script>\n");
+ $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.count.value = ' $text'
+// ]]>
+</script>
+SCRIPT
+
$r->rflush();
}
sub update_status {
my ($r,$text) = @_;
$text =~ s/\'/\\\'/g;
- $r->print
- ("<script>document.statusform.status.value = ' $text'</script>\n");
+ $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.status.value = ' $text'
+// ]]>
+</script>
+SCRIPT
+
$r->rflush();
}
+{
+ my $max_time = 300; # seconds for the search to complete
+ my $start_time = 0;
+ my $last_time = 0;
+
+sub reset_timing {
+ $start_time = 0;
+ $last_time = 0;
+}
+
+sub time_left {
+ if ($start_time == 0) {
+ $start_time = time;
+ }
+ my $time_left = $max_time - (time - $start_time);
+ $time_left = 0 if ($time_left < 0);
+ return $time_left;
+}
+
sub update_seconds {
- my ($r,$text) = @_;
- $text =~ s/\'/\\\'/g;
- $r->print
- ("<script>document.statusform.seconds.value = ' $text'</script>\n");
- $r->rflush();
+ my ($r) = @_;
+ my $time = &time_left();
+ if (($last_time-$time) > 0) {
+ $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.seconds.value = '$time'
+// ]]>
+</script>
+SCRIPT
+
+ $r->rflush();
+ }
+ $last_time = $time;
+}
+
}
######################################################################
@@ -2001,7 +2271,7 @@ sub update_seconds {
=pod
-=item &revise_button
+=item &revise_button()
Inputs: None
@@ -2012,14 +2282,15 @@ Returns: html string for a 'revise searc
######################################################################
######################################################################
sub revise_button {
+ my $revisetext = &mt('Revise search');
my $revise_phase = 'disp_basic';
- $revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced');
+ $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';" /> };
+ '?persistent_db_id='.$env{'form.persistent_db_id'}.
+ '&cleargroupsort=1'.
+ '&phase='.$revise_phase;
+ my $result = qq{<input type="button" value="$revisetext" name="revise"} .
+ qq{ onclick="parent.location='$newloc';" /> };
return $result;
}
@@ -2028,107 +2299,152 @@ sub revise_button {
=pod
-=item &run_search
+=item &run_search()
+
+Executes a search query by sending it the the other servers and putting the
+results into MySQL.
=cut
######################################################################
######################################################################
sub run_search {
- my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+ my ($r,$query,$customquery,$customshow,$serverlist,
+ $pretty_string,$area,$domainsref) = @_;
+ my $tabletype = 'metadata';
+ if ($area eq 'portfolio') {
+ $tabletype = 'portfolio_search';
+ }
my $connection = $r->connection;
#
- # Timing variables
- #
- my $starttime = time;
- my $max_time = 30; # seconds for the search to complete
- #
# Print run_search header
#
+ my $start_page = &Apache::loncommon::start_page('Search Status',undef);
+ my $breadcrumbs =
+ &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+ $env{'form.catalogmode'} ne 'import');
$r->print(<<END);
-<html>
-<head><title>Search Status</title></head>
-$bodytag
-<form name="statusform" action="" method="post">
-<input type="hidden" name="Queue" value="" />
+$start_page
+$breadcrumbs
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;
+ # Remove leading and trailing <br />
+ $pretty_string =~ s:^\s*<br />::i;
+ $pretty_string =~ s:(<br />)*\s*$::im;
+ my @Lines = split("<br />",$pretty_string);
+ # I keep getting blank items at the end of the list, hence the following:
+ while ($Lines[-1] =~ /^\s*$/ && @Lines) {
+ pop(@Lines);
+ }
if (@Lines > 2) {
- $pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
+ $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
}
- $r->print(&mt("Search").": ".$pretty_string);
+ $r->print(&mt("Search: [_1]",$pretty_string));
$r->rflush();
#
# Determine the servers we need to contact.
- #
- my @Servers_to_contact;
+ my (@Servers_to_contact,%domains_by_server);
if (defined($serverlist)) {
if (ref($serverlist) eq 'ARRAY') {
@Servers_to_contact = @$serverlist;
} else {
@Servers_to_contact = ($serverlist);
}
+ if (ref($domainsref) eq 'HASH') {
+ foreach my $server (@Servers_to_contact) {
+ $domains_by_server{$server} = $domainsref->{$server};
+ }
+ }
} else {
- @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
+ my %library_servers = &Apache::lonnet::unique_library();
+ my (%all_library_servers, %older_library_servers);
+ foreach my $key (keys(%library_servers)) {
+ if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
+ my $major = $1;
+ my $minor = $2;
+ if (($major < 2) || (($major == 2) && ($minor < 11))) {
+ map { $older_library_servers{$_} = 1; }
+ &Apache::lonnet::machine_ids($library_servers{$key});
+ }
+ }
+ }
+ %all_library_servers = (%library_servers,%older_library_servers);
+ @Servers_to_contact = sort(keys(%all_library_servers));
+ foreach my $server (@Servers_to_contact) {
+ my %possdoms;
+ map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server});
+ $domains_by_server{$server} =
+ join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
+ }
}
my %Server_status;
- my $table =$ENV{'form.table'};
+ #
+ # Check on the mysql table we will use to store results.
+ my $table =$env{'form.table'};
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>");
+ $r->print("Unable to determine table id to save search results in.".
+ "The search has been aborted.".
+ &Apache::loncommon::end_page());
return;
}
my $table_status = &Apache::lonmysql::check_table($table);
if (! defined($table_status)) {
- $r->print("Unable to determine status of table.</body></html>");
+ $r->print("Unable to determine status of table.".
+ &Apache::loncommon::end_page());
&Apache::lonnet::logthis("Bogus table id of $table for ".
- "$ENV{'user.name'} @ $ENV{'user.domain'}");
+ "$env{'user.name'} @ $env{'user.domain'}");
&Apache::lonnet::logthis("lonmysql error = ".
&Apache::lonmysql::get_error());
return;
}
if (! $table_status) {
+ &Apache::lonnet::logthis("lonmysql error = ".
+ &Apache::lonmysql::get_error());
+ &Apache::lonnet::logthis("lonmysql debug = ".
+ &Apache::lonmysql::get_debug());
+ &Apache::lonnet::logthis('table status = "'.$table_status.'"');
$r->print("The table id,$table, we tried to use is invalid.".
- "The search has been aborted.</body></html>");
+ "The search has been aborted.".
+ &Apache::loncommon::end_page());
return;
}
##
## Prepare for the big loop.
- ##
my $hitcountsum;
+ my %matches;
my $server;
my $status;
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->print('<form name="statusform" action="" method="post">'."\n".
+ '<input type="hidden" name="acts" value="" />'."\n".
+ '<table border="0"><tr><td>'."\n".
+ &Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Status').'</th>'
+ .'<th>'.&mt('Total Matches').'</th>'
+ .'<th>'.&mt('Time Remaining').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ .&Apache::loncommon::start_data_table_row()
+ .'<td><input type="text" name="status" value="" size="50" readonly="readonly" /></td>'
+ .'<td><input type="text" name="count" value="" size="10" readonly="readonly" /></td>'
+ .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+ .&Apache::loncommon::end_data_table_row()
+ .&Apache::loncommon::end_data_table()
+ .'</td><td> </td><td>'.$revise.'</td></tr></table></form>');
$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) &&
+ &reset_timing();
+ &update_seconds($r);
+ &update_status($r,&mt('contacting [_1]',$Servers_to_contact[0]));
+ while (&time_left() &&
((@Servers_to_contact) || keys(%Server_status))) {
- # Send out a search request if it needs to be done.
+ &update_seconds($r);
+ #
+ # Send out a search request
if (@Servers_to_contact) {
# Contact one server
my $server = shift(@Servers_to_contact);
- &update_status($r,&mt('contacting').' '.$server);
+ &update_status($r,&mt('contacting [_1]',$server));
my $reply=&Apache::lonnet::metadata_query($query,$customquery,
- $customshow,[$server]);
+ $customshow,[$server],\%domains_by_server);
($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};
} else {
@@ -2138,29 +2454,33 @@ END
# left to contact.
if (scalar (keys(%Server_status))) {
&update_status($r,
- &mt('waiting on').' '.(join(' ',keys(%Server_status))));
+ &mt('waiting on [_1]',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)) {
+ foreach my $server (keys(%Server_status)) {
last if ($connection->aborted());
+ &update_seconds($r);
+ my $status = $Server_status{$server};
if ($status eq 'con_lost') {
delete ($Server_status{$server});
next;
}
- $status=~/^([\.\w]+)$/;
- my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
+ $status=~s|/||g;
+
+
+
+ my $datafile=LONCAPA::tempdir().$status;
if (-e $datafile && ! -e "$datafile.end") {
- &update_status($r,&mt('Receiving results from').' '.$server);
+ &update_status($r,&mt('Receiving results from [_1]',$server));
next;
}
last if ($connection->aborted());
if (-e "$datafile.end") {
- &update_status($r,&mt('Reading results from').' '.$server);
+ &update_status($r,&mt('Reading results from [_1]',$server));
if (-z "$datafile") {
delete($Server_status{$server});
next;
@@ -2175,29 +2495,37 @@ END
# Read in the whole file.
while (my $result = <$fh>) {
last if ($connection->aborted());
- # handle custom fields? Someday we will!
+ #
+ # Records are stored one per line
chomp($result);
- next unless $result;
+ next if (! $result);
+ #
# Parse the result.
- my %Fields = &parse_raw_result($result,$server);
+ my %Fields = &parse_raw_result($result,$server,$tabletype);
$Fields{'hostname'} = $server;
+ #
+ # Skip based on copyright
next if (! ©right_check(\%Fields));
+
+ if ($area eq 'portfolio') {
+ next if (defined($matches{$Fields{'url'}}));
+ # Skip if inaccessible
+ next if (!&Apache::lonnet::portfolio_access($Fields{'url'}));
+ $matches{$Fields{'url'}} = 1;
+ }
+ #
# 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 ++;
- $time_remaining = $max_time - (time - $starttime) ;
- if ($last_time - $time_remaining > 0) {
- &update_seconds($r,$time_remaining);
- $last_time = $time_remaining;
- }
+ &update_seconds($r);
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.
@@ -2207,35 +2535,35 @@ END
&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_seconds($r);
}
- &update_status($r,&mt('Search Complete').$server);
- &update_seconds($r,0);
- &Apache::lonmysql::disconnect_from_db();
+ &update_status($r,&mt('Search Complete on Server [_1]',$server));
+ &update_seconds($r);
+ #
+ &Apache::lonmysql::disconnect_from_db(); # This is unneccessary
+ #
# We have run out of time or run out of servers to talk to and
- # results to get.
- $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>");
- }
+ # results to get, so let the client know the top frame needs to be
+ # loaded from /adm/searchcat
+ $r->print(&Apache::loncommon::end_page());
+# if ($env{'form.catalogmode'} ne 'import') {
+ $r->print(<<SCRIPT);
+<script>
+window.location='/adm/searchcat?phase=sort&persistent_db_id=$env{'form.persistent_db_id'}';
+</script>
+SCRIPT
+# }
return;
}
######################################################################
######################################################################
+
=pod
-=item &prev_next_buttons
+=item &prev_next_buttons()
+
+Returns html for the previous and next buttons on the search results page.
=cut
@@ -2244,91 +2572,82 @@ END
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 = 1 if $prev_min < 1;
- 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;
+ #
+ # Create buttons
+ return '<p class="LC_nobreak">'
+ .'<input type="submit" name="prev" value="<"'
+ .' title="'.&mt('Previous').'" />'
+ .' '
+ .'<input type="submit" name="reload" value="'.&mt('Reload').'" />'
+ .' '
+ .'<input type="submit" name="next" value=">"'
+ .' title="'.&mt('Next').'" />'
+ .'</p>';
}
+
######################################################################
######################################################################
=pod
-=item &display_results
+=item &display_results()
+
+Prints the results out for selection and perusal.
=cut
######################################################################
######################################################################
sub display_results {
- my ($r,$importbutton,$closebutton,$diropendb) = @_;
+ my ($r,$importbutton,$closebutton,$diropendb,$area) = @_;
my $connection = $r->connection;
$r->print(&search_results_header($importbutton,$closebutton));
##
## Set viewing function
##
- my $viewfunction = $Views{$ENV{'form.viewselect'}};
+ my $viewfunction = $Views{$env{'form.viewselect'}};
if (!defined($viewfunction)) {
- $r->print("Internal Error - Bad view selected.\n");
+ $r->print('<p class="LC_error">'
+ .&mt('Internal Error - Bad view selected.')
+ .'</p>'."\n");
$r->rflush();
return;
}
##
## $checkbox_num is a count of the number of checkboxes output on the
- ## page this is used only during catalogmode=groupsearch.
+ ## page this is used only during catalogmode=import.
my $checkbox_num = 0;
##
## Get the catalog controls setup
##
my $action = "/adm/searchcat?phase=results";
##
- ## Deal with groupsearch
- ##
- if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ ## Deal with import by opening the import db file.
+ if ($env{'form.catalogmode'} eq 'import') {
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
&GDBM_WRCREAT(),0640)) {
- $r->print('Unable to store import results.</form></body></html>');
+ $r->print('<p class="LC_error">'.
+ &mt('Unable to save import results.').
+ '</p>'.
+ '</form>'.
+ &Apache::loncommon::end_page());
$r->rflush();
return;
}
}
##
## Prepare the table for querying
- ##
- my $table = $ENV{'form.table'};
+ 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>");
+ $r->print('<p class="LC_error">'.
+ &mt('A MySQL error has occurred.').
+ '</p>'.
+ '</form>'.
+ &Apache::loncommon::end_page());
&Apache::lonnet::logthis("lonmysql was unable to determine the number".
" of rows in table ".$table);
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
@@ -2336,74 +2655,204 @@ sub display_results {
}
##
## Determine how many results we need to get
- ##
- $ENV{'form.start'} = 1 if (! exists($ENV{'form.start'}));
- $ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'}));
- my $min = $ENV{'form.start'};
+ $env{'form.start'} = 1 if (! exists($env{'form.start'}));
+ $env{'form.show'} = 20 if (! exists($env{'form.show'}));
+ if (exists($env{'form.prev'})) {
+ $env{'form.start'} -= $env{'form.show'};
+ } elsif (exists($env{'form.next'})) {
+ $env{'form.start'} += $env{'form.show'};
+ }
+ $env{'form.start'} = 1 if ($env{'form.start'}<1);
+ $env{'form.start'} = $total_results if ($env{'form.start'}>$total_results);
+ my $min = $env{'form.start'};
my $max;
- if ($ENV{'form.show'} eq 'all') {
+ if ($env{'form.show'} eq 'all') {
$max = $total_results ;
} else {
- $max = $min + $ENV{'form.show'} - 1;
+ $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>'.
- &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"
- );
+ ## Output form elements
+ $r->print(&hidden_field('table').
+ &hidden_field('phase').
+ &hidden_field('persistent_db_id').
+ &hidden_field('start').
+ &hidden_field('area')
+ );
+ #
+ # Build sorting selector
+ my @fields =
+ (
+ {key=>'default' },
+ {key=>'title' },
+ {key =>'author' },
+ {key =>'subject'},
+ {key =>'url',desc=>'URL'},
+ {key =>'keywords'},
+ {key =>'language'},
+ {key =>'creationdate'},
+ {key =>'lastrevisiondate'},
+ {key =>'owner'},
+ {key =>'copyright'},
+ {key =>'authorspace'},
+ {key =>'lowestgradelevel'},
+ {key =>'highestgradelevel'},
+ {key =>'standards',desc=>'Standards'},
+ );
+ if ($area eq 'portfolio') {
+ push(@fields,
+ (
+ {key => 'scope'},
+ {key => 'keynum'},
+ ));
+ } else {
+ push(@fields,
+ (
+ {key =>'count',desc=>'Number of accesses'},
+ {key =>'stdno',desc=>'Students Attempting'},
+ {key =>'avetries',desc=>'Average Number of Tries'},
+ {key =>'difficulty',desc=>'Mean Degree of Difficulty'},
+ {key =>'disc',desc=>'Mean Degree of Discrimination'},
+ {key =>'clear',desc=>'Evaluation: Clear'},
+ {key =>'technical',desc=>'Evaluation: Technically Correct'},
+ {key =>'correct',desc=>'Evaluation: Material is Correct'},
+ {key =>'helpful',desc=>'Evaluation: Material is Helpful'},
+ {key =>'depth',desc=>'Evaluation: Material has Depth'},
+ ));
+ }
+ my %fieldnames = &Apache::lonmeta::fieldnames();
+ my @field_order;
+ foreach my $field_data (@fields) {
+ push(@field_order,$field_data->{'key'});
+ if (! exists($field_data->{'desc'})) {
+ $field_data->{'desc'}=$fieldnames{$field_data->{'key'}};
+ } else {
+ if (! defined($field_data->{'desc'})) {
+ $field_data->{'desc'} = ucfirst($field_data->{'key'});
+ }
+ $field_data->{'desc'} = &mt($field_data->{'desc'});
+ }
+ }
+ my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields;
+ $sort_fields{'select_form_order'} = \@field_order;
+ $env{'form.sortorder'} = 'desc' if (! exists($env{'form.sortorder'}));
+ if (! exists($env{'form.sortfield'})) {
+ if ($area eq 'portfolio') {
+ $env{'form.sortfield'} = 'owner';
+ } else {
+ $env{'form.sortfield'} = 'count';
+ }
+ }
+ if (! exists($env{'form.sortorder'})) {
+ if ($env{'form.sortfield'}=~/^(count|stdno|disc|clear|technical|correct|helpful)$/) {
+ $env{'form.sortorder'}='desc';
+ } else {
+ $env{'form.sortorder'}='asc';
+ }
+ }
+ my $sortform = '<span class="LC_nobreak">'
+ .&mt('Sort by:').' '
+ .&Apache::loncommon::select_form($env{'form.sortfield'},
+ 'sortfield',
+ \%sort_fields)
+ .' '
+ .&Apache::loncommon::select_form($env{'form.sortorder'},
+ 'sortorder',
+ {asc =>&mt('Ascending'),
+ desc=>&mt('Descending')
+ })
+ .'</span>';
+ ##
+ ## Display links for 'prev' and 'next' pages (if necessary) and Display Options
+ $r->print('<fieldset>'."\n"
+ .'<legend>'.&mt('Display Options').'</legend>'."\n"
+ .$sortform
+ .' '
+ .&viewoptions()
+ .'</fieldset>'
+ .&prev_next_buttons($min,$env{'form.show'},$total_results)
+ );
+
if ($total_results == 0) {
- $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
- '<h3>'.&mt('There are currently no results').'.</h3>'.
- "</form></body></html>");
+ $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2" />'.
+ '<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
+ "</form>".
+ &Apache::loncommon::end_page());
return;
} else {
- $r->print
- ("<center>Results $min to $max out of $total_results</center>\n");
+ $r->print('<div>'.
+ mt('Results [_1] to [_2] out of [_3]',
+ $min,$max,$total_results).
+ "</div>\n");
}
##
## Get results from MySQL table
- ##
- my @Results = &Apache::lonmysql::get_rows($table,
- 'id>='.$min.' AND id<='.$max);
+ my $sort_command = 'id>='.$min.' AND id<='.$max;
+ my $order;
+ if (exists($env{'form.sortorder'})) {
+ if ($env{'form.sortorder'} eq 'asc') {
+ $order = 'ASC';
+ } elsif ($env{'form.sortorder'} eq 'desc') {
+ $order = 'DESC';
+ } else {
+ $order = '';
+ }
+ } else {
+ $order = '';
+ }
+ if ($env{'form.sortfield'} ne 'default' &&
+ exists($sort_fields{$env{'form.sortfield'}})) {
+ $sort_command = $env{'form.sortfield'}.' IS NOT NULL '.
+ 'ORDER BY '.$env{'form.sortfield'}.' '.$order.
+ ' LIMIT '.($min-1).','.($max-$min+1);
+ }
+ my @Results = &Apache::lonmysql::get_rows($table,$sort_command);
##
## Loop through the results and output them.
- ##
+ my $tabletype = 'metadata';
+ if ($area eq 'portfolio') {
+ $tabletype = 'portfolio_search';
+ }
+ $r->print(&Apache::loncommon::start_data_table());
foreach my $row (@Results) {
if ($connection->aborted()) {
&cleanup();
return;
}
- my %Fields = %{&parse_row(@$row)};
- my $output="<p>\n";
+ my %Fields = %{&parse_row($tabletype,@$row)};
+ my $output;
+ if (! defined($Fields{'title'}) || $Fields{'title'} eq '') {
+ $Fields{'title'} = 'Untitled';
+ }
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
$Fields{'id'},$checkbox_num++);
# Render the result into html
$output.= &$viewfunction($prefix,%Fields);
# Print them out as they come in.
- $r->print($output);
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td>'
+ .$output
+ .'</td>'
+ .&Apache::loncommon::end_data_table_row()
+ );
$r->rflush();
}
+ $r->print(&Apache::loncommon::end_data_table());
if (@Results < 1) {
- $r->print(&mt("There were no results matching your query"));
+ $r->print('<p class="LC_info">'
+ .&mt('There were no results matching your query.')
+ .'</p>');
} 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(
+ &prev_next_buttons($min,$env{'form.show'},$total_results,
+ "table=".$env{'form.table'}.
+ "&phase=results".
+ "&persistent_db_id=".
+ $env{'form.persistent_db_id'})
+ );
}
- $r->print("</form></body></html>");
+ $r->print("</form>".&Apache::loncommon::end_page());
$r->rflush();
untie %groupsearch_db if (tied(%groupsearch_db));
return;
@@ -2417,7 +2866,7 @@ sub display_results {
=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.
+$env{'form.catalogmode'}. Stores data in %groupsearch_db.
=cut
@@ -2426,22 +2875,22 @@ $ENV{'form.catalogmode'}. Stores data i
sub catalogmode_output {
my $output = '';
my ($title,$url,$fnum,$checkbox_num) = @_;
- if ($ENV{'form.catalogmode'} eq 'interactive') {
+ if ($env{'form.catalogmode'} eq 'interactive') {
$title=~ s/\'/\\\'/g;
- if ($ENV{'form.catalogmode'} eq 'interactive') {
+ if ($env{'form.catalogmode'} eq 'interactive') {
$output.=<<END
-<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
-onClick="javascript:select_data('$title','$url')">
+<font size='-1'><input type="button" name="returnvalues" value="select"
+onclick="javascript:select_data('$title','$url')" />
</font>
END
}
- } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ } elsif ($env{'form.catalogmode'} eq 'import') {
$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($checkbox_num,$fnum)" />
+<input type="checkbox" name="returnvalues" value="select"
+onclick="javascript:queue($checkbox_num,$fnum)" />
</font>
END
}
@@ -2452,7 +2901,7 @@ END
=pod
-=item &parse_row
+=item &parse_row()
Parse a row returned from the database.
@@ -2461,13 +2910,16 @@ Parse a row returned from the database.
######################################################################
######################################################################
sub parse_row {
- my @Row = @_;
+ my ($tabletype,@Row) = @_;
my %Fields;
+ if (! scalar(@Datatypes)) {
+ &set_up_table_structure($tabletype);
+ }
for (my $i=0;$i<=$#Row;$i++) {
- $Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
+ $Fields{$Datatypes[$i]->{'name'}}=&unescape($Row[$i]);
}
$Fields{'language'} =
- &Apache::loncommon::languagedescription($Fields{'lang'});
+ &Apache::loncommon::languagedescription($Fields{'language'});
$Fields{'copyrighttag'} =
&Apache::loncommon::copyrightdescription($Fields{'copyright'});
$Fields{'mimetag'} =
@@ -2483,13 +2935,10 @@ sub parse_row {
=item &parse_raw_result()
Takes a line from the file of results and parse it. Returns a hash
-with keys for the following fields:
-'title', 'author', 'subject', 'url', 'keywords', 'version', 'notes',
-'abstract', 'mime', 'lang', 'owner', 'copyright', 'creationdate',
-'lastrevisiondate'.
+with keys according to column labels
In addition, the following tags are set by calling the appropriate
-lonnet function: 'language', 'cprtag', 'mimetag'.
+lonnet function: 'language', 'copyrighttag', 'mimetag'.
The 'title' field is set to "Untitled" if the title field is blank.
@@ -2500,64 +2949,13 @@ The 'title' field is set to "Untitled" i
###########################################################
###########################################################
sub parse_raw_result {
- my ($result,$hostname) = @_;
- # Check for a comma - if it is there then we do not need to unescape the
- # string. There seems to be some kind of problem with some items in
- # the database - the entire string gets sent out unescaped...?
- unless ($result =~ /,/) {
- $result = &Apache::lonnet::unescape($result);
- }
- my @fields=map {
- &Apache::lonnet::unescape($_);
- } (split(/\,/,$result));
- my ($title,$author,$subject,$url,$keywords,$version,
- $notes,$abstract,$mime,$lang,
- $creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
- my %Fields =
- ( title => &Apache::lonnet::unescape($title),
- author => &Apache::lonnet::unescape($author),
- subject => &Apache::lonnet::unescape($subject),
- url => &Apache::lonnet::unescape($url),
- keywords => &Apache::lonnet::unescape($keywords),
- version => &Apache::lonnet::unescape($version),
- notes => &Apache::lonnet::unescape($notes),
- abstract => &Apache::lonnet::unescape($abstract),
- mime => &Apache::lonnet::unescape($mime),
- lang => &Apache::lonnet::unescape($lang),
- owner => &Apache::lonnet::unescape($owner),
- copyright => &Apache::lonnet::unescape($copyright),
- creationdate => &Apache::lonnet::unescape($creationdate),
- lastrevisiondate => &Apache::lonnet::unescape($lastrevisiondate)
- );
- $Fields{'language'} =
- &Apache::loncommon::languagedescription($Fields{'lang'});
- $Fields{'copyrighttag'} =
- &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 -';
- $Fields{'subject'} = '- not displayed -';
- }
- if (length($Fields{'abstract'})>200) {
- $Fields{'abstract'} =
- substr($Fields{'abstract'},0,200).'...';
- }
- if (length($Fields{'keywords'})>200) {
- $Fields{'keywords'} =
- substr($Fields{'keywords'},0,200).'...';
- }
+ my ($result,$hostname,$tabletype) = @_;
+ # conclude from self to others regarding fields
+ my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash
+ ($tabletype,
+ map {
+ &unescape($_);
+ } (split(/\,/,$result)) );
return %Fields;
}
@@ -2577,8 +2975,8 @@ sub handle_custom_fields {
my $customshow='';
my $extrashow='';
my @customfields;
- if ($ENV{'form.customshow'}) {
- $customshow=$ENV{'form.customshow'};
+ if ($env{'form.customshow'}) {
+ $customshow=$env{'form.customshow'};
$customshow=~s/[^\w\s]//g;
my @fields=map {
"<font color=\"#008000\">$_:</font><!-- $_ -->";
@@ -2594,7 +2992,7 @@ sub handle_custom_fields {
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata
my $tmp=$result;
$tmp=~s/^custom\=//;
- my ($k,$v)=map {&Apache::lonnet::unescape($_);
+ my ($k,$v)=map {&unescape($_);
} split(/\,/,$tmp);
$customhash{$k}=$v;
}
@@ -2607,12 +3005,12 @@ sub handle_custom_fields {
=pod
-=item &search_results_header
+=item &search_results_header()
Output the proper html headers and javascript code to deal with different
calling modes.
-Takes most inputs directly from %ENV, except $mode.
+Takes most inputs directly from %env, except $mode.
=over 4
@@ -2626,7 +3024,7 @@ The following environment variables are
=item 'form.catalogmode'
-Checked for 'interactive' and 'groupsearch'.
+Checked for 'interactive' and 'import'.
=item 'form.mode'
@@ -2652,15 +3050,16 @@ the name of the input field to put the t
######################################################################
sub search_results_header {
my ($importbutton,$closebutton) = @_;
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
- my $result = '';
+
+ my $js;
# output beginning of search page
# conditional output of script functions dependent on the mode in
# which the search was invoked
- if ($ENV{'form.catalogmode'} eq 'interactive'){
- if (! exists($ENV{'form.mode'}) || $ENV{'form.mode'} ne 'edit') {
- $result.=<<SCRIPT;
+ if ($env{'form.catalogmode'} eq 'interactive'){
+ if (! exists($env{'form.mode'}) || $env{'form.mode'} ne 'edit') {
+ $js.=<<SCRIPT;
<script type="text/javascript">
+// <![CDATA[
function select_data(title,url) {
changeTitle(title);
changeURL(url);
@@ -2676,12 +3075,13 @@ sub search_results_header {
parent.opener.inf.document.forms.resinfo.elements.u.value=val;
}
}
+// ]]>
</script>
SCRIPT
- } elsif ($ENV{'form.mode'} eq 'edit') {
- my $form = $ENV{'form.form'};
- my $element = $ENV{'form.element'};
- my $titleelement = $ENV{'form.titleelement'};
+ } 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) {}';
@@ -2698,8 +3098,9 @@ function changeTitle(val) {
END
}
- $result.=<<SCRIPT;
+ $js.=<<SCRIPT;
<script type="text/javascript">
+// <![CDATA[
function select_data(title,url) {
changeURL(url);
changeTitle(title);
@@ -2714,62 +3115,57 @@ function changeURL(val) {
alert("Unable to transfer data to "+url);
}
}
+// ]]>
</script>
SCRIPT
}
}
- $result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
+ my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();
+ $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
<script type="text/javascript">
+// <![CDATA[
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';
+ parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
} else {
- parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+ parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
}
} else {
if (document.forms.results.returnvalues.checked) {
- parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+ parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
} else {
- parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+ parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
}
}
}
function select_group() {
parent.window.location=
- "/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+
- parent.statusframe.document.forms.statusform.elements.Queue.value;
+ "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
+ parent.statusframe.document.forms.statusform.elements.acts.value;
}
+// ]]>
</script>
SCRIPT
- $result.=<<END;
-</head>
-$bodytag
-<form name="results" method="post" action="" >
-<input type="hidden" name="Queue" value="" />
+
+ my $start_page = &Apache::loncommon::start_page(undef,$js,
+ {'only_body' =>1,
+ 'add_wishlist' =>1,
+ 'add_modal' =>1});
+ my $result=<<END;
+$start_page
+<form name="results" method="post" action="/adm/searchcat">
$importbutton
END
return $result;
}
-######################################################################
-######################################################################
-sub search_status_header {
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
- return <<ENDSTATUS;
-<html><head><title>Search Status</title></head>
-$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";
+ 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;
}
@@ -2777,24 +3173,33 @@ sub results_link {
######################################################################
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 $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 = &results_link();
- my $result = <<"ENDFRAMES";
-<html>
-<head>
-<script>
+ my $js = <<JS;
+<script type="text/javascript">
+// <![CDATA[
var targetwin = opener;
var queue = '';
+// ]]>
</script>
-<title>LON-CAPA Digital Library Search Results</title>
-</head>
-<frameset rows="150,*">
+JS
+
+ my $start_page =
+ &Apache::loncommon::start_page('LON-CAPA Digital Library Search Results',
+ $js,
+ {'frameset' => 1,
+ 'add_entries' => {
+ 'rows' => "150,*",},});
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1});
+
+ my $result = <<"ENDFRAMES";
+$start_page
<frame name="statusframe" src="$run_search_link">
<frame name="resultsframe" src="$results_link">
-</frameset>
-</html>
+$end_page
ENDFRAMES
$r->print($result);
@@ -2804,11 +3209,69 @@ ENDFRAMES
######################################################################
######################################################################
+sub has_stat_data {
+ my ($values) = @_;
+ if ( (defined($values->{'count'}) && $values->{'count'} ne '') ||
+ (defined($values->{'stdno'}) && $values->{'stdno'} ne '') ||
+ (defined($values->{'disc'}) && $values->{'disc'} ne '') ||
+ (defined($values->{'avetries'}) && $values->{'avetries'} ne '') ||
+ (defined($values->{'difficulty'}) && $values->{'difficulty'} ne '')) {
+ return 1;
+ }
+ return 0;
+}
+
+sub statfields {
+ return ('count','stdno','disc','avetries','difficulty');
+}
+
+sub has_eval_data {
+ my ($values) = @_;
+ if ( (defined($values->{'clear'}) && $values->{'clear'} ne '') ||
+ (defined($values->{'technical'}) && $values->{'technical'} ne '') ||
+ (defined($values->{'correct'}) && $values->{'correct'} ne '') ||
+ (defined($values->{'helpful'}) && $values->{'helpful'} ne '') ||
+ (defined($values->{'depth'}) && $values->{'depth'} ne '')) {
+ return 1;
+ }
+ return 0;
+}
+
+sub evalfields {
+ return ('clear','technical','correct','helpful','depth');
+}
+
+######################################################################
+######################################################################
+
+sub display_tools {
+ my ($title, $jumpurl) = @_;
+ my $result;
+ # Metadata
+ $result.=
+ &Apache::loncommon::modal_link(
+ $jumpurl.'.meta?inhibitmenu=yes',
+ '<img class="LC_icon" src="/res/adm/pages/catalog.png" alt="Info" />',
+ 500,500,'_blank',undef,&mt('Metadata'));
+ # Stored Links
+ $result.=
+ ' <a href="javascript:;"'.
+ ' onclick="set_wishlistlink('."'$title','$jumpurl'".')" '.
+ 'title="'.&mt('Save a link for this resource in your personal Stored Links repository').'">'.
+ '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+ 'alt="Stored Links" style="width:22px;"/></a>';
+ return $result;
+}
+
+######################################################################
+######################################################################
+
=pod
=item Metadata Viewing Functions
Output is a HTML-ified string.
+
Input arguments are title, author, subject, url, keywords, version,
notes, short abstract, mime, language, creation date,
last revision date, owner, copyright, hostname, and
@@ -2824,29 +3287,115 @@ extra custom metadata to show.
######################################################################
sub detailed_citation_view {
my ($prefix,%values) = @_;
- my $icon=&Apache::loncommon::icon($values{'url'});
- my $result=<<END;
-<b>$prefix<img src="$icon" /><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 />
-
-<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>
-$values{'shortabstract'}
-</p>
-<hr align='left' width='200' noshade />
-END
+ my $result;
+ my $jumpurl=$values{'url'};
+ $jumpurl=~s|^/ext/|http://|;
+ $result .=
+ '<b>'.$prefix.
+ '<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '.
+ '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
+ 'target="preview">'.$values{'title'}."</a></b>\n".
+ &display_tools($values{'title'}, $jumpurl).
+ "<p>\n".
+ '<b>'.$values{'author'}.'</b>,'.
+ ' <i>'.$values{'owner'}.'</i><br />';
+ foreach my $field
+ (
+ { name=>'url',
+ translate => '<b>URL:</b> [_1]',
+ special => 'url link',},
+ { name=>'subject',
+ translate => '<b>Subject:</b> [_1]',},
+ { name=>'keywords',
+ translate => '<b>Keywords:</b> [_1]',},
+ { name=>'notes',
+ translate => '<b>Notes:</b> [_1]',},
+ { name=>'mimetag',
+ translate => '<b>MIME Type:</b> [_1]',},
+ { name=>'standards',
+ translate => '<b>Standards:</b>[_1]',},
+ { name=>'copyrighttag',
+ translate => '<b>Copyright/Distribution:</b> [_1]',},
+ { name=>'count',
+ format => "%d",
+ translate => '<b>Access Count:</b> [_1]',},
+ { name=>'stdno',
+ format => "%d",
+ translate => '<b>Number of Students:</b> [_1]',},
+ { name=>'avetries',
+ format => "%.2f",
+ translate => '<b>Average Tries:</b> [_1]',},
+ { name=>'disc',
+ format => "%.2f",
+ translate => '<b>Degree of Discrimination:</b> [_1]',},
+ { name=>'difficulty',
+ format => "%.2f",
+ translate => '<b>Degree of Difficulty:</b> [_1]',},
+ { name=>'clear',
+ format => "%.2f",
+ translate => '<b>Clear:</b> [_1]',},
+ { name=>'depth',
+ format => "%.2f",
+ translate => '<b>Depth:</b> [_1]',},
+ { name=>'helpful',
+ format => "%.2f",
+ translate => '<b>Helpful:</b> [_1]',},
+ { name=>'correct',
+ format => "%.2f",
+ translate => '<b>Correct:</b> [_1]',},
+ { name=>'technical',
+ format => "%.2f",
+ translate => '<b>Technical:</b> [_1]',},
+ { name=>'comefrom_list',
+ type => 'list',
+ translate => 'Resources that lead up to this resource in maps',},
+ { name=>'goto_list',
+ type => 'list',
+ translate => 'Resources that follow this resource in maps',},
+ { name=>'sequsage_list',
+ type => 'list',
+ translate => 'Resources using or importing resource',},
+ ) {
+ next if (! exists($values{$field->{'name'}}) ||
+ $values{$field->{'name'}} eq '');
+ if (exists($field->{'type'}) && $field->{'type'} eq 'list') {
+ $result .= '<b>'.&mt($field->{'translate'}).'</b>';
+ foreach my $item (split(',',$values{$field->{'name'}})){
+ $item = &Apache::lonnet::clutter($item);
+ $result .= '<br />'.&display_url($item,1).'<br />';
+ }
+ } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
+ $result.= &mt($field->{'translate'},
+ sprintf($field->{'format'},
+ $values{$field->{'name'}}))."<br />\n";
+ } else {
+ if ($field->{'special'} eq 'url link') {
+ $result .= '<br />'.&display_url($jumpurl,1).'<br />';
+ } else {
+ $result.= &mt($field->{'translate'},
+ $values{$field->{'name'}});
+ }
+ $result .= "<br />\n";
+ }
+ }
+ $result .= "</p>";
+ if (exists($values{'extrashow'}) && $values{'extrashow'} ne '') {
+ $result .= '<p>'.$values{'extrashow'}.'</p>';
+ }
+ if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
+ $result .= '<p>'.$values{'shortabstract'}.'</p>';
+ }
return $result;
}
+sub detailed_citation_preview {
+ my ($prefix,%values)=@_;
+ return &detailed_citation_view($prefix,%values).
+ '</td><td>'.
+ &Apache::lonindexer::showpreview($values{'url'});
+}
+
+
######################################################################
######################################################################
@@ -2860,19 +3409,42 @@ END
sub summary_view {
my ($prefix,%values) = @_;
my $icon=&Apache::loncommon::icon($values{'url'});
- my $result=<<END;
-$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
- target='search_preview'>$values{'author'}</a><br />
-$values{'title'}<br />
-$values{'owner'} -- $values{'lastrevisiondate'}<br />
+ my $result=qq{$prefix<img src="$icon" alt="" />};
+ if (exists($env{'form.sortfield'}) &&
+ $env{'form.sortfield'} !~ /^(default|
+ author|
+ url|
+ title|
+ owner|
+ lastrevisiondate|
+ copyright)$/x) {
+ my $tmp = $values{$env{'form.sortfield'}};
+ if (! defined($tmp)) { $tmp = 'undefined'; }
+ $result .= ' '.$tmp.' ';
+ }
+ my $jumpurl=$values{'url'};
+ $jumpurl=~s|^/ext/|http://|;
+ my $link = '<br />'.&display_url($jumpurl,1).'<br />';
+ $result .=
+ '<a href="'.$jumpurl.'?inhibitmenu=yes"'.
+ ' target="preview">'.$values{'title'}.'</a>'.
+ &display_tools($values{'title'}, $jumpurl).<<END;
+<br />
+$link<br />
+$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
$values{'copyrighttag'}<br />
$values{'extrashow'}
-</p>
-<hr align='left' width='200' noshade />
END
return $result;
}
+sub summary_preview {
+ my ($prefix,%values)=@_;
+ return &summary_view($prefix,%values).
+ '</td><td>'.
+ &Apache::lonindexer::showpreview($values{'url'});
+}
+
######################################################################
######################################################################
@@ -2886,15 +3458,46 @@ END
######################################################################
sub compact_view {
my ($prefix,%values) = @_;
- my $icon=&Apache::loncommon::icon($values{'url'});
- my $result=<<END;
-$prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'>
-$values{'title'}</a>
-<b>$values{'author'}</b><br />
-END
+ my $jumpurl=$values{'url'};
+ $jumpurl=~s|^/ext/|http://|;
+
+ my $link = &display_url($jumpurl,1);
+
+ my $result =
+ $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
+ if (exists($env{'form.sortfield'}) &&
+ $env{'form.sortfield'} !~ /^(default|author|url|title)$/) {
+ my $tmp = $values{$env{'form.sortfield'}};
+ if (! defined($tmp)) { $tmp = 'undefined'; }
+ $result .= ' '.$tmp.' ';
+ }
+ $jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
+ $result.=' <span class="LC_nobreak">'.
+ '<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
+ &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
+ &display_tools($values{'title'}, $jumpurl).
+ $link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
return $result;
}
+sub display_url {
+ my ($url,$skiplast) = @_;
+ my $link;
+ if ($url=~m|^/ext/|) {
+ $url=~s|^/ext/|http://|;
+ $link='<span class="LC_filename">'.$url.'</span>';
+ } elsif ($url=~m{^(http://|/uploaded/)}) {
+ $link='<span class="LC_filename">'.$url.'</span>';
+ } else {
+ $link=&Apache::lonhtmlcommon::crumbs(
+ $url,
+ 'preview',
+ '',
+ (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
+ $skiplast).' ';
+ }
+ return $link;
+}
######################################################################
######################################################################
@@ -2910,28 +3513,40 @@ END
sub fielded_format_view {
my ($prefix,%values) = @_;
my $icon=&Apache::loncommon::icon($values{'url'});
+ my %Translated = &Apache::lonmeta::fieldnames();
+ my $jumpurl=$values{'url'};
+ $jumpurl=~s|^/ext/|http://|;
+
my $result=<<END;
-$prefix <img src="$icon" />
-<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
- target='search_preview'>$values{'url'}</a>
-<br />
-<b>Title:</b> $values{'title'}<br />
-<b>Author(s):</b> $values{'author'}<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>Creation Date:</b> $values{'creationdate'}<br />
-<b>Last Revision Date:</b> $values{'lastrevisiondate'}<br />
-<b>Publisher/Owner:</b> $values{'owner'}<br />
-<b>Copyright/Distribution:</b> $values{'copyrighttag'}<br />
-<b>Repository Location:</b> $values{'hostname'}<br />
-<b>Abstract:</b> $values{'shortabstract'}<br />
-$values{'extrashow'}
-</p>
-<hr align='left' width='200' noshade />
-END
+$prefix <img src="$icon" alt="" />
+<dl>
+<dt>URL:</dt>
+ <dd><a href="$jumpurl?inhibitmenu=yes"
+ target='preview'>$values{'url'}</a>
+END
+ $result .=
+ &display_tools($values{'title'}, $jumpurl).'
+ </dd>';
+ foreach my $field ('title','author','domain','subject','keywords','notes',
+ 'mimetag','language','creationdate','lastrevisiondate',
+ 'owner','copyrighttag','hostname','abstract') {
+ $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+ (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+ }
+ if (&has_stat_data(\%values)) {
+ foreach my $field (&statfields()) {
+ $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+ (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+ }
+ }
+ if (&has_eval_data(\%values)) {
+ foreach my $field (&evalfields()) {
+ $result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n".
+ (' 'x8).'<dd>'.$values{$field}.'</dd>'."\n";
+ }
+ }
+ $result .= "</dl>\n";
+ $result .= $values{'extrashow'};
return $result;
}
@@ -2950,37 +3565,61 @@ END
######################################################################
sub xml_sgml_view {
my ($prefix,%values) = @_;
+ my $xml = '<LonCapaResource>'."\n";
+ # The usual suspects
+ foreach my $field ('url','title','author','subject','keywords','notes','domain') {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ #
+ $xml .= "<mimeInfo>\n";
+ foreach my $field ('mime','mimetag') {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ $xml .= "</mimeInfo>\n";
+ #
+ $xml .= "<languageInfo>\n";
+ foreach my $field ('language','languagetag') {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ $xml .= "</languageInfo>\n";
+ #
+ foreach my $field ('creationdate','lastrevisiondate','owner') {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ #
+ $xml .= "<copyrightInfo>\n";
+ foreach my $field ('copyright','copyrighttag') {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ $xml .= "</copyrightInfo>\n";
+ $xml .= qq{<repositoryLocation>$values{'hostname'}</repositoryLocation>}.
+ "\n";
+ $xml .= qq{<shortabstract>$values{'shortabstract'}</shortabstract>}."\n";
+ #
+ if (&has_stat_data(\%values)){
+ $xml .= "<problemstatistics>\n";
+ foreach my $field (&statfields()) {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ $xml .= "</problemstatistics>\n";
+ }
+ #
+ if (&has_eval_data(\%values)) {
+ $xml .= "<evaluation>\n";
+ foreach my $field (&evalfields) {
+ $xml .= qq{<$field>$values{$field}</$field>}."\n";
+ }
+ $xml .= "</evaluation>\n";
+ }
+ #
+ $xml .= "</LonCapaResource>\n";
+ $xml = &HTML::Entities::encode($xml,'<>&');
my $result=<<END;
$prefix
<pre>
-<LonCapaResource>
-<url>$values{'url'}</url>
-<title>$values{'title'}</title>
-<author>$values{'author'}</author>
-<subject>$values{'subject'}</subject>
-<keywords>$values{'keywords'}</keywords>
-<notes>$values{'notes'}</notes>
-<mimeInfo>
-<mime>$values{'mime'}</mime>
-<mimetag>$values{'mimetag'}</mimetag>
-</mimeInfo>
-<languageInfo>
-<language>$values{'lang'}</language>
-<languagetag>$values{'language'}</languagetag>
-</languageInfo>
-<creationdate>$values{'creationdate'}</creationdate>
-<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate>
-<owner>$values{'owner'}</owner>
-<copyrightInfo>
-<copyright>$values{'copyright'}</copyright>
-<copyrighttag>$values{'copyrighttag'}</copyrighttag>
-</copyrightInfo>
-<repositoryLocation>$values{'hostname'}</repositoryLocation>
-<shortabstract>$values{'shortabstract'}</shortabstract>
-</LonCapaResource>
+$xml
</pre>
$values{'extrashow'}
-<hr align='left' width='200' noshade />
END
return $result;
}
@@ -2999,11 +3638,54 @@ END
sub filled {
my ($field)=@_;
if ($field=~/\S/ && $field ne 'any') {
- return 1;
+ return 1;
+ } else {
+ return 0;
}
- else {
- return 0;
+}
+
+######################################################################
+######################################################################
+
+=pod
+
+=item &output_unparsed_phrase_error()
+
+=cut
+
+######################################################################
+######################################################################
+sub output_unparsed_phrase_error {
+ my ($r,$closebutton,$parms,$hidden_fields,$field)=@_;
+ my $errorstring;
+ if ($field eq 'basicexp') {
+ $errorstring = &mt('Unable to understand the search phrase [_1]. Please modify your search.'
+ ,'<i>'.$env{'form.basicexp'}.'</i>');
+ } else {
+ $errorstring = &mt('Unable to understand the search phrase [_1]: [_2]'
+ ,'<i>'.$field.'</i>'
+ ,$env{'form.'.$field});
}
+ my $heading = &mt('Unparsed Field');
+ my $revise = &mt('Revise search request');
+ # make query information persistent to allow for subsequent revision
+ my $start_page = &Apache::loncommon::start_page('Search');
+ my $end_page = &Apache::loncommon::end_page();
+ $r->print(<<ENDPAGE);
+$start_page
+<form method="post" action="/adm/searchcat">
+$hidden_fields
+$closebutton
+<hr />
+<h2>$heading</h2>
+<p class="LC_warning">
+$errorstring
+</p>
+<p>
+<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
+</p>
+$end_page
+ENDPAGE
}
######################################################################
@@ -3028,33 +3710,36 @@ $parms is extra information to include i
######################################################################
sub output_blank_field_error {
my ($r,$closebutton,$parms,$hidden_fields)=@_;
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
- # make query information persistent to allow for subsequent revision
- $r->print(<<BEGINNING);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-BEGINNING
- $r->print(<<RESULTS);
-</head>
-$bodytag
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+ my $errormsg = &mt('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.');
+ my $revise = &mt('Revise Search Request');
+ my $heading = &mt('Unactionable Search Query');
+ my $start_page = &Apache::loncommon::start_page('Search');
+ my $end_page = &Apache::loncommon::end_page();
+ if ($closebutton) {
+ $closebutton = '<p>'.$closebutton.'</p><hr />';
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'',
+ text=>$heading,});
+ $start_page .= &Apache::lonhtmlcommon::breadcrumbs();
+ }
+
+ $r->print(<<ENDPAGE);
+$start_page
<form method="post" action="/adm/searchcat">
$hidden_fields
-<a href="/adm/searchcat?$parms&persistent_db_id=$ENV{'form.persistent_db_id'}"
->Revise search request</a>
$closebutton
-<hr />
-<h3>Unactionable search query.</h3>
+</form>
+<h2>$heading</h2>
+<p class="LC_warning">
+$errormsg
+</p>
<p>
-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.
+<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
</p>
-</body>
-</html>
-RESULTS
+$end_page
+ENDPAGE
+ return;
}
######################################################################
@@ -3079,27 +3764,23 @@ Inputs:
sub output_date_error {
my ($r,$message,$closebutton,$hidden_fields)=@_;
# make query information persistent to allow for subsequent revision
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+ my $start_page = &Apache::loncommon::start_page('Search');
+ my $end_page = &Apache::loncommon::end_page();
+ my $heading = &mt('Error');
$r->print(<<RESULTS);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+$start_page
<form method="post" action="/adm/searchcat">
$hidden_fields
<input type='button' value='Revise search request'
-onClick='this.form.submit();' />
+onclick='this.form.submit();' />
$closebutton
+</form>
<hr />
-<h3>Error</h3>
-<p>
+<h3>$heading</h3>
+<p class="LC_error">
$message
</p>
-</body>
-</html>
+$end_page
RESULTS
}
@@ -3119,7 +3800,7 @@ Cleans the global %groupsearch_db by rem
######################################################################
sub start_fresh_session {
delete $groupsearch_db{'mode_catalog'};
- foreach (keys %groupsearch_db) {
+ foreach (keys(%groupsearch_db)) {
if ($_ =~ /^pre_/) {
delete $groupsearch_db{$_};
}
@@ -3137,8 +3818,8 @@ sub cleanup {
&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
}
}
- &untiehash();
&Apache::lonmysql::disconnect_from_db();
+ return OK;
}
__END__