--- loncom/interface/lonsearchcat.pm	2001/03/15 18:23:54	1.17
+++ loncom/interface/lonsearchcat.pm	2001/03/15 18:52:17	1.21
@@ -77,7 +77,10 @@ END
     }
 
     if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
-	return &basicsearch($r,$ENV{'form.basicexp'});
+	return &basicsearch($r,\%ENV);
+    }
+    elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
+	return &advancedsearch($r,\%ENV);
     }
 
     $scrout=''; # building a part of screen output
@@ -416,55 +419,71 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+# ------------------------------------------------ Performing a advanced search
+sub advancedsearch {
+    my ($r,$envhash)=@_;
+    my %ENV=%{$envhash};
+
+}
+
 # --------------------------------------------------- Performing a basic search
 sub basicsearch {
-    my ($r,$expression)=@_;
+    my ($r,$envhash)=@_;
+    my %ENV=%{$envhash};
 
-    my $query=$expression;
-    $query="select * from metadata where concat(title,\"    \",author) like '\%$expression\%'";
-#    my $reply=&Apache::lonnet::reply("querysend:$query",'msul3');
+    my $query=$ENV{'form.basicexp'};
+    $query="select * from metadata where concat(title,\"    \",author) like '\%$ENV{'form.basicexp'}\%'";
     my $reply=&Apache::lonnet::metadata_query($query);
+    &output_results($r,$envhash,$reply);
+    return OK;
+}
 
-    my @results;
-
-    my $replyfile='';
-    $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
-    $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
-    $reply=~/(.*?)\_/;
-    my $hostname=$1;
-
-    {
-	while (1) {
-	    last if -e $replyfile;
-	    sleep 1;
+# ----------------------------- format and output results based on a reply list
+sub output_results {
+    my ($r,$envhash,@replylist)=@_;
+    my %ENV=%{$envhash};
+    foreach my $reply (@replylist) {
+
+	my @results;
+
+	my $replyfile='';
+	$reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
+	$replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
+	$reply=~/(.*?)\_/;
+	my $hostname=$1;
+
+	{
+	    while (1) {
+		last if -e $replyfile;
+		sleep 1;
+	    }
+	    # 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>;
 	}
-	# 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 $compiledresult='';
+	my $compiledresult='';
 
-    foreach my $result (@results) {
-	my ($title,$author,$subject,$url,$keywords,$version,
-	    $notes,$abstract,$mime,$lang,
-	    $creationdate,$lastrevisiondate,$owner,$copyright
-	    )=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));
-	my $shortabstract=$abstract;
-	$shortabstract=substr($abstract,0,200) if length($abstract)>200;
-	$compiledresult.=<<END;
+	foreach my $result (@results) {
+	    my ($title,$author,$subject,$url,$keywords,$version,
+		$notes,$abstract,$mime,$lang,
+		$creationdate,$lastrevisiondate,$owner,$copyright
+		)=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));
+	    my $shortabstract=$abstract;
+	    $shortabstract=substr($abstract,0,200) if length($abstract)>200;
+	    $compiledresult.=<<END;
 <p>
 END
-	$compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
+            $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>
 END
-        $compiledresult.=<<END;
-<b>URL: </b> <A HREF="$ENV{'HTTP_HOST'}/$url" TARGET='search_preview'>$url</A>
+            $compiledresult.=<<END;
+<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
 <br>
 <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>
@@ -481,31 +500,31 @@ END
 <b>Repository Location:</b> $hostname
 </p>
 END
-}
+        }
 
-    unless ($compiledresult) {
-	$compiledresult="There were no results that matched your query";
-    }
+	unless ($compiledresult) {
+	    $compiledresult="There were no results that matched your query";
+	}
 
-    # 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;
+	# 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);
+            }
+	} (keys %ENV);
 
-    $r->print(<<BEGINNING);
+	$r->print(<<BEGINNING);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
 BEGINNING
-    $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
+        $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
 <script>
     function select_data(title,url) {
 	changeTitle(title);
@@ -523,7 +542,7 @@ BEGINNING
     }
 </script>
 SCRIPT
-    $r->print(<<RESULTS);
+        $r->print(<<RESULTS);
 </head>
 <body bgcolor="#ffffff">
 <img align=right src=/adm/lonIcons/lonlogos.gif>
@@ -537,15 +556,14 @@ $persistent
 <hr>
 <h3>Search Query</h3>
 <p>
-<b>Basic search:</b> $expression
+<b>Basic search:</b> $ENV{'form.basicexp'}
 </p>
 <h3>Search Results</h3>
 $compiledresult
 </body>
 </html>
 RESULTS
-
-    return OK;
+    }
 }
 
 1;