[BACK]Return to lonsearchcat.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.97 and 1.98

version 1.97, 2001/08/16 02:20:01 version 1.98, 2001/08/26 21:19:35
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network with CAPA
   #
 # Search Catalog  # Search Catalog
 #  #
 # YEAR=2001  # YEAR=2001
 # 03/08/2001 Scott Harrison  # 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/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: 03/20/2001, 03/21/2001, 03/22/2001, 03/26/2001, 03/27/2001
 # Scott Harrison: 04/02/2001, 08/15/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  # handler(server reference) : interacts with the Apache server layer
 #                             (for /adm/searchcat URLs)  #                             (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  # simpletextfield(name,value) : returns HTML formatted string for simple text
 #                               field  #                               field
 # simplecheckbox(name,value) : returns HTML formatted string for simple  # simplecheckbox(name,value) : returns HTML formatted string for simple
Line 22 Line 46
 #                                                          for a calendar date  #                                                          for a calendar date
 # selectbox(title,name,value,%HASH=options) : returns HTML formatted string for  # selectbox(title,name,value,%HASH=options) : returns HTML formatted string for
 #                                             a selection box field  #                                             a selection box field
   #
   #
   # === SEARCH FUNCTIONS
 # advancedsearch(server reference, environment reference) : perform a complex  # advancedsearch(server reference, environment reference) : perform a complex
 #                                  multi-field logical query  #                                  multi-field logical query
 # filled(field) : determines whether a given field has been filled  
 # basicsearch(server reference, environment reference) : perform a simple  # basicsearch(server reference, environment reference) : perform a simple
 #                               single-field logical query  #                               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  # build_SQL_query(field name, logic) : builds a SQL query string from a
 #                                      logical expression with AND/OR keywords  #                                      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) :   # recursive_SQL_query_build(field name, reverse notation expression) : 
 #                 builds a SQL query string from a reverse notation expression  #                 builds a SQL query string from a reverse notation expression
 #                 logical expression with AND/OR keywords  #                 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,  # build_date_queries(cmonth1, cday1, cyear1, cmonth2, cday2, cyear2,
 #                    lmonth1, lday1, lyear1, lmonth2, lday2, lyear2) :  #                    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  # output_date_error(server reference, error message) : outputs
 #         an error message specific to bad date format.  #         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;  package Apache::lonsearchcat;
   
   # ------------------------------------------------- modules used by this module
 use strict;  use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::lonnet();  use Apache::lonnet();
Line 64  use CGI qw(:standard); Line 112  use CGI qw(:standard);
 use Text::Query;  use Text::Query;
   
 # ---------------------------------------- variables used throughout the module  # ---------------------------------------- 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  # -- information holders
 # Detailed Citation View ---> sub detailed_citationview  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  # Summary View ---> sub summary_view
 # Fielded Format ---> sub fielded_format_view  # Fielded Format ---> sub fielded_format_view
 # XML/SGML ---> sub xml_sgml_view  # XML/SGML ---> sub xml_sgml_view
