--- loncom/interface/lonsearchcat.pm 2002/06/20 19:43:50 1.125 +++ loncom/interface/lonsearchcat.pm 2002/06/24 15:09:52 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.125 2002/06/20 19:43:50 matthew Exp $ +# $Id: lonsearchcat.pm,v 1.126 2002/06/24 15:09:52 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -515,7 +515,8 @@ ENDDOCUMENT =item &make_persistent() Returns a scalar which holds the current ENV{'form.*'} values in -a 'hidden' html input tag. +a 'hidden' html input tag. This allows search interface information +to be somewhat persistent. =cut @@ -573,8 +574,13 @@ is where the $name and $value are used) =item &dateboxes() +Returns html selection form elements for the specification of +the day, month, and year. + =item &selectbox() +Returns html selection form. + =back =cut @@ -674,7 +680,9 @@ sub selectbox { =pod -=item &advancedsearch() +=item &advancedsearch() + +Parse advanced search results. =cut @@ -785,12 +793,13 @@ sub advancedsearch { $customquery,$customshow); } &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden); - } - elsif ($customquery) { + return OK; + } elsif ($customquery) { my $reply; # reply hash reference $reply=&Apache::lonnet::metadata_query('', $customquery,$customshow); &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden); + return OK; } # should not get to this point return 'Error. Should not have gone to this point.'; @@ -803,6 +812,8 @@ sub advancedsearch { =item &basicsearch() +Parse basic search form. + =cut ###################################################################### @@ -837,8 +848,9 @@ sub basicsearch { $query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'}); # Get reply (either a hash reference to filehandles or bad connection) +# &Apache::lonnet::logthis("metadata query started:".time); my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query); - +# &Apache::lonnet::logthis("metadata query finished:".time); # Output search results &output_results('Basic',$r,$envhash,$query,$reply,$hidden); @@ -854,6 +866,9 @@ sub basicsearch { =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 ###################################################################### @@ -876,14 +891,15 @@ sub build_SQL_query { =item &build_custommetadata_query() +Constructs a custom metadata query using a rather heinous regular +expression. + =cut ###################################################################### ###################################################################### sub build_custommetadata_query { my ($field_name,$logic_statement)=@_; - &Apache::lonnet::logthis("Entered build_custommetadata_query:". - $field_name.':'.$logic_statement); my $q=new Text::Query('abc', -parse => 'Text::Query::ParseAdvanced', -build => 'Text::Query::BuildAdvancedString'); @@ -898,7 +914,6 @@ sub build_custommetadata_query { \*$2\[\^\\<\]?# *wordtwo[^\<] \*\\<\\\/$1\\>?# *\<\/wordone\> /g; - &Apache::lonnet::logthis("match expression: ".$matchexp); return $matchexp; } @@ -909,6 +924,8 @@ sub build_custommetadata_query { =item &recursive_SQL_query_build() +Recursively constructs an SQL query. Takes as input $dkey and $pattern. + =cut ###################################################################### @@ -953,6 +970,9 @@ sub recursive_SQL_query_build { =item &build_date_queries() +Builds a SQL logic query to check time/date entries. +Also reports errors (check for /^Incorrect/). + =cut ###################################################################### @@ -1023,6 +1043,7 @@ contacted, etc.) ###################################################################### ###################################################################### sub output_results { +# &Apache::lonnet::logthis("output_results:".time); my $fnum; # search result counter my ($mode,$r,$envhash,$query,$replyref,$hidden)=@_; my %ENV=%{$envhash}; @@ -1088,10 +1109,9 @@ CATALOGCONTROLS ## (within the foreach loop below). ## foreach my $rkey (sort keys %rhash) { +# &Apache::lonnet::logthis("Server $rkey:".time); $servercount++; - $tflag=1; $compiledresult=''; - my $hostname=$rkey; my $reply=$rhash{$rkey}; my @results; if ($reply eq 'con_lost') { @@ -1103,79 +1123,59 @@ CATALOGCONTROLS $reply=~/^([\.\w]+)$/; my $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1; $reply=~/(.*?)\_/; - { - my $temp=0; - WLOOP: while (1) { - if (-e $replyfile && $tflag) { - &popwin_imgupdate($r,$rkey,"srvhalf.gif"); - &popwin_js($r,'popwin.hc["'.$rkey.'"]='. - '"still transferring..."'.';'); - $tflag=0; - } - if (-e "$replyfile.end") { - $serversleft--; - delete $rhash{$rkey}; - if (-s $replyfile) { - &popwin_imgupdate($r,$rkey,"srvgood.gif"); - my $fh=Apache::File->new($replyfile) or - ($r->print('ERROR: file '. - $replyfile.' cannot be opened') and - return OK); - @results=<$fh> if $fh; - $hitcount{$rkey}=@results+0; - &popwin_js($r,'popwin.hc["'.$rkey.'"]='. - $hitcount{$rkey}.';'); - $hitcountsum+=$hitcount{$rkey}; - &popwin_js($r,'popwin.document.forms.popremain.'. - 'numhits.value='.$hitcountsum.';'); - } - else { - &popwin_imgupdate($r,$rkey,"srvempty.gif"); - &popwin_js($r,'popwin.hc["'.$rkey.'"]=0;'); - } - last WLOOP; - } # end of if ( -e "$replyfile.end") - last WLOOP unless $timeremain; - sleep 1; # wait for daemons to write files? - $timeremain--; - $elapsetime++; - last WLOOP if ($temp>1); - &popwin_js($r,"popwin.document.popremain.". - "elapsetime.value=$elapsetime;"); - $temp++; - } + for (my $counter=0;$counter<2;$counter++) { + if (-e $replyfile && ! -e "$replyfile.end") { + &popwin_imgupdate($r,$rkey,"srvhalf.gif"); + &popwin_js($r,'popwin.hc["'.$rkey.'"]='. + '"still transferring..."'.';'); + } + # Are we finished transferring data? + if (-e "$replyfile.end") { + $serversleft--; + delete $rhash{$rkey}; + if (-s $replyfile) { + &popwin_imgupdate($r,$rkey,"srvgood.gif"); + my $fh; + unless ($fh=Apache::File->new($replyfile)){ + # Is it really appropriate to die on this error? + $r->print('ERROR: file '. + $replyfile.' cannot be opened'); + return OK; + } + @results=<$fh> if $fh; + $hitcount{$rkey}=@results+0; + &popwin_js($r,'popwin.hc["'.$rkey.'"]='. + $hitcount{$rkey}.';'); + $hitcountsum+=$hitcount{$rkey}; + &popwin_js($r,'popwin.document.forms.popremain.'. + 'numhits.value='.$hitcountsum.';'); + } else { + &popwin_imgupdate($r,$rkey,"srvempty.gif"); + &popwin_js($r,'popwin.hc["'.$rkey.'"]=0;'); + } + last; + } # end of if ( -e "$replyfile.end") + last unless $timeremain; + sleep 1; # wait for daemons to write files? + $timeremain--; + $elapsetime++; + &popwin_js($r,"popwin.document.popremain.". + "elapsetime.value=$elapsetime;"); } &popwin_js($r,'popwin.document.whirly.'. 'src="/adm/lonIcons/lonanimend.gif";'); } # end of if ($reply eq 'con_lost') else statement - my $customshow=''; - my $extrashow=''; - my @customfields; - if ($ENV{'form.customshow'}) { - $customshow=$ENV{'form.customshow'}; - $customshow=~s/[^\w\s]//g; - my @fields=map {"$_:"} - split(/\s+/,$customshow); - @customfields=split(/\s+/,$customshow); - if ($customshow) { - $extrashow="
\n";
+ if ($ENV{'form.catalogmode'} eq 'interactive') {
+ my $titleesc=$Fields{'title'};
+ $titleesc=~s/\'/\\'/; # '
+ $compiledresult.=<
END
}
if ($ENV{'form.catalogmode'} eq 'groupsearch') {
$fnum+=0;
- $hash{"pre_${fnum}_link"}=$url;
- $hash{"pre_${fnum}_title"}=$title;
+ $hash{"pre_${fnum}_link"}=$Fields{'url'};
+ $hash{"pre_${fnum}_title"}=$Fields{'title'};
$compiledresult.=<