loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.79 and 1.99

-version 1.79, 2001/03/27 02:48:02
+version 1.99, 2001/08/26 21:49:49
  Line 1
- # 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
- Line 20
+ Line 46
  #                                                          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();
- Line 46  use Apache::File();
+ Line 111  use Apache::File();
  use CGI qw(:standard);
  use Text::Query;
- my %language;
+ # ---------------------------------------- variables used throughout the module
- my $scrout;
- my %metadatafields;
+ # -- information holders
- my %cprtag;
+ my %language; # holds contents of language.tab
- my %mimetag;
+ my %cprtag; # holds contents of copyright.tab
- my $closebutton;
+ 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=<<END;
  <select name='basicviewselect'>
  <option value='Detailed Citation View'>Detailed Citation View</option>
- Line 69  my $advancedviewselect=<<END;
+ Line 152  my $advancedviewselect=<<END;
  </select>
  END
- sub handler {
+ # ----------------------------------------------------------------------- BEGIN
-     my $r = shift;
+ sub BEGIN {
- # -------------------------------------- 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 if $ENV{'form.catalogmode'} eq 'interactive';
- <input type='hidden' name='catalogmode' value='interactive'>
- END
-     $closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive';
- <input type="button" name="close" value='CLOSE' onClick="self.close()">
- END
- # ------------------------------------------------ First, check out environment
-     $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
  # --------------------------------- 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="<input type='hidden' name='catalogmode' value='interactive'>".
+ 	    "\n";
+         $closebutton="<input type='button' name='close' value='CLOSE' ".
+ 	    "onClick='self.close()'>"."\n";
+     }
+     elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ 	$hidden=<<END;
+ <input type='hidden' name='catalogmode' value='groupsearch'>
+ END
+         $closebutton=<<END;
+ <input type='button' name='close' value='CLOSE' onClick='self.close()'>
+ END
+         $importbutton=<<END;
+ <input type='button' name='import' value='IMPORT'
+ onClick='javascript:select_group()'>
+ 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);
      }
- Line 139  END
+ Line 242  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'});
- Line 155  END
+ Line 259  END
      $scrout.=&searchphrasefield('Limit by URL','url',
  			$ENV{'form.url'});
-     $scrout.=&searchphrasefield('Limit by version','version',
+ #    $scrout.=&searchphrasefield('Limit by version','version',
- 			$ENV{'form.version'});
+ #			$ENV{'form.version'});
      $scrout.=&searchphrasefield('Limit by notes','notes',
  			$ENV{'form.notes'});
- Line 179  END
+ Line 283  END
  <p>
  <font color="#800000" face="helvetica"><b>LIMIT BY CREATION DATE RANGE:</b>
  </font>
