--- loncom/interface/lonsearchcat.pm 2001/04/02 21:18:35 1.93 +++ loncom/interface/lonsearchcat.pm 2001/10/16 17:12:51 1.101 @@ -1,15 +1,41 @@ -# The LearningOnline Network +# The LearningOnline Network with CAPA +# # Search Catalog # +# YEAR=2001 # 03/08/2001 Scott Harrison # 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 +# Scott Harrison: 04/02/2001, 08/15/2001, 08/24/2001, 08/25/2001 +# 10/12,10/14,10/15 Scott Harrison + +############################################################################### +## ## +## ORGANIZATION OF THIS PERL MODULE ## +## ## +## 1. Description of functions ## +## 2. Modules used by this module ## +## 3. Choices for different output views (detailed, summary, xml, etc) ## +## 4. BEGIN block (to be run once after compilation) ## +## 5. Handling routine called via Apache and mod_perl ## +## 6. Other subroutines ## +## ## +############################################################################### + +# ---------------------------------------------------- Description of functions # -# Functions # +# === WEB HANDLER FUNCTIONS +# BEGIN() : run once after compilation to initialize values # handler(server reference) : interacts with the Apache server layer # (for /adm/searchcat URLs) +# get_unprocessed_cgi() : reads in critical name/value pairs that may have not +# been processed and passed into %ENV by the web server +# make_persistent() : makes a set of hidden HTML fields to make +# SQL search interface information to be persistent +# +# +# === WEB INTERFACE COMPONENT FUNCTIONS # simpletextfield(name,value) : returns HTML formatted string for simple text # field # simplecheckbox(name,value) : returns HTML formatted string for simple @@ -21,57 +47,93 @@ # for a calendar date # selectbox(title,name,value,%HASH=options) : returns HTML formatted string for # a selection box field +# +# +# === SEARCH FUNCTIONS # advancedsearch(server reference, environment reference) : perform a complex # multi-field logical query -# filled(field) : determines whether a given field has been filled # basicsearch(server reference, environment reference) : perform a simple # single-field logical query -# output_blank_field_error(server reference) : outputs a message saying that -# more fields need to be filled in -# output_results(output mode, -# server reference, -# environment reference, -# reply list reference) : outputs results from search # build_SQL_query(field name, logic) : builds a SQL query string from a # logical expression with AND/OR keywords +# build_custommetadata_query(field_name, logic_statement) : builds a perl +# regular expression from a logical expression with AND/OR +# keywords # recursive_SQL_query_build(field name, reverse notation expression) : # builds a SQL query string from a reverse notation expression # logical expression with AND/OR keywords -# build_custommetadata_query(field_name, logic_statement) : builds a perl -# regular expression from a logical expression with AND/OR -# keywords -# detailed_citation_view, summary_view, fielded_format_view, xml_sgml_view: -# four different ways to view metadata records. Outputs 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, httphost, and extra custom metadata to show. # build_date_queries(cmonth1, cday1, cyear1, cmonth2, cday2, cyear2, # lmonth1, lday1, lyear1, lmonth2, lday2, lyear2) : -# Builds a SQL logic query to check time/date entries. +# Builds a SQL logic query to check time/date entries. +# +# +# === OUTPUTTING RESULTS FUNCTION +# output_results(output mode, +# server reference, +# environment reference, +# reply list reference) : outputs results from search +# +# +# === DIFFERENT WAYS TO VIEW METADATA RECORDS +# detailed_citation_view(ORDERED METADATA LIST FOR A RESULT OBJECT INSTANCE) : +# see metadata viewing notes below +# summary_view(ORDERED METADATA LIST FOR A RESULT OBJECT INSTANCE) : +# see metadata viewing notes below +# fielded_format_view(ORDERED METADATA LIST FOR A RESULT OBJECT INSTANCE) : +# see metadata viewing notes below +# xml_sgml_view(ORDERED METADATA LIST FOR A RESULT OBJECT INSTANCE) : +# see metadata viewing notes below +# ___________________________________________________________________________ +# | * Metadata viewing notes | +# | 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, httphost, and extra custom metadata to show. | +# --------------------------------------------------------------------------- +# +# +# === TEST CONDITIONAL FUNCTIONS +# filled(field) : determines whether a given field has been filled +# +# +# === ERROR FUNCTIONS +# output_blank_field_error(server reference) : outputs a message saying that +# more fields need to be filled in # output_date_error(server reference, error message) : outputs # an error message specific to bad date format. -# make_persistent() : makes a set of hidden HTML fields to make -# SQL search interface information to be persistent package Apache::lonsearchcat; +# ------------------------------------------------- modules used by this module use strict; use Apache::Constants qw(:common); use Apache::lonnet(); use Apache::File(); use CGI qw(:standard); use Text::Query; +use GDBM_File; # ---------------------------------------- variables used throughout the module -my %language; -my $scrout; -my %metadatafields; -my %cprtag; -my %mimetag; -my $closebutton; -# ------ form selection elements that allow for choosing different output views -# Detailed Citation View ---> sub detailed_citationview +# -- information holders +my %language; # holds contents of language.tab +my %cprtag; # holds contents of copyright.tab +my %mimetag; # holds contents of filetypes.tab +my %hostdomains; # matches host name to host domain +my %hostips; # matches host name to host ip +my %hitcount; # stores number of hits per host + +# -- dynamically rendered interface components +my $closebutton; # button that closes the search window +my $importbutton; # button to take the selected results and go to group sorting + +# -- miscellaneous variables +my $scrout; # string that holds portions of the screen output +my $yourself; # allows for quickly limiting to oneself +my %hash; + +# ------------------------------------------ choices for different output views +# Detailed Citation View ---> sub detailed_citation_view # Summary View ---> sub summary_view # Fielded Format ---> sub fielded_format_view # XML/SGML ---> sub xml_sgml_view @@ -92,77 +154,113 @@ my $advancedviewselect=< END -# ----------------------------- Handling routine called via Apache and mod_perl -sub handler { - my $r = shift; - -# -------------------------------------- see if called from an interactive mode - map { - 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') { - $ENV{'form.'.$name}=$value; - } - } (split(/&/,$ENV{'QUERY_STRING'})); - - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; - - %metadatafields=(); - - my $hidden=''; - if ($ENV{'form.catalogmode'} eq 'interactive') { - $hidden=< -END - $closebutton=< -END - } - -# ------------------------------------------------ First, check out environment - $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'}; - +# ----------------------------------------------------------------------- BEGIN +sub BEGIN { # --------------------------------- Compute various listings of metadata values - - %language=(); $language{'any'}='Any language'; { - my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab'); + my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. + '/language.tab'); map { $_=~/(\w+)\s+([\w\s\-]+)/; chomp; $language{$1}=$2; } <$fh>; } - - %cprtag=(); $cprtag{'any'}='Any copyright/distribution'; { - my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab'); + my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonIncludes'}. + '/copyright.tab'); map { $_=~/(\w+)\s+([\w\s\-]+)/; chomp; $cprtag{$1}=$2; } <$fh>; } - - %mimetag=(); $mimetag{'any'}='Any type'; { - my $fh=Apache::File->new($r->dir_config('lonTabDir').'/filetypes.tab'); + my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. + '/filetypes.tab'); map { $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp; $mimetag{$1}=".$1 $3"; } <$fh>; } + { + my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. + '/hosts.tab'); + map { + $_=~/(\w+?)\:(\w+?)\:(\w+?)\:(.*)/; chomp; + if ($3 eq 'library') { + $hostdomains{$1}=$2; + $hostips{$1}=$4; + } + } <$fh>; + } +} + +my $diropendb = ""; +my $domain = ""; + +# ----------------------------- Handling routine called via Apache and mod_perl +sub handler { + my $r = shift; + + &get_unprocessed_cgi(); + + $r->content_type('text/html'); + $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') { + $hidden="". + "\n"; + $closebutton=""."\n"; + } + elsif ($ENV{'form.catalogmode'} eq 'groupsearch') { + $hidden=< +END + $closebutton=< +END + $importbutton=< +END + } + +# ------------------------------------------------------ Determine current user + $yourself=$ENV{'user.name'}.'@'.$ENV{'user.domain'}; + +# --- Now, depending on the interface actions, do one of three things here: +# --- 1. a basic search +# --- 2. an advanced search +# --- 3. output a search interface # ----------------------------------- 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 @@ -182,8 +280,8 @@ END $scrout.=&searchphrasefield('Limit by URL','url', $ENV{'form.url'}); - $scrout.=&searchphrasefield('Limit by version','version', - $ENV{'form.version'}); +# $scrout.=&searchphrasefield('Limit by version','version', +# $ENV{'form.version'}); $scrout.=&searchphrasefield('Limit by notes','notes', $ENV{'form.notes'}); @@ -206,7 +304,7 @@ END