Line 93  my $advancedviewselect=<<END; Line 152  my $advancedviewselect=<<END;
 </select>  </select>
 END  END
   
 # ----------------------------- Handling routine called via Apache and mod_perl  # ----------------------------------------------------------------------- BEGIN
 sub handler {  sub BEGIN {
     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;  
 <input type='hidden' name='catalogmode' value='interactive'>  
 END  
         $closebutton=<<END;  
 <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  # --------------------------------- Compute various listings of metadata values
       
     %language=();  
     $language{'any'}='Any 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 {   map {
     $_=~/(\w+)\s+([\w\s\-]+)/; chomp;      $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
     $language{$1}=$2;      $language{$1}=$2;
  } <$fh>;   } <$fh>;
     }      }
   
     %cprtag=();  
     $cprtag{'any'}='Any copyright/distribution';      $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 {   map {
     $_=~/(\w+)\s+([\w\s\-]+)/; chomp;      $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
     $cprtag{$1}=$2;      $cprtag{$1}=$2;
  } <$fh>;   } <$fh>;
     }      }
   
     %mimetag=();  
     $mimetag{'any'}='Any type';      $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 {   map {
     $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp;      $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp;
     $mimetag{$1}=".$1 $3";      $mimetag{$1}=".$1 $3";
  } <$fh>;   } <$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  # ----------------------------------- See if a search invocation should be done
     if ($ENV{'form.basicsubmit'} eq 'SEARCH') {      if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
Line 207  END Line 283  END
 <p>  <p>
 <font color="#800000" face="helvetica"><b>LIMIT BY CREATION DATE RANGE:</b>  <font color="#800000" face="helvetica"><b>LIMIT BY CREATION DATE RANGE:</b>
 </font>  </font>
 <br>  <br />
 between:  between:
 CREATIONDATESTART  CREATIONDATESTART
     $scrout.=&dateboxes('creationdatestart',1,1,1976,      $scrout.=&dateboxes('creationdatestart',1,1,1976,
Line 229  CREATIONDATEEND Line 305  CREATIONDATEEND
 <p>  <p>
 <font color="#800000" face="helvetica"><b>LIMIT BY LAST REVISION DATE RANGE:  <font color="#800000" face="helvetica"><b>LIMIT BY LAST REVISION DATE RANGE:
 </b></font>  </b></font>
 <br>between:  <br />between:
 LASTREVISIONDATESTART  LASTREVISIONDATESTART
     $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976,      $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976,
  $ENV{'form.lastrevisiondatestart_month'},   $ENV{'form.lastrevisiondatestart_month'},
Line 248  LASTREVISIONDATEEND Line 324  LASTREVISIONDATEEND
   
     $scrout.=&searchphrasefield('Limit by publisher/owner','owner',      $scrout.=&searchphrasefield('Limit by publisher/owner','owner',
  $ENV{'form.owner'});   $ENV{'form.owner'});
 # $metadatafields{'owner'});  
   
     $ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});      $ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});
     $scrout.=&selectbox('Limit by copyright/distribution','copyright',      $scrout.=&selectbox('Limit by copyright/distribution','copyright',
Line 260  LASTREVISIONDATEEND Line 335  LASTREVISIONDATEEND
 <font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>  <font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>
 </font>  </font>
 For resource-specific metadata, enter in an expression in the form of   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  <b>Example:</b> grandmother=75 OR grandfather=85
 <br>  <br />
 CUSTOMMETADATA  CUSTOMMETADATA
 $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});  $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
 $scrout.=' <i>initial users of this system do not need to worry about this option</i>';  $scrout.=' <i>initial users of this system do not need to worry about this option</i>';
Line 273  $scrout.=' <i>initial users of this syst Line 348  $scrout.=' <i>initial users of this syst
 </font>  </font>
 Enter in a space-separated list of special metadata fields to show  Enter in a space-separated list of special metadata fields to show
 in a fielded listing for each record result.  in a fielded listing for each record result.
 <br>  <br />
 CUSTOMSHOW  CUSTOMSHOW
 $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});  $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
 $scrout.=' <i>initial users of this system do not need to worry about this option</i>';  $scrout.=' <i>initial users of this system do not need to worry about this option</i>';
Line 285  $scrout.=' <i>initial users of this syst Line 360  $scrout.=' <i>initial users of this syst
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align='right' src='/adm/lonIcons/lonlogos.gif' />
 <h1>Search Catalog</h1>  <h1>Search Catalog</h1>
 <form method="post" action="/adm/searchcat">  <form method="post" action="/adm/searchcat">
 $hidden  $hidden
 <hr>  <hr />
 <h3>Basic Search</h3>  <h3>Basic Search</h3>
 <p>  <p>
 Enter terms or phrases separated by search operators  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 then press SEARCH below.  Terms should be specific
 to the title, author, subject, notes, or abstract information associated  to the title, author, subject, notes, or abstract information associated
 with a resource.  with a resource.
 <br>  <br />
 ENDDOCUMENT  ENDDOCUMENT
     $r->print(&simpletextfield('basicexp',$ENV{'form.basicexp'}));      $r->print(&simpletextfield('basicexp',$ENV{'form.basicexp'}));
     $r->print(' ');      $r->print(' ');
