--- loncom/interface/lonsearchcat.pm	2001/03/20 12:21:56	1.43
+++ loncom/interface/lonsearchcat.pm	2001/03/21 01:10:28	1.48
@@ -51,6 +51,13 @@ my $scrout;
 my %metadatafields;
 my %cprtag;
 my %mimetag;
+my $closebutton;
+my $viewselect=<<END;
+<select name='view'>
+<option value='Detailed View'>Detailed View</option>
+<option value='Brief View'>Brief View</option>
+</select>
+END
 
 sub handler {
     my $r = shift;
@@ -76,6 +83,10 @@ sub handler {
 <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'};
 
@@ -248,7 +259,8 @@ ENDDOCUMENT
 <br>
 <input type="submit" name="basicsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+$closebutton
+$viewselect
 </p>
 <hr>
 <h3>Advanced Search</h3>
@@ -256,7 +268,8 @@ $scrout
 <p>
 <input type="submit" name="advancedsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+$closebutton
+$viewselect
 </p>
 </form>
 </body>
@@ -448,7 +461,7 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# ------------------------------------------------ Performing a advanced search
+# ----------------------------------------------- Performing an advanced search
 sub advancedsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
@@ -468,13 +481,23 @@ sub advancedsearch {
     }
 
     my $query='';
-#    my $concatarg=join(',"    ",',
-#		       ('title', 'author', 'subject', 'notes', 'abstract'));
-
-    $query="select * from metadata where concat(title) like '\%$ENV{'form.title'}\%'";
-    my $reply=&Apache::lonnet::metadata_query($query);
 
-    &output_results('Advanced',$r,$envhash,$reply);
+    my @queries;
+    # Go through logical expression AND/OR/NOT phrase fields.
+    foreach my $field ('title','author','subject','notes','abstract') {
+	if ($ENV{'form.'.$field}) {
+	    push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
+	}
+    }
+    if (@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);
+    }
+    else {
+	&output_results('Advanced',$r,$envhash,$query);
+    }
     return OK;
 }
 
@@ -505,10 +528,11 @@ sub basicsearch {
 
     $query="select * from metadata where concat($concatarg) like '\%$ENV{'form.basicexp'}\%'";
     my $reply=&Apache::lonnet::metadata_query($query);
-    &output_results('Basic',$r,$envhash,$reply);
+    &output_results('Basic',$r,$envhash,$query,$reply);
     return OK;
 }
 
+# ---------------- 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
@@ -538,8 +562,7 @@ BEGINNING
 $persistent
 <input type='button' value='Revise search request'
 onClick='this.form.submit();'>
-<input type='button' value='CLOSE'
-onClick='self.close();'>
+$closebutton
 <hr>
 <h3>Helpful Message</h3>
 <p>
@@ -555,8 +578,10 @@ RESULTS
 
 # ----------------------------- format and output results based on a reply list
 sub output_results {
-    my ($mode,$r,$envhash,@replylist)=@_;
+    my ($mode,$r,$envhash,$query,@replylist)=@_;
     my %ENV=%{$envhash};
+    my $compiledresult='';
+
     foreach my $reply (@replylist) {
 
 	my @results;
@@ -579,8 +604,6 @@ sub output_results {
 	    @results=<$fh>;
 	}
 
-	my $compiledresult='';
-
 	foreach my $result (@results) {
 	    my ($title,$author,$subject,$url,$keywords,$version,
 		$notes,$abstract,$mime,$lang,
@@ -665,8 +688,7 @@ SCRIPT
 <form method="post" action="/adm/searchcat">
 <input type='button' value='Revise search request'
 onClick='this.form.submit();'>
-<input type='button' value='CLOSE'
-onClick='self.close();'>
+$closebutton
 $persistent
 <hr>
 <h3>Search Query</h3>
@@ -677,13 +699,16 @@ RESULTS
 <b>Basic search:</b> $ENV{'form.basicexp'}
 </p>
 RESULTS
+    }
     elsif ($mode eq 'Advanced') {
 	$r->print(<<RESULTS);
 <p>
 <b>Advanced search</b>
+$query
 </p>
 RESULTS
     }
+	$r->print(<<RESULTS);
 <h3>Search Results</h3>
 $compiledresult
 </body>
@@ -698,9 +723,10 @@ sub build_SQL_query {
     my $q=new Text::Query('abc',
 			  -parse => 'Text::Query::ParseAdvanced',
 			  -build => 'Text::Query::Build');
-    $q->prepare($statement);
+    $q->prepare($logic_statement);
     my $matchexp=${$q}{'matchexp'}; chomp $matchexp;
     my $sql_query=&recursive_SQL_query_build($field_name,$matchexp);
+    return $sql_query;
 }
 
 # - Recursively parse a reverse notation expression into a SQL query expression
@@ -710,7 +736,7 @@ sub recursive_SQL_query_build {
     return $pattern unless @matches;
     foreach my $match (@matches) {
 	$match=~/\[ (\w+)\s(.*) \]/;
-	($key,$value)=($1,$2);
+	my ($key,$value)=($1,$2);
 	my $replacement='';
 	if ($key eq 'literal') {
 	    $replacement="($dkey like \"\%$value\%\")";