LIMIT BY CREATION DATE RANGE: -
+
between: CREATIONDATESTART $scrout.=&dateboxes('creationdatestart',1,1,1976, @@ -228,7 +326,7 @@ CREATIONDATEEND

LIMIT BY LAST REVISION DATE RANGE: -
between: +
between: LASTREVISIONDATESTART $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976, $ENV{'form.lastrevisiondatestart_month'}, @@ -247,7 +345,6 @@ LASTREVISIONDATEEND $scrout.=&searchphrasefield('Limit by publisher/owner','owner', $ENV{'form.owner'}); -# $metadatafields{'owner'}); $ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'}); $scrout.=&selectbox('Limit by copyright/distribution','copyright', @@ -259,9 +356,9 @@ 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 $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'}); $scrout.=' initial users of this system do not need to worry about this option'; @@ -272,7 +369,7 @@ $scrout.=' initial users of this syst Enter in a space-separated list of special metadata fields to show in a fielded listing for each record result. -
+
CUSTOMSHOW $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'}); $scrout.=' initial users of this system do not need to worry about this option'; @@ -282,35 +379,43 @@ $scrout.=' initial users of this syst The LearningOnline Network with CAPA + - +

Search Catalog

$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. -
+
ENDDOCUMENT $r->print(&simpletextfield('basicexp',$ENV{'form.basicexp'})); $r->print(' '); $r->print(&simplecheckbox('titleonly',$ENV{'form.titleonly'})); $r->print('Title only '); - $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'})); +# $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'})); +# Search historic archives $r->print(<Search historic archives -
+
$closebutton $basicviewselect +