Line 305  ENDDOCUMENT Line 380  ENDDOCUMENT
 #    $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'}));  #    $r->print(&simplecheckbox('allversions',$ENV{'form.allversions'}));
 # <font color="#800000">Search historic archives</font>  # <font color="#800000">Search historic archives</font>
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
 <br>  <br />
 <input type="submit" name="basicsubmit" value='SEARCH' />  <input type="submit" name="basicsubmit" value='SEARCH' />
 <input type="reset" name="reset" value='RESET' />  <input type="reset" name="reset" value='RESET' />
 $closebutton  $closebutton
 $basicviewselect  $basicviewselect
 </p>  </p>
 <hr>  <hr />
 <h3>Advanced Search</h3>  <h3>Advanced Search</h3>
 $scrout  $scrout
 <p>  <p>
Line 327  ENDDOCUMENT Line 402  ENDDOCUMENT
     return OK;      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  # --------------------------------------------------------- Various form fields
   
 sub simpletextfield {  sub simpletextfield {
Line 350  as AND or OR. Line 455  as AND or OR.
 END  END
     my $uctitle=uc($title);      my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>".      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.'\'>';             '<input type=text name="'.$name.'" size=80 value=\''.$value.'\'>';
 }  }
   
Line 502  sub selectbox { Line 607  sub selectbox {
     my ($title,$name,$value,%options)=@_;      my ($title,$name,$value,%options)=@_;
     my $uctitle=uc($title);      my $uctitle=uc($title);
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".      my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
  "</b></font><br>".'<select name="'.$name.'">';   "</b></font><br />".'<select name="'.$name.'">';
     map {      map {
         $selout.='<option value=\''.$_.'\'';          $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) { $selout.=' selected'; }          if ($_ eq $value) { $selout.=' selected'; }
Line 628  sub advancedsearch { Line 733  sub advancedsearch {
     return 'Error.  Should not have gone to this point.';      return 'Error.  Should not have gone to this point.';
 }  }
   
 # ---------------------------------------------------- see if a field is filled  
 sub filled {  
     my ($field)=@_;  
     if ($field=~/\S/ && $field ne 'any') {  
  return 1;  
     }  
     else {  
  return 0;  
     }  
 }  
   
 # --------------------------------------------------- Performing a basic search  # --------------------------------------------------- Performing a basic search
 sub basicsearch {  sub basicsearch {
     my ($r,$envhash)=@_;      my ($r,$envhash)=@_;
     my %ENV=%{$envhash};      my %ENV=%{$envhash};
   
     # Clean up fields for safety      # Clean up fields for safety
     for my $field ('basicexp') {      for my $field ('basicexp') {
  $ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;   $ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
Line 663  sub basicsearch { Line 756  sub basicsearch {
   
     $query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});      $query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});
   
   
     # Get reply (either a hash reference to filehandles or bad connection)      # Get reply (either a hash reference to filehandles or bad connection)
     my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);      my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);
   
     # Output search results      # Output search results
   
     &output_results('Basic',$r,$envhash,$query,$reply);      &output_results('Basic',$r,$envhash,$query,$reply);
   
     return OK;      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)=@_;
     # make query information persistent to allow for subsequent revision      my $q=new Text::Query('abc',
     my $persistent=&make_persistent();    -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;
   }
   
     $r->print(<<BEGINNING);  # ------------------------------------------------- build custom metadata query
 <html>  sub build_custommetadata_query {
 <head>      my ($field_name,$logic_statement)=@_;
 <title>The LearningOnline Network with CAPA</title>      my $q=new Text::Query('abc',
 BEGINNING    -parse => 'Text::Query::ParseAdvanced',
     $r->print(<<RESULTS);    -build => 'Text::Query::BuildAdvancedString');
 </head>      $q->prepare($logic_statement);
 <body bgcolor="#ffffff">      my $matchexp=${$q}{'-parse'}{'-build'}{'matchstring'};
 <img align=right src=/adm/lonIcons/lonlogos.gif>      # quick fix to change literal into xml tag-matching
 <h1>Search Catalog</h1>      # will eventually have to write a separate builder module
 <form method="post" action="/adm/searchcat">      my $oldmatchexp=$matchexp;
 $persistent      $matchexp=~s/(\w+)\\\=([\w\\\+]+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g;
 <input type='button' value='Revise search request'      return $matchexp;
 onClick='this.form.submit();'>  }
 $closebutton  
 <hr>  # - Recursively parse a reverse notation expression into a SQL query expression
 <h3>Helpful Message</h3>  sub recursive_SQL_query_build {
 <p>      my ($dkey,$pattern)=@_;
 Incorrect search query due to blank entry fields.      my @matches=($pattern=~/(\[[^\]|\[]*\])/g);
 You need to fill in the relevant      return $pattern unless @matches;
 fields on the search page in order for a query to be      foreach my $match (@matches) {
 processed.   $match=~/\[ (\w+)\s(.*) \]/;
 </p>   my ($key,$value)=($1,$2);
 </body>   my $replacement='';
 </html>   if ($key eq 'literal') {
 RESULTS      $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  # ----------------------------- 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 {  sub output_results {
     my ($mode,$r,$envhash,$query,$replyref)=@_;      my ($mode,$r,$envhash,$query,$replyref)=@_;
     my %ENV=%{$envhash};      my %ENV=%{$envhash};
     my %rhash=%{$replyref};      my %rhash=%{$replyref};
     my $compiledresult='';      my $compiledresult='';
     my $timeremain=30;      my $timeremain=30;
       my $elapsetime=0;
     my $resultflag=0;      my $resultflag=0;
     my $tflag=1;      my $tflag=1;
   
Line 726  sub output_results { Line 900  sub output_results {
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 BEGINNING  BEGINNING
   
       # conditional output of script functions dependent on the mode in
       # which the search was invoked
         $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';          $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
 <script>  <script>
     function select_data(title,url) {      function select_data(title,url) {
Line 745  BEGINNING Line 922  BEGINNING
     }      }
 </script>  </script>
 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);      $r->print(<<CATALOGBEGIN);
 </head>  </head>
 <body bgcolor="#ffffff">  <body bgcolor="#ffffff">
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Search Catalog</h1>  <h1>Search Catalog</h1>
 CATALOGBEGIN  CATALOGBEGIN
         $r->print(<<RESULTS);          $r->print(<<CATALOGCONTROLS);
 <form method="post" action="/adm/searchcat">  <form name='results' method="post" action="/adm/searchcat">
   <input type='hidden' name='acts' value='' />
 <input type='button' value='Revise search request'  <input type='button' value='Revise search request'
 onClick='this.form.submit();'>  onClick='this.form.submit();' />
   $importbutton
 $closebutton  $closebutton
 $persistent  $persistent
 <hr>  <hr />
 <h3>Search Query</h3>  <h3>Search Query</h3>
 RESULTS  CATALOGCONTROLS
     if ($mode eq 'Basic') {      if ($mode eq 'Basic') {
  $r->print(<<RESULTS);   $r->print(<<RESULTS);
 <p>  <p>
Line 777  RESULTS Line 984  RESULTS
     }      }
     $r->print('<h3>Search Results</h3>');      $r->print('<h3>Search Results</h3>');
     $r->rflush();      $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." domain=".$hostdomains{$sk};
    my $hc;
    if ($rhash{$sk} eq 'con_lost') {
       $hc="!!!BAD CONNECTION, CONTACT SYSTEM ADMINISTRATOR!!!";
    }
    else {
       $hc="'+\"'\"+\"+hc['$sk']+\"+\"'\"+'";
       $hcinit.="hc[\"$sk\"]=0;";
    }
    $grid.=" hitcount=".$hc;
    $grid.=" IP=".$hostips{$sk};
    # '+"'"+'">'+
    $grid.="'+\"'\"+')\">'+";
    $grid.="\n";
    $grid.="'<img border=\"0\" name=\"img".$sn."\"".
       " src=\"/adm/lonIcons/srvbad.gif\" alt=\"".$sk."\" /></a>'+\n";
    $grid.="'<br />'+\n" unless $sn%10;
           $sn++;
       }
     $r->print(<<ENDPOP);      $r->print(<<ENDPOP);
 <script>  <script>
     popwin=open('','popwin','width=400,height=200');      popwin=open('','popwin','scrollbars=1,width=400,height=200');
     popwin.document.writeln('<html><body bgcolor="#FFFFFF">'+      popwin.focus();
       '<h3>Search Results Progress</h3>'+      popwin.document.writeln('<'+'html>');
       '<form name=popremain>'+      popwin.document.writeln('<'+'head>');
       '<br />Server space <input type=text size=25 name=space value="">'+      popwin.document.writeln('<'+'script>');
       '<br />Status <input type=text size=25 name=status value="">'+      popwin.document.writeln('hc=new Array();$hcinit');
       '<br />Maximum remaining time <input type=text size=25 name=timeout value="30">'+      popwin.document.writeln('<'+'/script>');
       '</form>'+      popwin.document.writeln('<'+'/head>'+
       '</body></html>');          '<'+'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 /><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();      popwin.document.close();
 </script>  </script>
 ENDPOP  ENDPOP
     $r->rflush();      $r->rflush();
   
     my $servernum=(keys %rhash)+0;  
     $r->print('<script>popwin.document.popremain.space.value="'.      $r->print('<script>popwin.document.popremain.space.value="'.
       $servernum.', 0%, count=0/'.$servernum.'";</script>');        $servernum.', 0%, count=0/'.$servernum.'";</script>');
     $r->rflush();       $r->rflush(); 
     my $servercount=0;      my $servercount=0;
     foreach my $rkey (keys %rhash) {      $sn=0;
       my $hitcountsum=0;
       foreach my $rkey (sort keys %rhash) {
    $sn++;
  $servercount++;   $servercount++;
  $tflag=1;   $tflag=1;
  $compiledresult='';   $compiledresult='';
  my $hostname=$rkey;   my $hostname=$rkey;
  $r->print('<script>popwin.document.popremain.status.value="'.   $r->print('<script>popwin.document.popremain.status.value="'.
   $rkey.', trying contact";</script>');    $rkey.', trying contact";</script>'."\n");
  $r->rflush();   $r->rflush();
  my $reply=$rhash{$rkey};   my $reply=$rhash{$rkey};
  my @results;   my @results;
Line 822  ENDPOP Line 1099  ENDPOP
     $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;      $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
     $reply=~/(.*?)\_/;      $reply=~/(.*?)\_/;
     {      {
  while (1) {   my $temp=0;
     if (-e $replyfile && $tflag) {        WLOOP: while (1) {
  $r->print('<script>popwin.document.popremain.status.'.    if (-e $replyfile && $tflag) {
   'value="'.$rkey.', transmitting";</script>');        $r->print('<script>popwin.document.popremain.status.'.
  $r->rflush();   'value="'.$rkey.', transmitting";</script>'.
  $tflag=0;   "\n");
      }        $r->rflush();
     last if -e "$replyfile.end";        $r->print('<script>popwin.document.img'.$sn.'.'.
     last unless $timeremain;   'src="/adm/lonIcons/srvempty.gif";</script>'.
     sleep 1;   "\n");
     $timeremain--;        $r->rflush();
     $r->print('<script>popwin.document.popremain.timeout.value="'.        $tflag=0;
       $timeremain.'";</script>');    }
     $r->rflush();    last WLOOP if $temp>5;
  }    if (-e "$replyfile.end") {
  # QUESTION: how should I handle this error condition..        if (-s $replyfile) {
  # I'm sure there is syntax elsewhere I can use..    $r->print('<script>popwin.document.img'.$sn.'.'.
  my $fh=Apache::File->new($replyfile) or   'src="/adm/lonIcons/srvgood.gif";</script>'.
     ($r->print('ERROR: file cannot be opened') and return OK);   "\n");
  @results=<$fh>;    $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();
         }
         last WLOOP;
     }
     last WLOOP unless $timeremain;
     sleep 1;
     $timeremain--;
     $elapsetime++;
     $r->print('<script>popwin.document.popremain.timeout.'.
       'value="'.$timeremain.'";</script>'."\n");
     $r->rflush();
     $r->print('<script>popwin.document.popremain.elapsetime.'.
       'value="'.$elapsetime.'";</script>'."\n");
     $r->rflush();
     $temp++;
         }
     }      }
  }   }
  my $customshow='';   my $customshow='';
Line 892  ENDPOP Line 1200  ENDPOP
         }          }
             }              }
   
             $compiledresult.=<<END if $compiledresult;              $compiledresult.=<<END if $compiledresult or $servercount!=$servernum;
 <hr align='left' width='200' noshade />  <hr align='left' width='200' noshade />
 END  END
             $compiledresult.=<<END;              $compiledresult.=<<END;
