--- loncom/interface/lonsearchcat.pm	2001/03/21 02:24:00	1.52
+++ loncom/interface/lonsearchcat.pm	2001/03/22 14:24:39	1.75
@@ -52,8 +52,16 @@ my %metadatafields;
 my %cprtag;
 my %mimetag;
 my $closebutton;
-my $viewselect=<<END;
-<select name='view'>
+my $basicviewselect=<<END;
+<select name='basicviewselect'>
+<option value='Detailed Citation View'>Detailed Citation View</option>
+<option value='Summary View'>Summary View</option>
+<option value='Fielded Format'>Fielded Format</option>
+<option value='XML/SGML'>XML/SGML</option>
+</select>
+END
+my $advancedviewselect=<<END;
+<select name='advancedviewselect'>
 <option value='Detailed Citation View'>Detailed Citation View</option>
 <option value='Summary View'>Summary View</option>
 <option value='Fielded Format'>Fielded Format</option>
@@ -86,7 +94,7 @@ sub handler {
 END
 
     $closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive';
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+<input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
 
 # ------------------------------------------------ First, check out environment
@@ -99,7 +107,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab');
 	map {
-	    $_=~/(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
 	    $language{$1}=$2;
 	} <$fh>;
     }
@@ -109,7 +117,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab');
 	map {
-	    $_=~/(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
 	    $cprtag{$1}=$2;
 	} <$fh>;
     }
@@ -119,7 +127,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/filetypes.tab');
 	map {
-	    $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp;
 	    $mimetag{$1}=".$1 $3";
 	} <$fh>;
     }
@@ -259,19 +267,19 @@ ENDDOCUMENT
     $r->print(<<ENDDOCUMENT);
 <font color="#800000">Search historic archives</font>
 <br>
-<input type="submit" name="basicsubmit" value="SEARCH">
-<input type="reset" name="reset" value="RESET">
+<input type="submit" name="basicsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
 $closebutton
-$viewselect
+$basicviewselect
 </p>
 <hr>
 <h3>Advanced Search</h3>
 $scrout
 <p>
-<input type="submit" name="advancedsubmit" value="SEARCH">
-<input type="reset" name="reset" value="RESET">
+<input type="submit" name="advancedsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
 $closebutton
-$viewselect
+$advancedviewselect
 </p>
 </form>
 </body>