-
+

Advanced Search

$scrout

@@ -318,6 +423,7 @@ $scrout $closebutton $advancedviewselect +

@@ -326,6 +432,36 @@ ENDDOCUMENT return OK; } +# ----------- grab unprocessed CGI variables that may have been appended to URL +sub get_unprocessed_cgi { + map { + 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' or $name eq 'launch' or $name eq 'acts') { + $ENV{'form.'.$name}=$value; + } + } (split(/&/,$ENV{'QUERY_STRING'})); +} + +# ------------------------------------------------------------- make persistent +sub make_persistent { + my $persistent=''; + + map { + if (/^form\./ && !/submit/) { + my $name=$_; + my $key=$name; + $ENV{$key}=~s/\'//g; # do not mess with html field syntax + $name=~s/^form\.//; + $persistent.=< +END + } + } (keys %ENV); + return $persistent; +} + # --------------------------------------------------------- Various form fields sub simpletextfield { @@ -345,11 +481,11 @@ sub searchphrasefield { my ($title,$name,$value)=@_; my $instruction=<$uctitle:". - " $instruction
". + " $instruction
". ''; } @@ -501,7 +637,7 @@ sub selectbox { my ($title,$name,$value,%options)=@_; my $uctitle=uc($title); my $selout="\n

$uctitle:". - "
".''; map { $selout.='

Search Catalog

-
-$persistent - -$closebutton -
-

Helpful Message

-

-Incorrect search query due to blank entry fields. -You need to fill in the relevant -fields on the search page in order for a query to be -processed. -