Line 902  END Line 1210  END
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"  <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
 onClick="javascript:select_data('$title','$url')">  onClick="javascript:select_data('$title','$url')">
 </font>  </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  END
             my $httphost=$ENV{'HTTP_HOST'};              my $httphost=$ENV{'HTTP_HOST'};
   
Line 944  RESULTS Line 1260  RESULTS
         my $percent=sprintf('%3.0f',($servercount/$servernum*100));          my $percent=sprintf('%3.0f',($servercount/$servernum*100));
  $r->print('<script>popwin.document.popremain.space.value="'.   $r->print('<script>popwin.document.popremain.space.value="'.
           $servernum.', '.$percent.'%, count='.$servercount.            $servernum.', '.$percent.'%, count='.$servercount.
   '/'.$servernum.'";</script>');    '/'.$servernum.'";</script>'."\n");
     }      }
     unless ($resultflag) {      unless ($resultflag) {
         $r->print("\nThere were no results that matched your query\n");          $r->print("\nThere were no results that matched your query\n");
     }      }
     $r->print('<script>popwin.close()</script>'); $r->rflush();   #    $r->print('<script>popwin.close()</script>'."\n"); $r->rflush(); 
     $r->print(<<RESULTS);      $r->print(<<RESULTS);
 </body>  </body>
 </html>  </html>
 RESULTS  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 '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);  
 }  
   
 # ------------------------------------------------------ Detailed Citation View  # ------------------------------------------------------ Detailed Citation View
 sub detailed_citation_view {  sub detailed_citation_view {
     my ($title,$author,$subject,$url,$keywords,$version,      my ($title,$author,$subject,$url,$keywords,$version,
Line 1029  sub detailed_citation_view { Line 1284  sub detailed_citation_view {
 <h3>$author</h3>  <h3>$author</h3>
 </p>  </p>
 <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>  </p>
 $extrashow  $extrashow
 <p>  <p>
Line 1128  END Line 1383  END
     return $result;      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 {  sub output_date_error {
     my ($r,$message)=@_;      my ($r,$message)=@_;
     # make query information persistent to allow for subsequent revision      # make query information persistent to allow for subsequent revision
Line 1189  BEGINNING Line 1442  BEGINNING
     $r->print(<<RESULTS);      $r->print(<<RESULTS);
 </head>  </head>
 <body bgcolor="#ffffff">  <body bgcolor="#ffffff">
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align='right' src='/adm/lonIcons/lonlogos.gif' />
 <h1>Search Catalog</h1>  <h1>Search Catalog</h1>
 <form method="post" action="/adm/searchcat">  <form method="post" action="/adm/searchcat">
 $persistent  $persistent
 <input type='button' value='Revise search request'  <input type='button' value='Revise search request'
 onClick='this.form.submit();'>  onClick='this.form.submit();' />
 $closebutton  $closebutton
 <hr>  <hr />
 <h3>Helpful Message</h3>  <h3>Helpful Message</h3>
 <p>  <p>
 $message  $message
Line 1206  $message Line 1459  $message
 RESULTS  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;  
 }  
 1;  1;
   
 __END__  __END__
Removed from v.1.97  
changed lines
  Added in v.1.98

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