- <br>
+ <br />
  between:
  CREATIONDATESTART
      $scrout.=&dateboxes('creationdatestart',1,1,1976,
- Line 201  CREATIONDATEEND
+ Line 305  CREATIONDATEEND
  <p>
  <font color="#800000" face="helvetica"><b>LIMIT BY LAST REVISION DATE RANGE:
  </b></font>
- <br>between:
+ <br />between:
  LASTREVISIONDATESTART
      $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976,
  			$ENV{'form.lastrevisiondatestart_month'},
- Line 220  LASTREVISIONDATEEND
+ Line 324  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',
- Line 232  LASTREVISIONDATEEND
+ Line 335  LASTREVISIONDATEEND
  <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.<br>
+ <i>key</i>=<i>value</i> separated by operators such as AND or OR.<br />
  <b>Example:</b> grandmother=75 OR grandfather=85
- <br>
+ <br />
  CUSTOMMETADATA
  $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
  $scrout.=' <i>initial users of this system do not need to worry about this option</i>';
- Line 245  $scrout.=' <i>initial users of this syst
+ Line 348  $scrout.=' <i>initial users of this syst
  </font>
  Enter in a space-separated list of special metadata fields to show
  in a fielded listing for each record result.
- <br>
+ <br />
  CUSTOMSHOW
  $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
  $scrout.=' <i>initial users of this system do not need to worry about this option</i>';
- Line 257  $scrout.=' <i>initial users of this syst
+ Line 360  $scrout.=' <i>initial users of this syst
  <title>The LearningOnline Network with CAPA</title>
  </head>
  <body bgcolor="#FFFFFF">
- <img align=right src=/adm/lonIcons/lonlogos.gif>
+ <img align='right' src='/adm/lonIcons/lonlogos.gif' />
  <h1>Search Catalog</h1>
  <form method="post" action="/adm/searchcat">
  $hidden
- <hr>
+ <hr />
  <h3>Basic Search</h3>
  <p>
  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.
- <br>
+ <br />
  ENDDOCUMENT
      $r->print(&simpletextfield('basicexp',$ENV{'form.basicexp'}));
      $r->print(' ');
      $r->print(&simplecheckbox('titleonly',$ENV{'form.titleonly'}));
      $r->print('<font color="#800000">Title only</font> ');
-     $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'}));
+ #    $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'}));
+ # <font color="#800000">Search historic archives</font>
      $r->print(<<ENDDOCUMENT);
- <font color="#800000">Search historic archives</font>
+ <br />
- <br>
  <input type="submit" name="basicsubmit" value='SEARCH' />
  <input type="reset" name="reset" value='RESET' />
  $closebutton
  $basicviewselect
  </p>
- <hr>
+ <hr />
  <h3>Advanced Search</h3>
  $scrout
  <p>
- Line 299  ENDDOCUMENT
+ Line 402  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;
+ <input type='hidden' name='$name' value='$ENV{$key}' />
+ END
+         }
+     } (keys %ENV);
+     return $persistent;
+ }
  # --------------------------------------------------------- Various form fields
  sub simpletextfield {
- Line 322  as AND or OR.
+ Line 455  as AND or OR.
  END
      my $uctitle=uc($title);
      return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>".
- 	   "</FONT> $instruction<br>".
+ 	   "</FONT> $instruction<br />".
             '<input type=text name="'.$name.'" size=80 value=\''.$value.'\'>';
  }
