--- loncom/interface/lonsearchcat.pm 2001/08/26 21:49:49 1.99 +++ loncom/interface/lonsearchcat.pm 2001/10/17 03:31:34 1.102 @@ -7,7 +7,7 @@ # Scott Harrison: 03/12/2001, 03/13/2001, 03/14/2001, 03/15/2001, 03/19/2001 # Scott Harrison: 03/20/2001, 03/21/2001, 03/22/2001, 03/26/2001, 03/27/2001 # Scott Harrison: 04/02/2001, 08/15/2001, 08/24/2001, 08/25/2001 - +# 10/12,10/14,10/15,10/16 Scott Harrison ############################################################################### ## ## ## ORGANIZATION OF THIS PERL MODULE ## @@ -110,6 +110,7 @@ use Apache::lonnet(); use Apache::File(); use CGI qw(:standard); use Text::Query; +use GDBM_File; # ---------------------------------------- variables used throughout the module @@ -127,8 +128,8 @@ my $importbutton; # button to take the s # -- miscellaneous variables my $scrout; # string that holds portions of the screen output -my $fnum; # search result counter my $yourself; # allows for quickly limiting to oneself +my %hash; # ------------------------------------------ choices for different output views # Detailed Citation View ---> sub detailed_citation_view @@ -195,6 +196,9 @@ sub BEGIN { } } +my $diropendb = ""; +my $domain = ""; + # ----------------------------- Handling routine called via Apache and mod_perl sub handler { my $r = shift; @@ -205,6 +209,22 @@ sub handler { $r->send_http_header; return OK if $r->header_only; + $domain = $r->dir_config('lonDefDomain'); + + $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; + + if ($ENV{'form.launch'} eq '1') { + if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { + &start_fresh_session(); + untie %hash; + } + else { + $r->print('Unable to tie hash to db '. + 'file'); + return OK; + } + } + # ----------------------------------- configure dynamic components of interface my $hidden=''; if ($ENV{'form.catalogmode'} eq 'interactive') { @@ -236,10 +256,10 @@ END # ----------------------------------- See if a search invocation should be done if ($ENV{'form.basicsubmit'} eq 'SEARCH') { - return &basicsearch($r,\%ENV); + untie %hash; return &basicsearch($r,\%ENV); } elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') { - return &advancedsearch($r,\%ENV); + untie %hash; return &advancedsearch($r,\%ENV); } # ----------------------------- Else, begin building search interface to output @@ -335,7 +355,7 @@ LASTREVISIONDATEEND LIMIT BY SPECIAL METADATA FIELDS: For resource-specific metadata, enter in an expression in the form of -key=value separated by operators such as AND or OR.
+key=value separated by operators such as AND, OR or NOT.
Example: grandmother=75 OR grandfather=85
CUSTOMMETADATA @@ -358,6 +378,13 @@ $scrout.=' initial users of this syst The LearningOnline Network with CAPA + @@ -368,7 +395,7 @@ $hidden

Basic Search

Enter terms or phrases separated by search operators -such as AND or OR then press SEARCH below. Terms should be specific +such as AND, OR, or NOT then press SEARCH below. Terms should be specific to the title, author, subject, notes, or abstract information associated with a resource.
@@ -385,6 +412,7 @@ ENDDOCUMENT $closebutton $basicviewselect +

Advanced Search

@@ -394,6 +422,7 @@ $scrout $closebutton $advancedviewselect +

