--- loncom/interface/lonsearchcat.pm 2001/03/27 13:25:41 1.82 +++ loncom/interface/lonsearchcat.pm 2001/08/26 21:19:35 1.98 @@ -1,14 +1,40 @@ -# 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 +# 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 + +############################################################################### +## ## +## 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 @@ -20,25 +46,64 @@ # 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_date_queries(cmonth1, cday1, cyear1, cmonth2, cday2, cyear2, +# lmonth1, lday1, lyear1, lmonth2, lday2, lyear2) : +# 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. package Apache::lonsearchcat; +# ------------------------------------------------- modules used by this module use strict; use Apache::Constants qw(:common); use Apache::lonnet(); @@ -46,12 +111,30 @@ use Apache::File(); use CGI qw(:standard); use Text::Query; -my %language; -my $scrout; -my %metadatafields; -my %cprtag; -my %mimetag; -my $closebutton; +# ---------------------------------------- variables used throughout the module + +# -- 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 $fnum; # search result counter +my $yourself; # allows for quickly limiting to oneself + +# ------------------------------------------ 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 my $basicviewselect=< @@ -69,69 +152,89 @@ my $advancedviewselect=< END -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=''; - $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>; + } +} + +# ----------------------------- 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; + +# ----------------------------------- 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); } @@ -139,6 +242,7 @@ END return &advancedsearch($r,\%ENV); } +# ----------------------------- Else, begin building search interface to output $scrout=''; # building a part of screen output $scrout.=&searchphrasefield('Limit by title','title', $ENV{'form.title'}); @@ -155,8 +259,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'}); @@ -179,7 +283,7 @@ END

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

LIMIT BY LAST REVISION DATE RANGE: -
between: +
between: LASTREVISIONDATESTART $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976, $ENV{'form.lastrevisiondatestart_month'}, @@ -220,7 +324,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', @@ -232,9 +335,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.
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'; @@ -245,7 +348,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'; @@ -257,33 +360,33 @@ $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 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

@@ -299,6 +402,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') { + $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 { @@ -322,7 +455,7 @@ as AND or OR. END my $uctitle=uc($title); return "\n

$uctitle:". - " $instruction
". + " $instruction
". ''; } @@ -474,7 +607,7 @@ sub selectbox { my ($title,$name,$value,%options)=@_; my $uctitle=uc($title); my $selout="\n

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

Search Catalog

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

Helpful Message

+$persistent +
+

Search Query