- Line 474  sub selectbox {
+ Line 607  sub selectbox {
      my ($title,$name,$value,%options)=@_;
      my $uctitle=uc($title);
      my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
- 	"</b></font><br>".'<select name="'.$name.'">';
+ 	"</b></font><br />".'<select name="'.$name.'">';
      map {
          $selout.='<option value=\''.$_.'\'';
          if ($_ eq $value) { $selout.=' selected'; }
- Line 501  sub advancedsearch {
+ Line 634  sub advancedsearch {
  		   'custommetadata','customshow') {
  	$ENV{"form.$field"}=~s/[^\w\s\(\)\=\-\"\']//g;
      }
+     # Check to see if enough information was filled in
      for my $field ('title','author','subject','keywords','url','version',
  		   'notes','abstract','mime','language','owner',
  		   'custommetadata') {
- Line 508  sub advancedsearch {
+ Line 643  sub advancedsearch {
  	    $fillflag++;
  	}
      }
      unless ($fillflag) {
  	&output_blank_field_error($r);
  	return OK;
      }
+     # Turn the form input into a SQL-based query
      my $query='';
      my @queries;
-     # Go through logical expression AND/OR/NOT phrase fields.
+     # Evaluate logical expression AND/OR/NOT phrase fields.
      foreach my $field ('title','author','subject','notes','abstract','url',
  		       'keywords','version','owner') {
  	if ($ENV{'form.'.$field}) {
  	    push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
  	}
      }
+     # Evaluate option lists
      if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
- 	push @queries,"(language like \"\%$ENV{'form.language'}\%\")";
+ 	push @queries,"(language like \"$ENV{'form.language'}\")";
      }
      if ($ENV{'form.mime'} and $ENV{'form.mime'} ne 'any') {
- 	push @queries,"(mime like \"\%$ENV{'form.mime'}\%\")";
+ 	push @queries,"(mime like \"$ENV{'form.mime'}\")";
      }
      if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
- 	push @queries,"(copyright like \"\%$ENV{'form.copyright'}\%\")";
+ 	push @queries,"(copyright like \"$ENV{'form.copyright'}\")";
      }
+     # Evaluate date windows
      my $datequery=&build_date_queries(
  			$ENV{'form.creationdatestart_month'},
  			$ENV{'form.creationdatestart_day'},
- Line 548  sub advancedsearch {
+ Line 685  sub advancedsearch {
  			$ENV{'form.lastrevisiondateend_day'},
  			$ENV{'form.lastrevisiondateend_year'},
  			);
+     # Test to see if date windows are legitimate
      if ($datequery=~/^Incorrect/) {
  	&output_date_error($r,$datequery);
  	return OK;
- Line 555  sub advancedsearch {
+ Line 693  sub advancedsearch {
      elsif ($datequery) {
  	push @queries,$datequery;
      }
+     # Process form information for custom metadata querying
      my $customquery='';
      if ($ENV{'form.custommetadata'}) {
  	$customquery=&build_custommetadata_query('custommetadata',
  				      $ENV{'form.custommetadata'});
      }
+     my $customshow='';
+     if ($ENV{'form.customshow'}) {
+ 	$customshow=$ENV{'form.customshow'};
+ 	$customshow=~s/[^\w\s]//g;
+ 	my @fields=split(/\s+/,$customshow);
+ 	$customshow=join(" ",@fields);
+     }
+     # Send query statements over the network to be processed by either the SQL
+     # database or a recursive scheme of 'grep'-like actions (for custom
+     # metadata).
      if (@queries) {
  	$query=join(" AND ",@queries);
  	$query="select * from metadata where $query";
- 	my $reply='';
+ 	my $reply; # reply hash reference
- 	unless ($customquery) {
+ 	unless ($customquery or $customshow) {
  	    $reply=&Apache::lonnet::metadata_query($query);
  	}
  	else {
- 	    $reply=&Apache::lonnet::metadata_query($query,$customquery);
+ 	    $reply=&Apache::lonnet::metadata_query($query,
+ 						   $customquery,$customshow);
  	}
  	&output_results('Advanced',$r,$envhash,$customquery,$reply);
      }
-     else {
+     elsif ($customquery) {
- 	&output_results('Advanced',$r,$envhash,$query);
+ 	my $reply; # reply hash reference
-     }
+ 	$reply=&Apache::lonnet::metadata_query('',
-     return OK;
+ 					       $customquery,$customshow);
- }
+ 	&output_results('Advanced',$r,$envhash,$customquery,$reply);
- # ---------------------------------------------------- see if a field is filled
- sub filled {
-     my ($field)=@_;
-     if ($field=~/\S/) {
- 	return 1;
-     }
-     else {
- 	return 0;
      }
+     # should not get to this point
+     return 'Error.  Should not have gone to this point.';
  }
  # --------------------------------------------------- Performing a basic search
  sub basicsearch {
      my ($r,$envhash)=@_;
      my %ENV=%{$envhash};
      # Clean up fields for safety
      for my $field ('basicexp') {
  	$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
      }
+     # Check to see if enough is filled in
      unless (&filled($ENV{'form.basicexp'})) {
  	&output_blank_field_error($r);
  	return OK;
      }
+     # Build SQL query string based on form page
      my $query='';
      my $concatarg=join(',"    ",',
  		       ('title', 'author', 'subject', 'notes', 'abstract'));
+     $concatarg='title' if $ENV{'form.titleonly'};
+     $query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});
+     # Get reply (either a hash reference to filehandles or bad connection)
+     my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);
+     # Output search results
-     $query="select * from metadata where concat($concatarg) like '\%$ENV{'form.basicexp'}\%'";
-     my $reply=&Apache::lonnet::metadata_query($query);
      &output_results('Basic',$r,$envhash,$query,$reply);
      return OK;
  }
- # ---------------- Message to output when there are not enough fields filled in
+ # ------------------------------------------------------------- build_SQL_query
- sub output_blank_field_error {
+ sub build_SQL_query {
-     my ($r)=@_;
+     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 '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 ($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;
      # make query information persistent to allow for subsequent revision
      my $persistent=&make_persistent();
-     $r->print(<<BEGINNING);
+     # output beginning of search page
+ 	$r->print(<<BEGINNING);
  <html>
  <head>
  <title>The LearningOnline Network with CAPA</title>
  BEGINNING
-     $r->print(<<RESULTS);
+     # conditional output of script functions dependent on the mode in
+     # which the search was invoked
+         $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
+ <script>
+     function select_data(title,url) {
+ 	changeTitle(title);
+ 	changeURL(url);
+ 	self.close();
+     }
+     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>
+ SCRIPT
+         $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'groupsearch';
+ <script>
+     function select_data(title,url) {
+ 	alert('DEBUG: Should be storing '+title+' and '+url);
+     }
+     function queue(val) {
+ 	if (eval("document.forms."+val+".filelink.checked")) {
+ 	    document.forms.results.acts.value+='1a'+val+'b';
+ 	}
+ 	else {
+ 	    document.forms.results.acts.value+='0a'+val+'b';
+ 	}
+     }
+     function select_group() {
+ 	alert('DEBUG: Should be moving on to group sorting stage'+' acts');
+     }
+ </script>
+ SCRIPT
+         $r->print(<<SCRIPT);                                            ;
+ <script>
+     function displayinfo(val) {
+ 	popwin.document.forms.popremain.sdetails.value=val;
+     }
+ </script>
+ SCRIPT
+     $r->rflush();
+     # begin showing the cataloged results
+     $r->print(<<CATALOGBEGIN);
  </head>
  <body bgcolor="#ffffff">
  <img align=right src=/adm/lonIcons/lonlogos.gif>
  <h1>Search Catalog</h1>
- <form method="post" action="/adm/searchcat">
+ CATALOGBEGIN
- $persistent
+         $r->print(<<CATALOGCONTROLS);
+ <form name='results' method="post" action="/adm/searchcat">
+ <input type='hidden' name='acts' value='' />
  <input type='button' value='Revise search request'
- onClick='this.form.submit();'>
+ onClick='this.form.submit();' />
+ $importbutton
  $closebutton
- <hr>
+ $persistent
- <h3>Helpful Message</h3>
+ <hr />
+ <h3>Search Query</h3>
+ CATALOGCONTROLS
+     if ($mode eq 'Basic') {
+ 	$r->print(<<RESULTS);
  <p>
- Incorrect search query due to blank entry fields.
+ <b>Basic search:</b> $ENV{'form.basicexp'}
- You need to fill in the relevant
- fields on the search page in order for a query to be
- processed.
  </p>
- </body>
- </html>
  RESULTS
- }
+     }
+     elsif ($mode eq 'Advanced') {
- # ----------------------------- format and output results based on a reply list
+ 	$r->print(<<RESULTS);
- sub output_results {
+ <p>
-     my ($mode,$r,$envhash,$query,@replylist)=@_;
+ <b>Advanced search</b>
-     my %ENV=%{$envhash};
+ $query
-     my $compiledresult='';
+ </p>
+ RESULTS
-     foreach my $reply (@replylist) {
+     }
+     $r->print('<h3>Search Results</h3>');
+     $r->rflush();
+     my $servernum=(keys %rhash)+0;
+     # define server grid (shows status of multiple machines)
+     my $hcinit;
+     my $grid="'<br />'+";
+     $grid.="\n";
+     my $sn=1;
+     for my $sk (sort keys %rhash) {
+ 	# '<a href="
+ 	$grid.="'<a href=\"";
+ 	# javascript:displayinfo('+
+ 	$grid.="javascript:opener.displayinfo('+";
+ 	# "'"+'key
+ 	$grid.="\"'\"+'";
+ 	$grid.=$sk;
+ 	my $hc;
+ 	if ($rhash{$sk} eq 'con_lost') {
+ 	    $hc="!!!BAD CONNECTION, CONTACT SYSTEM ADMINISTRATOR!!!";
+ 	}
+ 	else {
+ 	    $hc="'+\"'\"+\"+hc['$sk']+\"+\"'\"+'";
+ 	    $hcinit.="hc[\"$sk\"]=\"not yet connected...\";";
+ 	}
+ 	$grid.=" hitcount=".$hc;
+ 	$grid.=" domain=".$hostdomains{$sk};
+ 	$grid.=" IP=".$hostips{$sk};
+ 	# '+"'"+'">'+
+ 	$grid.="'+\"'\"+')\">'+";
+ 	$grid.="\n";
+ 	$grid.="'<img border=\"0\" name=\"img".$sn."\"".
+ 	    " src=\"/adm/lonIcons/srvnull.gif\" alt=\"".$sk."\" /></a>'+\n";
+ 	$grid.="'<br />'+\n" unless $sn%10;
+         $sn++;
+     }
+ 	    $r->print(<<ENDPOP);
+ <script>
+     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">'+
+ 	'<'+'image align="right" src="/adm/lonIcons/'+
+ 	'lonanim.gif" '+
+ 	'alt="animated logo" />'+
+ 	'<'+'h3>Search Results Progress<'+'/h3>'+
+         '<'+'form name="popremain">'+
+         '<'+'tt>'+
+ 	'<'+'br clear="all"/><i>PLEASE BE PATIENT</i>'+
+ 	'<'+'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();
+ </script>
+ ENDPOP
+     $r->rflush();
+     my $servercount=0;
+     $sn=0;
+     my $hitcountsum=0;
+     foreach my $rkey (sort keys %rhash) {
+ 	$sn++;
+ 	$servercount++;
+ 	$tflag=1;
+ 	$compiledresult='';
+ 	my $hostname=$rkey;
+ 	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;
+ 	if ($reply eq 'con_lost') {
- 	$reply=~/(.*?)\_/;
+ 	    $r->print('<script>popwin.document.img'.$sn.'.'.
- 	my $hostname=$1;
+ 		      'src="/adm/lonIcons/srvbad.gif";</script>'.
- 	sleep 3; # temporary fix, need to check for completion and status
+ 		      "\n");
- 	{
+ 	    $r->rflush();
- 	    while (1) {
+ 	}
- 		last if -e $replyfile;
+ 	else {
- 		sleep 1;
+ 	    $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('<script>popwin.document.img'.$sn.'.'.
+ 				'src="/adm/lonIcons/srvhalf.gif";</script>'.
+ 				"\n");
+ 		      $r->rflush();
+ 		      $r->print('<script>popwin.hc["'.$rkey.'"]='.
+ 				'"still transferring..."'.';</script>'.
+ 				"\n");
+ 		      $r->rflush();
+ 		      $tflag=0;
+ 		  }
+ 		  last WLOOP if $temp>5;
+ 		  if (-e "$replyfile.end") {
+ 		      if (-s $replyfile) {
+ 			  $r->print('<script>popwin.document.img'.$sn.'.'.
+ 				'src="/adm/lonIcons/srvgood.gif";</script>'.
+ 				"\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('<script>popwin.hc["'.$rkey.'"]='.
+ 				    $hitcount{$rkey}.';</script>'.
+ 				    "\n");
+ 			  $r->rflush();
+ 			  $hitcountsum+=$hitcount{$rkey};
+ 			  $r->print('<script>popwin.document.forms.popremain.'.
+ 				    'numhits.value='.$hitcountsum.
+ 				    ';</script>'.
+ 				    "\n");
+ 			  $r->rflush();
+ 		      }
+ 		      else {
+ 			  $r->print('<script>popwin.document.img'.$sn.'.'.
+ 				'src="/adm/lonIcons/srvempty.gif";</script>'.
+ 				"\n");
+ 			  $r->rflush();
+ 			  $r->print('<script>popwin.hc["'.$rkey.'"]=0'.
+ 				    ';</script>'.
+ 				    "\n");
+ 			  $r->rflush();
+ 		      }
+ 		      last WLOOP;
+ 		  }
+ 		  last WLOOP unless $timeremain;
+ 		  sleep 1;
+ 		  $timeremain--;
+ 		  $elapsetime++;
+ 		  $r->print('<script>popwin.document.popremain.elapsetime.'.
+ 			    'value="'.$elapsetime.'";</script>'."\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 {"<font color=\"#008000\">$_:</font>"}
+ 	    my @fields=map {"<font color=\"#008000\">$_:</font><!-- $_ -->"}
- 	                   split(/\s+/,$customshow);
+ 	    split(/\s+/,$customshow);
- 	    $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
+ 	    @customfields=split(/\s+/,$customshow);
+ 	    if ($customshow) {
+ 		$extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
+ 	    }
  	}
  	my $customdata='';
+ 	my %customhash;
  	foreach my $result (@results) {
- 	    $result=~/(\&custom.*)$/; # grab all custom metadata
+ 	    if ($result=~/^(custom\=.*)$/) { # grab all custom metadata
- 	    $custom=$1;
+ 		my $tmp=$result;
- 	    $result=~s/\&custom.*$//; # remove custom metadata
+ 		$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($_)}
+ 	    {&Apache::lonnet::unescape($_)}
- 	                   (split(/\,/,$result));
+ 	    (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.=<<END;
+ 	    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 if $compiledresult or $servercount!=$servernum;
+ <hr align='left' width='200' noshade />
+ END
+             $compiledresult.=<<END;
  <p>
  END
              $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
  <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
  onClick="javascript:select_data('$title','$url')">
  </font>
- <br>
+ <br />
+ END
+             $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'groupsearch';
+ <font size='-1'><input type="checkbox" name="returnvalues" value="SELECT"
+ onClick="javascript:queue($fnum)" />
+ </font>
+ <input type="hidden" name="title$fnum" value="$title" />
+ <input type="hidden" name="url$fnum" value="$url" />
+ <br />
  END
              my $httphost=$ENV{'HTTP_HOST'};
- 	    my $viewselect;
+             my $viewselect;
- 	    if ($mode eq 'Basic') {
+             if ($mode eq 'Basic') {
  		$viewselect=$ENV{'form.basicviewselect'};
  	    }
- 	    elsif ($mode eq 'Advanced') {
+             elsif ($mode eq 'Advanced') {
- 		$viewselect=$ENV{'form.advancedviewselect'};
+ 	        $viewselect=$ENV{'form.advancedviewselect'};
- 	    }
+             }
              if ($viewselect eq 'Detailed Citation View') {
- 		$compiledresult.=&detailed_citation_view(@fields,
+ 	        $compiledresult.=&detailed_citation_view(@fields,
- 							 $hostname,$httphost,
+ 						 $hostname,$httphost,
- 							 $extrashow);
+ 						 $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) {
+ 	if ($compiledresult) {
- 	    $compiledresult="There were no results that matched your query";
+ 	    $resultflag=1;
  	}
- 	# make query information persistent to allow for subsequent revision
- 	my $persistent=&make_persistent();
- 	$r->print(<<BEGINNING);
- <html>
- <head>
- <title>The LearningOnline Network with CAPA</title>
- BEGINNING
-         $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
- <script>
-     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>
- SCRIPT
-         $r->print(<<RESULTS);
- </head>
- <body bgcolor="#ffffff">
- <img align=right src=/adm/lonIcons/lonlogos.gif>
- <h1>Search Catalog</h1>
- <form method="post" action="/adm/searchcat">
- $custom
- <input type='button' value='Revise search request'
- onClick='this.form.submit();'>
- $closebutton
- $persistent
- <hr>
- <h3>Search Query</h3>
- RESULTS
-     if ($mode eq 'Basic') {
  	$r->print(<<RESULTS);
- <p>
+ $compiledresult
- <b>Basic search:</b> $ENV{'form.basicexp'}
- </p>
  RESULTS
+         my $percent=sprintf('%3.0f',($servercount/$servernum*100));
      }
-     elsif ($mode eq 'Advanced') {
+     unless ($resultflag) {
- 	$r->print(<<RESULTS);
+         $r->print("\nThere were no results that matched your query\n");
- <p>
- <b>Advanced search</b>
- $query
- </p>
- RESULTS
      }
- 	$r->print(<<RESULTS);
+ #    $r->print('<script>popwin.close()</script>'."\n"); $r->rflush();
- <h3>Search Results</h3>
+     $r->print(<<RESULTS);
- $compiledresult
  </body>
  </html>
  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
- Line 876  sub detailed_citation_view {
+ Line 1279  sub detailed_citation_view {
  <h3>$author</h3>
  </p>
  <p>
- <b>Subject:</b> $subject<br>
+ <b>Subject:</b> $subject<br />
- <b>Keyword(s):</b> $keywords<br>
+ <b>Keyword(s):</b> $keywords<br />
- <b>Notes:</b> $notes<br>
+ <b>Notes:</b> $notes<br />
- <b>MIME Type:</b> $mimetag{$mime}<br>
+ <b>MIME Type:</b> $mimetag{$mime}<br />
- <b>Language:</b> $language{$lang}<br>
+ <b>Language:</b> $language{$lang}<br />
- <b>Copyright/Distribution:</b> $cprtag{$copyright}<br>
+ <b>Copyright/Distribution:</b> $cprtag{$copyright}<br />
  </p>
  $extrashow
  <p>
- Line 975  END
+ Line 1378  END
      return $result;
  }
- sub build_date_queries {
+ # ---------------------------------------------------- see if a field is filled
-     my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2,
+ sub filled {
- 	$lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_;
+     my ($field)=@_;
-     my @queries;
+     if ($field=~/\S/ && $field ne 'any') {
-     if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) {
+ 	return 1;
- 	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) {
+     else {
- 	return join(" AND ",@queries);
+ 	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(<<BEGINNING);
+ <html>
+ <head>
+ <title>The LearningOnline Network with CAPA</title>
+ BEGINNING
+     $r->print(<<RESULTS);
+ </head>
+ <body bgcolor="#ffffff">
+ <img align='right' src='/adm/lonIcons/lonlogos.gif' />
+ <h1>Search Catalog</h1>
+ <form method="post" action="/adm/searchcat">
+ $persistent
+ <input type='button' value='Revise search request'
+ onClick='this.form.submit();' />
+ $closebutton
+ <hr />
+ <h3>Helpful Message</h3>
+ <p>
+ 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.
+ </p>
+ </body>
+ </html>
+ RESULTS
+ }
+ # ----------------------------------------------------------- Output date error
  sub output_date_error {
      my ($r,$message)=@_;
      # make query information persistent to allow for subsequent revision
- Line 1036  BEGINNING
+ Line 1437  BEGINNING
      $r->print(<<RESULTS);
  </head>
  <body bgcolor="#ffffff">
- <img align=right src=/adm/lonIcons/lonlogos.gif>
+ <img align='right' src='/adm/lonIcons/lonlogos.gif' />
  <h1>Search Catalog</h1>
  <form method="post" action="/adm/searchcat">
  $persistent
  <input type='button' value='Revise search request'
- onClick='this.form.submit();'>
+ onClick='this.form.submit();' />
  $closebutton
- <hr>
+ <hr />
  <h3>Helpful Message</h3>
  <p>
  $message
- Line 1053  $message
+ Line 1454  $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;
- <input type='hidden' name='$name' value='$ENV{$key}' />
- END
-         }
-     } (keys %ENV);
-     return $persistent;
- }
 ;
  __END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.79
changed lines
	Added in v.1.99