@@ -408,7 +437,7 @@ sub get_unprocessed_cgi { my ($name, $value) = split(/=/,$_); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if ($name eq 'catalogmode') { + if ($name eq 'catalogmode' or $name eq 'launch' or $name eq 'acts') { $ENV{'form.'.$name}=$value; } } (split(/&/,$ENV{'QUERY_STRING'})); @@ -451,7 +480,7 @@ sub searchphrasefield { my ($title,$name,$value)=@_; my $instruction=<$uctitle:". @@ -632,7 +661,7 @@ sub advancedsearch { 'lastrevisiondateend_day','lastrevisiondateend_year', 'notes','abstract','mime','language','owner', 'custommetadata','customshow') { - $ENV{"form.$field"}=~s/[^\w\s\(\)\=\-\"\']//g; + $ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g; } # Check to see if enough information was filled in @@ -882,11 +911,12 @@ sub build_date_queries { # gives the status of the network search (time elapsed, number of machines # contacted, etc.) sub output_results { + my $fnum; # search result counter my ($mode,$r,$envhash,$query,$replyref)=@_; my %ENV=%{$envhash}; my %rhash=%{$replyref}; my $compiledresult=''; - my $timeremain=30; + my $timeremain=300; my $elapsetime=0; my $resultflag=0; my $tflag=1; @@ -904,7 +934,7 @@ BEGINNING # conditional output of script functions dependent on the mode in # which the search was invoked $r->print(< + SCRIPT $r->print(< + SCRIPT - $r->print(< + $r->print(< function displayinfo(val) { popwin.document.forms.popremain.sdetails.value=val; } + function openhelp(val) { + openhelpwin=open('/adm/help/searchcat.html','helpscreen', + 'scrollbars=1,width=400,height=300'); + openhelpwin.focus(); + } + function abortsearch(val) { + openhelpwin=open('/adm/help/searchcat.html','helpscreen', + 'scrollbars=1,width=400,height=300'); + openhelpwin.focus(); + } SCRIPT $r->rflush(); @@ -1019,7 +1060,7 @@ RESULTS $sn++; } $r->print(< +'. "\n"); $r->rflush(); + $bloop--; + $orkey{$rkey}=1; } else { $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting @@ -1093,22 +1141,27 @@ ENDPOP my $temp=0; WLOOP: while (1) { if (-e $replyfile && $tflag) { - $r->print(''. "\n"); $r->rflush(); - $r->print(''. "\n"); $r->rflush(); $tflag=0; } - last WLOOP if $temp>5; + last WLOOP if $temp>1; if (-e "$replyfile.end") { + $bloop--; + $orkey{$rkey}=1; if (-s $replyfile) { - $r->print(''. - "\n"); + $r->print(''."\n"); $r->rflush(); my $fh=Apache::File->new($replyfile) or ($r->print('ERROR: file '. @@ -1116,23 +1169,28 @@ ENDPOP return OK); @results=<$fh> if $fh; $hitcount{$rkey}=@results+0; - $r->print(''. "\n"); $r->rflush(); $hitcountsum+=$hitcount{$rkey}; - $r->print(''. "\n"); $r->rflush(); } else { - $r->print(''. - "\n"); + $r->print(''. + "\n"); $r->rflush(); - $r->print(''. "\n"); $r->rflush(); @@ -1143,12 +1201,18 @@ ENDPOP sleep 1; $timeremain--; $elapsetime++; - $r->print(''."\n"); $r->rflush(); $temp++; } } + $r->print(''."\n"); + $r->rflush(); } my $customshow=''; my $extrashow=''; @@ -1174,80 +1238,115 @@ ENDPOP $customhash{$k}=$v; } } - foreach my $result (@results) { - next if $result=~/^custom\=/; - chomp $result; - next unless $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 $shortabstract=$abstract; - $shortabstract=substr($abstract,0,200) if length($abstract)>200; - $fields[7]=$shortabstract; - my $extrashow2=$extrashow; - if ($extrashow) { - foreach my $field (@customfields) { - my $value=''; - if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) { - $value=$1; - } - $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g; - } - } + if (keys %hash) { + untie %hash; + } + if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { + if ($ENV{'form.launch'} eq '1') { + &start_fresh_session(); + } + foreach my $result (@results) { + next if $result=~/^custom\=/; + chomp $result; + next unless $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; + + unless ($ENV{'user.adv'}) { + $keywords='- not displayed -'; + $fields[4]=$keywords; + $notes='- not displayed -'; + $fields[6]=$notes; + $abstract='- not displayed -'; + $fields[7]=$abstract; + $subject='- not displayed -'; + $fields[2]=$subject; + } + + my $shortabstract=$abstract; + $shortabstract=substr($abstract,0,200).'...' if length($abstract)>200; + $fields[7]=$shortabstract; + my $shortkeywords=$keywords; + $shortkeywords=substr($keywords,0,200).'...' if length($keywords)>200; + $fields[4]=$shortkeywords; + + my $extrashow2=$extrashow; + if ($extrashow) { + foreach my $field (@customfields) { + my $value=''; + if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) { + $value=$1; + } + $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g; + } + } - $compiledresult.=< END - $compiledresult.=< END - $compiledresult.=<
END - $compiledresult.=< - -
END - my $httphost=$ENV{'HTTP_HOST'}; +# +# + $fnum++; + } + my $httphost=$ENV{'HTTP_HOST'}; + + my $viewselect; + if ($mode eq 'Basic') { + $viewselect=$ENV{'form.basicviewselect'}; + } + elsif ($mode eq 'Advanced') { + $viewselect=$ENV{'form.advancedviewselect'}; + } - my $viewselect; - if ($mode eq 'Basic') { - $viewselect=$ENV{'form.basicviewselect'}; - } - elsif ($mode eq 'Advanced') { - $viewselect=$ENV{'form.advancedviewselect'}; - } - - if ($viewselect eq 'Detailed Citation View') { - $compiledresult.=&detailed_citation_view(@fields, + if ($viewselect eq 'Detailed Citation View') { + $compiledresult.=&detailed_citation_view(@fields, $hostname,$httphost, $extrashow2); - } - elsif ($viewselect eq 'Summary View') { - $compiledresult.=&summary_view(@fields,$hostname,$httphost, + } + elsif ($viewselect eq 'Summary View') { + $compiledresult.=&summary_view(@fields,$hostname,$httphost, $extrashow2); - } - elsif ($viewselect eq 'Fielded Format') { - $compiledresult.=&fielded_format_view(@fields,$hostname, + } + elsif ($viewselect eq 'Fielded Format') { + $compiledresult.=&fielded_format_view(@fields,$hostname, $httphost,$extrashow2); - } - elsif ($viewselect eq 'XML/SGML') { - $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost, + } + elsif ($viewselect eq 'XML/SGML') { + $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost, $extrashow2); - } + } - } + } + untie %hash; + } + else { + $r->print('Unable to tie hash to db '. + 'file'); + } if ($compiledresult) { $resultflag=1; } @@ -1257,10 +1356,11 @@ $compiledresult RESULTS my $percent=sprintf('%3.0f',($servercount/$servernum*100)); } + } unless ($resultflag) { $r->print("\nThere were no results that matched your query\n"); } -# $r->print(''."\n"); $r->rflush(); +# $r->print(''."\n"); $r->rflush(); $r->print(< @@ -1454,6 +1554,19 @@ $message RESULTS } +# --------- settings whenever the user causes the indexer window to be launched +sub start_fresh_session { + delete $hash{'mode_catalog'}; + map { + if ($_ =~ /^pre_/) { + delete $hash{$_}; + } + if ($_ =~ /^store/) { + delete $hash{$_}; + } + } keys %hash; +} + 1; __END__