+CATALOGCONTROLS + if ($mode eq 'Basic') { + $r->print(< -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. +Basic search: $ENV{'form.basicexp'}

- - RESULTS -} - -# ----------------------------- format and output results based on a reply list -sub output_results { - my ($mode,$r,$envhash,$query,@replylist)=@_; - my %ENV=%{$envhash}; - my $compiledresult=''; - - foreach my $reply (@replylist) { + } + elsif ($mode eq 'Advanced') { + $r->print(< +Advanced search +$query +

+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','scrollbars=1,width=400,height=200'); + popwin.focus(); + popwin.document.writeln('<'+'html>'); + popwin.document.writeln('<'+'head>'); + popwin.document.writeln('<'+'script>'); + popwin.document.writeln('hc=new Array();$hcinit'); + popwin.document.writeln('<'+'/script>'); + popwin.document.writeln('<'+'/head>'+ + '<'+'body bgcolor="#FFFFFF">'+ + '<'+'h3>Search Results Progress<'+'/h3>'+ + '<'+'form name="popremain">'+ + '<'+'br />Server space <'+'input type=text size=25 name=space value="">'+ + '<'+'br />Status <'+'input type=text size=25 name=status value="">'+ + '<'+'br />Maximum remaining time <'+'input type=text size=25 name=timeout '+ + 'value="30">'+ + '<'+'tt>'+ + '<'+'image align="right" src="/adm/lonIcons/'+ + 'lonanim.gif" '+ + 'alt="animated logo" />'+ + '<'+'br />PLEASE BE PATIENT'+ + '<'+'br />SCANNING $servernum SERVERS'+ + '<'+'br clear="all" />Number of record hits found '+ + '<'+'input type="text" size="10" name="numhits"'+ + ' value="0" />'+ + '<'+'br clear="all" />Time elapsed '+ + '<'+'input type="text" size="10" name="elapsetime"'+ + ' value="0" />'+ + '<'+'br />'+ + 'SERVER GRID (click on any cell for details)'+ + $grid + '<'+'br />'+ + 'Server details '+ + '<'+'input type="text" size="25" name="sdetails"'+ + ' value="" />'+ + '<'+'br />'+ + '<'+'input type="button" name="button"'+ + ' value="revise search" />'+ + ' <'+'input type="button" name="button"'+ + ' value="view results" />'+ + ' <'+'input type="button" name="button"'+ + ' value="help" />'+ + '<'+'/tt>'+ + '<'+'/form>'+ + '<'+'/body><'+'/html>'); + popwin.document.close(); + +ENDPOP + $r->rflush(); + $r->print(''); + $r->rflush(); + my $servercount=0; + $sn=0; + my $hitcountsum=0; + foreach my $rkey (sort keys %rhash) { + $sn++; + $servercount++; + $tflag=1; + $compiledresult=''; + my $hostname=$rkey; + $r->print(''."\n"); + $r->rflush(); + my $reply=$rhash{$rkey}; my @results; - + my $replyfile=''; - $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting - $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1; - $reply=~/(.*?)\_/; - my $hostname=$1; - sleep 3; # temporary fix, need to check for completion and status - { - while (1) { - last if -e $replyfile; - sleep 1; + + if ($reply eq 'con_lost') { + my $percent=sprintf('%3.0f',($servercount/$servernum*100)); + $r->print(''); + } + else { + $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting + $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1; + $reply=~/(.*?)\_/; + { + 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(); + } + last WLOOP; + } + last WLOOP unless $timeremain; + sleep 1; + $timeremain--; + $elapsetime++; + $r->print(''."\n"); + $r->rflush(); + $r->print(''."\n"); + $r->rflush(); + $temp++; + } } - # 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('file cannot be opened') and return OK); - @results=<$fh>; } - 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); + my @fields=map {"$_:"} + split(/\s+/,$customshow); + @customfields=split(/\s+/,$customshow); if ($customshow) { $extrashow="
  • ".join("
  • ",@fields)."
\n"; } } my $customdata=''; + my %customhash; foreach my $result (@results) { if ($result=~/^(custom\=.*)$/) { # grab all custom metadata - $customdata.=$result; + my $tmp=$result; + $tmp=~s/^custom\=//; + my ($k,$v)=map {&Apache::lonnet::unescape($_); + } split(/\,/,$tmp); + $customhash{$k}=$v; } } foreach my $result (@results) { next if $result=~/^custom\=/; chomp $result; + next unless $result; my @fields=map - {&Apache::lonnet::unescape($_)} - (split(/\,/,$result)); + {&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; - $compiledresult.=<]*\>(.*?)\<\/${field}[^\>]*\>/s) { + $value=$1; + } + $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g; + } + } + + $compiledresult.=< +END + $compiledresult.=< END $compiledresult.=< -
+
+END + $compiledresult.=< + + + +
END my $httphost=$ENV{'HTTP_HOST'}; - my $viewselect; - if ($mode eq 'Basic') { + my $viewselect; + if ($mode eq 'Basic') { $viewselect=$ENV{'form.basicviewselect'}; } - elsif ($mode eq 'Advanced') { - $viewselect=$ENV{'form.advancedviewselect'}; - } + elsif ($mode eq 'Advanced') { + $viewselect=$ENV{'form.advancedviewselect'}; + } if ($viewselect eq 'Detailed Citation View') { - $compiledresult.=&detailed_citation_view(@fields, - $hostname,$httphost, - $extrashow); + $compiledresult.=&detailed_citation_view(@fields, + $hostname,$httphost, + $extrashow2); } elsif ($viewselect eq 'Summary View') { $compiledresult.=&summary_view(@fields,$hostname,$httphost, - $extrashow); + $extrashow2); } elsif ($viewselect eq 'Fielded Format') { $compiledresult.=&fielded_format_view(@fields,$hostname, - $httphost,$extrashow); + $httphost,$extrashow2); } elsif ($viewselect eq 'XML/SGML') { $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost, - $extrashow); + $extrashow2); } - + } - unless ($compiledresult) { - $compiledresult="There were no results that matched your query"; + if ($compiledresult) { + $resultflag=1; } - # make query information persistent to allow for subsequent revision - my $persistent=&make_persistent(); - - $r->print(< - -The LearningOnline Network with CAPA -BEGINNING - $r->print(< - function select_data(title,url) { - changeTitle(title); - changeURL(url); - } - function changeTitle(val) { - if (opener.inf.document.forms.resinfo.elements.t) { - opener.inf.document.forms.resinfo.elements.t.value=val; - } - } - function changeURL(val) { - if (opener.inf.document.forms.resinfo.elements.u) { - opener.inf.document.forms.resinfo.elements.u.value=val; - } - } - -SCRIPT - $r->print(< - - -

Search Catalog

- -$customdata - -$closebutton -$persistent -
-

Search Query

-RESULTS - if ($mode eq 'Basic') { $r->print(< -Basic search: $ENV{'form.basicexp'} -

+$compiledresult RESULTS + my $percent=sprintf('%3.0f',($servercount/$servernum*100)); + $r->print(''."\n"); } - elsif ($mode eq 'Advanced') { - $r->print(< -Advanced search -$query -

-RESULTS + unless ($resultflag) { + $r->print("\nThere were no results that matched your query\n"); } - $r->print(<Search Results -$compiledresult +# $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 @@ -880,12 +1284,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

@@ -979,54 +1383,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 @@ -1040,14 +1442,14 @@ BEGINNING $r->print(< - +

Search Catalog

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

Helpful Message

$message @@ -1057,21 +1459,6 @@ $message RESULTS } -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; -} 1; + __END__