@@ -284,14 +292,15 @@ ENDDOCUMENT
 
 sub simpletextfield {
     my ($name,$value)=@_;
-    return '<input type=text name="'.$name.'" size=20 value="'.$value.'">';
+    return '<input type=text name=\''.$name.
+	   '\' size=20 value=\''.$value.'\' />';
 }
 
 sub simplecheckbox {
     my ($name,$value)=@_;
     my $checked='';
     $checked="CHECKED" if $value eq 'on';
-    return '<input type=checkbox name="'.$name.'" '. $checked . '>';
+    return '<input type=checkbox name=\''.$name.'\' '. $checked . '>';
 }
 
 sub searchphrasefield {
@@ -303,7 +312,7 @@ END
     my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>".
 	   "</FONT> $instruction<br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+           '<input type=text name="'.$name.'" size=80 value=\''.$value.'\'>';
 }
 
 sub dateboxes {
@@ -456,7 +465,7 @@ sub selectbox {
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
 	"</b></font><br>".'<select name="'.$name.'">';
     map {
-        $selout.='<option value="'.$_.'"';
+        $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) { $selout.=' selected'; }
         $selout.='>'.$options{$_}.'</option>';
     } sort keys %options;
@@ -469,6 +478,18 @@ sub advancedsearch {
     my %ENV=%{$envhash};
 
     my $fillflag=0;
+    # Clean up fields for safety
+    for my $field ('title','author','subject','keywords','url','version',
+		   'creationdatestart_month','creationdatestart_day',
+		   'creationdatestart_year','creationdateend_month',
+		   'creationdateend_day','creationdateend_year',
+		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
+		   'lastrevisiondatestart_year','lastrevisiondateend_month',
+		   'lastrevisiondateend_day','lastrevisiondateend_year',
+		   'notes','abstract','mime','language','owner',
+		   'custommetadata') {
+	$ENV{"form.$field"}=~s/[^\w\s\(\)\=\-\"\']//g;
+    }
     for my $field ('title','author','subject','keywords','url','version',
 		   'notes','abstract','mime','language','owner',
 		   'custommetadata') {
@@ -486,16 +507,53 @@ sub advancedsearch {
 
     my @queries;
     # Go through logical expression AND/OR/NOT phrase fields.
-    foreach my $field ('title','author','subject','notes','abstract') {
+
+    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});
 	}
     }
+    if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
+	push @queries,"(language like \"\%$ENV{'form.language'}\%\")";
+    }
+    if ($ENV{'form.mime'} and $ENV{'form.mime'} ne 'any') {
+	push @queries,"(mime like \"\%$ENV{'form.mime'}\%\")";
+    }
+    if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
+	push @queries,"(copyright like \"\%$ENV{'form.copyright'}\%\")";
+    }
+    my $datequery=&build_date_queries(
+			$ENV{'form.creationdatestart_month'},
+			$ENV{'form.creationdatestart_day'},
+			$ENV{'form.creationdatestart_year'},
+			$ENV{'form.creationdateend_month'},
+			$ENV{'form.creationdateend_day'},
+			$ENV{'form.creationdateend_year'},
+			$ENV{'form.lastrevisiondatestart_month'},
+			$ENV{'form.lastrevisiondatestart_day'},
+			$ENV{'form.lastrevisiondatestart_year'},
+			$ENV{'form.lastrevisiondateend_month'},
+			$ENV{'form.lastrevisiondateend_day'},
+			$ENV{'form.lastrevisiondateend_year'},
+			);
+    if ($datequery=~/^Incorrect/) {
+	&output_date_error($r,$datequery);
+	return OK;
+    }
+    elsif ($datequery) {
+	push @queries,$datequery;
+    }
+    my $customquery;
+    if ($ENV{'form.custommetadata'}) {
+	$customquery=&build_custommetadata_query('custommetadata',
+				      $ENV{'form.custommetadata'});
+    }
     if (@queries) {
-	$query=join(" and ",@queries);
+	$query=join(" AND ",@queries);
 	$query="select * from metadata where $query";
 	my $reply=&Apache::lonnet::metadata_query($query);
-	&output_results('Advanced',$r,$envhash,$query,$reply);
+	&output_results('Advanced',$r,$envhash,$customquery,$reply);
     }
     else {
 	&output_results('Advanced',$r,$envhash,$query);
@@ -519,6 +577,11 @@ sub basicsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
 
+    # Clean up fields for safety
+    for my $field ('basicexp') {
+	$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
+    }
+
     unless (&filled($ENV{'form.basicexp'})) {
 	&output_blank_field_error($r);
 	return OK;
@@ -538,17 +601,7 @@ sub basicsearch {
 sub output_blank_field_error {
     my ($r)=@_;
     # make query information persistent to allow for subsequent revision
-    my $persistent='';
-    map {
-	if (/^form\./ && !/submit/) {
-	    my $name=$_;
-	    my $key=$name;
-	    $name=~s/^form\.//;
-	    $persistent.=<<END;
-<INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>
-END
-        }
-    } (keys %ENV);
+    my $persistent=&make_persistent();
 
     $r->print(<<BEGINNING);
 <html>
@@ -626,18 +679,27 @@ onClick="javascript:select_data('$title'
 <br>
 END
             my $httphost=$ENV{'HTTP_HOST'};
-            if ($ENV{'form.viewselect'} eq 'Detailed Citation View') {
+
+	    my $viewselect;
+	    if ($mode eq 'Basic') {
+		$viewselect=$ENV{'form.basicviewselect'};
+	    }
+	    elsif ($mode eq 'Advanced') {
+		$viewselect=$ENV{'form.advancedviewselect'};
+	    }
+
+            if ($viewselect eq 'Detailed Citation View') {
 		$compiledresult.=&detailed_citation_view(@fields,
 							 $hostname,$httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'Summary View') {
+            elsif ($viewselect eq 'Summary View') {
 		$compiledresult.=&summary_view(@fields,$hostname,$httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'Fielded Format') {
+            elsif ($viewselect eq 'Fielded Format') {
 		$compiledresult.=&fielded_format_view(@fields,$hostname,
 						      $httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'XML/SGML') {
+            elsif ($viewselect eq 'XML/SGML') {
 		$compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost);
 	    }
 
@@ -648,17 +710,7 @@ END
 	}
 
 	# make query information persistent to allow for subsequent revision
-	my $persistent='';
-	map {
-	    if (/^form\./ && !/submit/) {
-		my $name=$_;
-		my $key=$name;
-		$name=~s/^form\.//;
-		$persistent.=<<END;
-<INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>
-END
-            }
-	} (keys %ENV);
+	my $persistent=&make_persistent();
 
 	$r->print(<<BEGINNING);
 <html>
@@ -732,6 +784,21 @@ sub build_SQL_query {
     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 $oldmatchexp . $matchexp;
+}
+
 # - Recursively parse a reverse notation expression into a SQL query expression
 sub recursive_SQL_query_build {
     my ($dkey,$pattern)=@_;
@@ -768,22 +835,18 @@ sub detailed_citation_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-DETAILED
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
+<i>$owner</i>, last revised $lastrevisiondate
+<h3><A HREF="http://$httphost$url" TARGET='search_preview'>$title</A></h3>
+<h3>$author</h3>
+</p>
+<p>
 <b>Subject:</b> $subject<br>
 <b>Keyword(s):</b> $keywords<br>
 <b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
 <b>MIME Type:</b> $mimetag{$mime}<br>
 <b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<b>Copyright/Distribution:</b> $cprtag{$copyright}<br>
+$shortabstract
 </p>
 END
     return $result;
@@ -796,22 +859,10 @@ sub summary_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-SUMMARY
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<a href="http://$httphost$url" TARGET='search_preview'>$author</a><br />
+$title<br />
+$owner -- $lastrevisiondate<br />
+$cprtag{$copyright}<br />
 </p>
 END
     return $result;
@@ -824,22 +875,21 @@ sub fielded_format_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-FIELDED
 <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<br />
+<b>Title:</b> $title<br />
+<b>Author(s):</b> $author<br />
+<b>Subject:</b> $subject<br />
+<b>Keyword(s):</b> $keywords<br />
+<b>Notes:</b> $notes<br />
+<b>MIME Type:</b> $mimetag{$mime}<br />
+<b>Language:</b> $language{$lang}<br />
+<b>Creation Date:</b> $creationdate<br />
+<b>Last Revision Date:</b> $lastrevisiondate<br />
+<b>Publisher/Owner:</b> $owner<br />
+<b>Copyright/Distribution:</b> $cprtag{$copyright}<br />
+<b>Repository Location:</b> $hostname<br />
+<b>Abstract:</b> $shortabstract<br />
 </p>
 END
     return $result;
@@ -852,26 +902,130 @@ sub xml_sgml_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-XML/SGML
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
-</p>
+<pre>
+&lt;LonCapaResource&gt;
+&lt;url&gt;$url&lt;/url&gt;
+&lt;title&gt;$title&lt;/title&gt;
+&lt;author&gt;$author&lt;/author&gt;
+&lt;subject&gt;$subject&lt;/subject&gt;
+&lt;keywords&gt;$keywords&lt;/keywords&gt;
+&lt;notes&gt;$notes&lt;/notes&gt;
+&lt;mimeInfo&gt;
+&lt;mime&gt;$mime&lt;/mime&gt;
+&lt;mimetag&gt;$mimetag{$mime}&lt;/mimetag&gt;
+&lt;/mimeInfo&gt;
+&lt;languageInfo&gt;
+&lt;language&gt;$lang&lt;/language&gt;
+&lt;languagetag&gt;$language{$lang}&lt;/languagetag&gt;
+&lt;/languageInfo&gt;
+&lt;creationdate&gt;$creationdate&lt;/creationdate&gt;
+&lt;lastrevisiondate&gt;$lastrevisiondate&lt;/lastrevisiondate&gt;
+&lt;owner&gt;$owner&lt;/owner&gt;
+&lt;copyrightInfo&gt;
+&lt;copyright&gt;$copyright&lt;/copyright&gt;
+&lt;copyrighttag&gt;$cprtag{$copyright}&lt;/copyrighttag&gt;
+&lt;/copyrightInfo&gt;
+&lt;repositoryLocation&gt;$hostname&lt;/repositoryLocation&gt;
+&lt;shortabstract&gt;$shortabstract&lt;/shortabstract&gt;
+&lt;/LonCapaResource&gt;
+</pre>
 END
     return $result;
 }
 
+sub build_date_queries {
+    my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2,
+	$lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_;
+    my @queries;
+    if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) {
+	unless ($cmonth1 and $cday1 and $cyear1 and
+		$cmonth2 and $cday2 and $cyear2) {
+	    return "Incorrect entry for the creation date.  You must specify ".
+		   "a starting month, day, and year and an ending month, ".
+		   "day, and year.";
+	}
+	my $cnumeric1=sprintf("%d%2d%2d",$cyear1,$cmonth1,$cday1);
+	$cnumeric1+=0;
+	my $cnumeric2=sprintf("%d%2d%2d",$cyear2,$cmonth2,$cday2);
+	$cnumeric2+=0;
+	if ($cnumeric1>$cnumeric2) {
+	    return "Incorrect entry for the creation date.  The starting ".
+		   "date must occur before the ending date.";
+	}
+	my $cquery="(creationdate BETWEEN '$cyear1-$cmonth1-$cday1' AND '".
+	           "$cyear2-$cmonth2-$cday2 23:59:59')";
+	push @queries,$cquery;
+    }
+    if ($lmonth1 or $lday1 or $lyear1 or $lmonth2 or $lday2 or $lyear2) {
+	unless ($lmonth1 and $lday1 and $lyear1 and
+		$lmonth2 and $lday2 and $lyear2) {
+	    return "Incorrect entry for the last revision date.  You must ".
+		   "specify a starting month, day, and year and an ending ".
+		   "month, day, and year.";
+	}
+	my $lnumeric1=sprintf("%d%2d%2d",$lyear1,$lmonth1,$lday1);
+	$lnumeric1+=0;
+	my $lnumeric2=sprintf("%d%2d%2d",$lyear2,$lmonth2,$lday2);
+	$lnumeric2+=0;
+	if ($lnumeric1>$lnumeric2) {
+	    return "Incorrect entry for the last revision date.  The ".
+		   "starting date must occur before the ending date.";
+	}
+	my $lquery="(lastrevisiondate BETWEEN '$lyear1-$lmonth1-$lday1' AND '".
+	           "$lyear2-$lmonth2-$lday2 23:59:59')";
+	push @queries,$lquery;
+    }
+    if (@queries) {
+	return join(" AND ",@queries);
+    }
+    return '';
+}
+
+sub output_date_error {
+    my ($r,$message)=@_;
+    # 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>
+$message
+</p>
+</body>
+</html>
+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;
 __END__