- - -RESULTS +# ------------------------------------------------- build custom metadata query +sub build_custommetadata_query { + my ($field_name,$logic_statement)=@_; + my $q=new Text::Query('abc', + -parse => 'Text::Query::ParseAdvanced', + -build => 'Text::Query::BuildAdvancedString'); + $q->prepare($logic_statement); + my $matchexp=${$q}{'-parse'}{'-build'}{'matchstring'}; + # quick fix to change literal into xml tag-matching + # will eventually have to write a separate builder module + my $oldmatchexp=$matchexp; + $matchexp=~s/(\w+)\\\=([\w\\\+]+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g; + return $matchexp; +} + +# - Recursively parse a reverse notation expression into a SQL query expression +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 ($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); +} + +# ------------------------------------------------------------ Build date query +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; + } + if (@queries) { + return join(" AND ",@queries); + } + return ''; } # ----------------------------- format and output results based on a reply list +# There are two windows that this function writes to. The main search +# window ("srch") has a listing of the results. A secondary window ("popwin") +# gives the status of the network search (time elapsed, number of machines +# contacted, etc.) 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 $elapsetime=0; my $resultflag=0; my $tflag=1; @@ -723,11 +931,15 @@ sub output_results { The LearningOnline Network with CAPA BEGINNING + + # conditional output of script functions dependent on the mode in + # which the search was invoked $r->print(< + SCRIPT + $r->print(< + function select_data(title,url) { +// alert('DEBUG: Should be storing '+title+' and '+url); + } + function queue(val) { + if (eval("document.forms.results.returnvalues["+val+"].checked")) { + document.forms.results.acts.value+='1a'+val+'b'; + } + else { + document.forms.results.acts.value+='0a'+val+'b'; + } + } + function select_group() { + window.location="/adm/groupsort?catalogmode=groupsearch&acts="+ + document.forms.results.acts.value; + } + +SCRIPT + $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(); + } + +SCRIPT + $r->rflush(); + + # begin showing the cataloged results $r->print(<

Search Catalog

CATALOGBEGIN - $r->print(< + $r->print(< + +onClick='this.form.submit();' /> +$importbutton $closebutton $persistent -
+

Search Query

-RESULTS +CATALOGCONTROLS if ($mode eq 'Basic') { $r->print(< @@ -773,72 +1021,185 @@ RESULTS } $r->print('

Search Results

'); $r->rflush(); + my $servernum=(keys %rhash)+0; + + # define server grid (shows status of multiple machines) + my $hcinit; + my $grid="'
'+"; + $grid.="\n"; + my $sn=1; + for my $sk (sort keys %rhash) { + # ''+ + $grid.="'+\"'\"+')\">'+"; + $grid.="\n"; + $grid.="'\"".$sk."\"'+\n"; + $grid.="'
'+\n" unless $sn%10; + $sn++; + } $r->print(< - popwin=open('','popwin','width=400,height=200'); - popwin.document.writeln(''+ - '

Search Results Progress

'+ - ''+ - '
Server space '+ - '
Status '+ - '
Maximum remaining time '+ - ''+ - ''); + ENDPOP $r->rflush(); - my $servernum=(keys %rhash)+0; - $r->print(''); - $r->rflush(); my $servercount=0; - foreach my $rkey (keys %rhash) { + $sn=0; + my $hitcountsum=0; + foreach my $rkey (sort keys %rhash) { + $sn++; $servercount++; $tflag=1; $compiledresult=''; my $hostname=$rkey; - $r->print(''); - $r->rflush(); my $reply=$rhash{$rkey}; my @results; my $replyfile=''; if ($reply eq 'con_lost') { - my $percent=sprintf('%3.0f',($servercount/$servernum*100)); - $r->print(''); + $r->print(''. + "\n"); + $r->rflush(); } else { $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1; $reply=~/(.*?)\_/; { - while (1) { - if (-e $replyfile && $tflag) { - $r->print(''); - $r->rflush(); - $tflag=0; - } - last if -e "$replyfile.end"; - last unless $timeremain; - sleep 1; - $timeremain--; - $r->print(''); - $r->rflush(); - } - # QUESTION: how should I handle this error condition.. - # I'm sure there is syntax elsewhere I can use.. - my $fh=Apache::File->new($replyfile) or - ($r->print('ERROR: file cannot be opened') and return OK); - @results=<$fh>; + 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; + if (-e "$replyfile.end") { + if (-s $replyfile) { + $r->print(''."\n"); + $r->rflush(); + 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; + $r->print(''. + "\n"); + $r->rflush(); + $hitcountsum+=$hitcount{$rkey}; + $r->print(''. + "\n"); + $r->rflush(); + } + else { + $r->print(''. + "\n"); + $r->rflush(); + $r->print(''. + "\n"); + $r->rflush(); + } + last WLOOP; + } + last WLOOP unless $timeremain; + sleep 1; + $timeremain--; + $elapsetime++; + $r->print(''."\n"); + $r->rflush(); + $temp++; + } } + $r->print(''."\n"); + $r->rflush(); } my $customshow=''; my $extrashow=''; @@ -864,72 +1225,100 @@ 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; + 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; + } + } - $compiledresult.=< END - $compiledresult.=< END - $compiledresult.=< -
+
+END + $hash{"HELLOWORLD"}='123'; + if ($ENV{'form.catalogmode'} eq 'groupsearch') { + $fnum+=0; + $hash{"pre_${fnum}_link"}=$url; + $hash{"pre_${fnum}_title"}=$title; + $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; } @@ -938,76 +1327,17 @@ END $compiledresult RESULTS my $percent=sprintf('%3.0f',($servercount/$servernum*100)); - $r->print(''); } unless ($resultflag) { $r->print("\nThere were no results that matched your query\n"); } - $r->print(''); $r->rflush(); +# $r->print(''."\n"); $r->rflush(); $r->print(< RESULTS } -# ------------------------------------------------------------- build_SQL_query -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; -} - -# ------------------------------------------------- build custom metadata query -sub build_custommetadata_query { - my ($field_name,$logic_statement)=@_; - my $q=new Text::Query('abc', - -parse => 'Text::Query::ParseAdvanced', - -build => 'Text::Query::BuildAdvancedString'); - $q->prepare($logic_statement); - my $matchexp=${$q}{'-parse'}{'-build'}{'matchstring'}; - # quick fix to change literal into xml tag-matching - # will eventually have to write a separate builder module - my $oldmatchexp=$matchexp; - $matchexp=~s/(\w+)\\\=([\w\\\+]+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g; - return $matchexp; -} - -# - Recursively parse a reverse notation expression into a SQL query expression -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 ($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); -} - # ------------------------------------------------------ Detailed Citation View sub detailed_citation_view { my ($title,$author,$subject,$url,$keywords,$version, @@ -1020,12 +1350,12 @@ sub detailed_citation_view {

$author

-Subject: $subject
-Keyword(s): $keywords
-Notes: $notes
-MIME Type: $mimetag{$mime}
-Language: $language{$lang}
-Copyright/Distribution: $cprtag{$copyright}
+Subject: $subject
+Keyword(s): $keywords
+Notes: $notes
+MIME Type: $mimetag{$mime}
+Language: $language{$lang}
+Copyright/Distribution: $cprtag{$copyright}

$extrashow

@@ -1119,54 +1449,52 @@ END return $result; } -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; +# ---------------------------------------------------- see if a field is filled +sub filled { + my ($field)=@_; + if ($field=~/\S/ && $field ne 'any') { + return 1; } - if (@queries) { - return join(" AND ",@queries); + else { + return 0; } - return ''; } +# ---------------- Message to output when there are not enough fields filled in +sub output_blank_field_error { + my ($r)=@_; + # make query information persistent to allow for subsequent revision + my $persistent=&make_persistent(); + + $r->print(< + +The LearningOnline Network with CAPA +BEGINNING + $r->print(< + + +

Search Catalog

+
+$persistent + +$closebutton +
+

Helpful Message

+

+Incorrect search query due to blank entry fields. +You need to fill in the relevant +fields on the search page in order for a query to be +processed. +

+ + +RESULTS +} + +# ----------------------------------------------------------- Output date error sub output_date_error { my ($r,$message)=@_; # make query information persistent to allow for subsequent revision @@ -1180,14 +1508,14 @@ BEGINNING $r->print(< - +

Search Catalog

$persistent +onClick='this.form.submit();' /> $closebutton -
+

Helpful Message

$message @@ -1197,21 +1525,19 @@ $message RESULTS } -sub make_persistent { - my $persistent=''; - +# --------- settings whenever the user causes the indexer window to be launched +sub start_fresh_session { + delete $hash{'mode_catalog'}; map { - if (/^form\./ && !/submit/) { - my $name=$_; - my $key=$name; - $ENV{$key}=~s/\'//g; # do not mess with html field syntax - $name=~s/^form\.//; - $persistent.=< -END + if ($_ =~ /^pre_/) { + delete $hash{$_}; } - } (keys %ENV); - return $persistent; + if ($_ =~ /^store/) { + delete $hash{$_}; + } + } keys %hash; } + 1; + __END__