--- loncom/interface/lonsearchcat.pm	2002/06/24 16:45:22	1.128
+++ loncom/interface/lonsearchcat.pm	2002/07/08 20:35:36	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.128 2002/06/24 16:45:22 harris41 Exp $
+# $Id: lonsearchcat.pm,v 1.139 2002/07/08 20:35:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,7 +107,7 @@ button that closes the search window
 
 =item $importbutton
 
-button to take the selecte results and go to group sorting
+button to take the select results and go to group sorting
 
 =item %hash   
 
@@ -118,6 +118,13 @@ The ubiquitous database hash
 The full path to the (temporary) search database file.  This is set and
 used in &handler() and is also used in &output_results().
 
+=item %Views
+
+Hash which associates an output view description with the function
+that produces it.  Adding a new view type should be as easy as
+adding a line to the definition of this hash and making sure the function
+takes the proper parameters.
+
 =back 
 
 =cut
@@ -133,6 +140,12 @@ my $importbutton; # button to take the s
 my %hash;     # database hash
 my $diropendb = "";    # db file
 
+#             View Description           Function Pointer
+my %Views = ("Detailed Citation View" => \&detailed_citation_view,
+             "Summary View"           => \&summary_view,
+             "Fielded Format"         => \&fielded_format_view,
+             "XML/SGML"               => \&xml_sgml_view );
+
 ######################################################################
 ######################################################################
 
@@ -212,28 +225,49 @@ END
 onClick='javascript:select_group()'>
 END
     }
-    $hidden .= <<END;
-<input type='hidden' name='mode'    value='$ENV{'form.mode'}'>
-<input type='hidden' name='form'    value='$ENV{'form.form'}'>
-<input type='hidden' name='element' value='$ENV{'form.element'}'>
-<input type='hidden' name='date' value='2'>
-END
+    $hidden .= &make_persistent({ "form.mode"    => $ENV{'form.mode'},
+                                  "form.form"    => $ENV{'form.form'},
+                                  "form.element" => $ENV{'form.element'},
+                                  "form.date"    => 2 });
     ##
     ##  What are we doing?
     ##
-    if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
-        # Perform basic search and give results
-	return &basicsearch($r,\%ENV,$hidden);
-    } elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
-        # Perform advanced search and give results
-	return &advancedsearch($r,\%ENV,$hidden);
-    } elsif ($ENV{'form.reqinterface'} eq 'advanced') {
+    my $searchtype;
+    $searchtype = 'Basic'    if ($ENV{'form.basicsubmit'}    eq 'SEARCH');
+    $searchtype = 'Advanced' if ($ENV{'form.advancedsubmit'} eq 'SEARCH');
+    if ($searchtype) {
+        # We are running a search
+        my ($query,$customquery,$customshow,$libraries) = 
+            (undef,undef,undef,undef);
+        if ($searchtype eq 'Basic') {
+            $query = &parse_basic_search($r);
+        } elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
+            ($query,$customquery,$customshow,$libraries) 
+                = &parse_advanced_search($r);
+            return OK if (! defined($query));
+        }
+        # 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).
+        $r->rflush();
+        my $reply=&Apache::lonnet::metadata_query($query,$customquery,
+                                               $customshow,$libraries);
+        &output_results($searchtype,$r,$reply,$hidden);
+    } else {
+        #
+        # We need to get information to search on
+        #
+        # Set the default view if it is not already set.
+        if (!defined($ENV{'form.viewselect'})) {
+            $ENV{'form.viewselect'} ="Detailed Citation View";
+        }
         # Output the advanced interface
-        $r->print(&advanced_search_form($closebutton,$hidden));
-        return OK;
-    } else { 
-        # Output normal search interface
-        $r->print(&basic_search_form($closebutton,$hidden));
+        if ($ENV{'form.reqinterface'} eq 'advanced') {
+            $r->print(&advanced_search_form($closebutton,$hidden));
+        } else { 
+            # Output normal search interface
+            $r->print(&basic_search_form($closebutton,$hidden));
+        }
     }
     return OK;
 } 
@@ -273,7 +307,8 @@ sub basic_search_form{
 $hidden
 <h3>Basic Search</h3>
 <p>
-Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below.
+Enter terms or phrases separated by AND, OR, or NOT 
+then press SEARCH below.
 </p>
 <p>
 <table>
@@ -283,21 +318,18 @@ ENDDOCUMENT
         '&nbsp;';
 #    $scrout.=&simplecheckbox('allversions',$ENV{'form.allversions'});
 #    $scrout.='<font color="#800000">Search historic archives</font>';
-    $scrout.=<<ENDDOCUMENT;
+    $scrout.=<<END;
 </td><td><a href="/adm/searchcat?reqinterface=advanced">Advanced Search</a></td></tr></table>
 </p>
 <p>
 &nbsp;<input type="submit" name="basicsubmit" value='SEARCH' />&nbsp;
 $closebutton
-<!-- basic view selection -->
-<select name='basicviewselect'>
-<option value='Detailed Citation View' selected="true">
-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 of basic view selection -->
+END
+    $scrout.=&selectbox(undef,'viewselect',
+			$ENV{'form.viewselect'},
+			undef,undef,undef,
+			sort(keys(%Views)));
+    $scrout.=<<ENDDOCUMENT;
 <input type="button" value="HELP" onClick="openhelp()" />
 </p>
 </form>
@@ -322,6 +354,17 @@ Returns a scalar which holds html for th
 
 sub advanced_search_form{
     my ($closebutton,$hidden) = @_;
+    my $advanced_buttons = <<"END";
+<p>
+<input type="submit" name="advancedsubmit" value='SEARCH' />
+<input type="reset" name="reset" value='RESET' />
+$closebutton
+<input type="button" value="HELP" onClick="openhelp()" />
+</p>
+END
+    if (!defined($ENV{'form.viewselect'})) {
+        $ENV{'form.viewselect'} ="Detailed Citation View";
+    }
     my $scrout=<<"ENDHEADER";
 <html>
 <head>
@@ -336,35 +379,76 @@ sub advanced_search_form{
 </head>
 <body bgcolor="#FFFFFF">
 <img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+<h1>Advanced Catalog Search</h1>
+<hr />
+Enter terms or phrases separated by search operators 
+such as AND, OR, or NOT.<br />
 <form method="post" action="/adm/searchcat">
+$advanced_buttons
 $hidden
-<hr />
-<h3>Advanced Search</h3>
+<table>
+<tr><td><font color="#800000" face="helvetica"><b>VIEW:</b></font></td>
+<td>
 ENDHEADER
-    $scrout.=&searchphrasefield('Limit by title','title',
-			$ENV{'form.title'});
-    $scrout.=&searchphrasefield('Limit by author','author',
-			$ENV{'form.author'});
-    $scrout.=&searchphrasefield('Limit by subject','subject',
-			$ENV{'form.subject'});
-    $scrout.=&searchphrasefield('Limit by keywords','keywords',
-			$ENV{'form.keywords'});
-    $scrout.=&searchphrasefield('Limit by URL','url',
-			$ENV{'form.url'});
-#    $scrout.=&searchphrasefield('Limit by version','version',
-#			$ENV{'form.version'});
-    $scrout.=&searchphrasefield('Limit by notes','notes',
-			$ENV{'form.notes'});
-    $scrout.=&searchphrasefield('Limit by abstract','abstract',
-			$ENV{'form.abstract'});
-    $ENV{'form.mime'}='any' unless length($ENV{'form.mime'});
-    $scrout.=&selectbox('Limit by MIME type','mime',
-			$ENV{'form.mime'},
-			'any','Any type',
-			\&{Apache::loncommon::filedescriptionex},
-			(&Apache::loncommon::fileextensions));
+    $scrout.=&selectbox(undef,'viewselect',
+			$ENV{'form.viewselect'},
+			undef,undef,undef,
+			sort(keys(%Views)));
+    $scrout.="</td></tr>\n";
+    $scrout.=&searchphrasefield('title',   'title'   ,$ENV{'form.title'});
+    $scrout.=&searchphrasefield('author',  'author'  ,$ENV{'form.author'});
+    $scrout.=&searchphrasefield('subject', 'subject' ,$ENV{'form.subject'});
+    $scrout.=&searchphrasefield('keywords','keywords',$ENV{'form.keywords'});
+    $scrout.=&searchphrasefield('URL',     'url'     ,$ENV{'form.url'});
+    $scrout.=&searchphrasefield('notes',   'notes'   ,$ENV{'form.notes'});
+    $scrout.=&searchphrasefield('abstract','abstract',$ENV{'form.abstract'});
+    # Hack - an empty table row.
+    $scrout.="<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
+    $scrout.=&searchphrasefield('file<br />extension','mime',
+                        $ENV{'form.mime'});
+    $scrout.="<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
+    $scrout.=&searchphrasefield('publisher<br />owner','owner',
+				$ENV{'form.owner'});
+    $scrout.="</table>\n";
+    $ENV{'form.category'}='any' unless length($ENV{'form.category'});
+    $scrout.=&selectbox('File Category','category',
+			$ENV{'form.category'},
+			'any','Any category',
+			undef,
+			(&Apache::loncommon::filecategories()));
     $ENV{'form.language'}='any' unless length($ENV{'form.language'});
+    #----------------------------------------------------------------
+    # Allow restriction to multiple domains.
+    #   I make the crazy assumption that there will never be a domain 'any'.
+    #
+    $ENV{'form.domains'} = 'any' if (! exists($ENV{'form.domains'}));
+    my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}} 
+                           :  ($ENV{'form.domains'}) );
+    my %domain_hash = ();
+    foreach (@allowed_domains) {
+        $domain_hash{$_}++;
+    }
+    my @domains =&Apache::loncommon::get_domains();
+    # adjust the size of the select box
+    my $size = 4;
+    my $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
+    # standalone machines do not get to choose a domain to search.
+    if ((scalar @domains) == 1) {
+        $scrout .='<input type="hidden" name="domains" value="any" />'."\n";
+    } else {
+        $scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
+            'DOMAINS</b></font><br />'.
+                '<select name="domains" size="'.$size.'" multiple>'."\n".
+                    '<option name="any" value="any" '.
+                        ($domain_hash{'any'}? 'selected ' :'').
+                        '>all domains</option>'."\n";
+        foreach my $dom (sort @domains) {
+            $scrout.="<option name=\"$dom\" ".
+                ($domain_hash{$dom} ? 'selected ' :'').">$dom</option>\n";
+        }
+        $scrout.="</select>\n";
+    }
+    #----------------------------------------------------------------
     $scrout.=&selectbox('Limit by language','language',
 			$ENV{'form.language'},'any','Any Language',
 			\&{Apache::loncommon::languagedescription},
@@ -410,8 +494,6 @@ LASTREVISIONDATEEND
 			$ENV{'form.lastrevisiondateend_year'},
 			);
     $scrout.='</p>';
-    $scrout.=&searchphrasefield('Limit by publisher/owner','owner',
-				$ENV{'form.owner'});
     $ENV{'form.copyright'}='any' unless length($ENV{'form.copyright'});
     $scrout.=&selectbox('Limit by copyright/distribution','copyright',
 			 $ENV{'form.copyright'},
@@ -440,21 +522,7 @@ in a fielded listing for each record res
 CUSTOMSHOW
     $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
     $scrout.=<<ENDDOCUMENT;
-<p>
-<input type="submit" name="advancedsubmit" value='SEARCH' />
-<input type="reset" name="reset" value='RESET' />
-$closebutton
-<!-- advance view select -->
-<select name='advancedviewselect'>
-<option value='Detailed Citation View' selected="true">
-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 of advanced view select -->
-<input type="button" value="HELP" onClick="openhelp()" />
-</p>
+$advanced_buttons
 </form>
 </body>
 </html>
@@ -479,16 +547,19 @@ to be somewhat persistent.
 ######################################################################
 
 sub make_persistent {
+    my %save = %{shift()};
     my $persistent='';
-    foreach (keys %ENV) {
+    foreach (keys %save) {
 	if (/^form\./ && !/submit/) {
 	    my $name=$_;
-	    my $key=$name;
-	    $ENV{$key}=~s/\'//g; # do not mess with html field syntax
+            my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
 	    $name=~s/^form\.//;
-	    $persistent.=<<END;
-<input type="hidden" name="$name" value="$ENV{$key}" />
+            foreach (@values) {
+                s/\"/\'/g; # do not mess with html field syntax
+                $persistent.=<<END;
+<input type="hidden" name="$name" value="$_" />
 END
+            }
         }
     }
     return $persistent;
@@ -534,7 +605,47 @@ the day, month, and year.
 
 =item &selectbox()
 
-Returns html selection form.
+Returns a scalar containing an html <select> form.  
+
+Inputs: 
+
+=over 4
+
+=item $title 
+
+Printed above the select box, in uppercase.  If undefined, only a select
+box will be returned, with no additional html.
+
+=item $name 
+
+The name element of the <select> tag.
+
+=item $default 
+
+The default value of the form.  Can be $anyvalue, or in @idlist.
+
+=item $anyvalue 
+
+The <option value="..."> used to indicate a default of 
+none of the values.  Can be undef.
+
+=item $anytag 
+
+The text associate with $anyvalue above.
+
+=item $functionref 
+
+Each element in @idlist will be passed as a parameter 
+to the function referenced here.  The return value of the function should
+be a scalar description of the items.  If this value is undefined the 
+description of each item in @idlist will be the item name.
+
+=item @idlist 
+
+The items to be selected from.  One of these or $anyvalue will be the 
+value returned by the form element, $ENV{form.$name}.
+
+=back
 
 =back 
 
@@ -553,19 +664,16 @@ sub simpletextfield {
 sub simplecheckbox {
     my ($name,$value)=@_;
     my $checked='';
-    $checked="CHECKED" if $value eq 'on';
+    $checked="checked" if $value eq 'on';
     return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';
 }
 
 sub searchphrasefield {
     my ($title,$name,$value)=@_;
-    my $instruction=<<END;
-Enter terms or phrases separated by search operators such as AND, OR, or NOT.
-END
     my $uctitle=uc($title);
-    return "\n".
-        '<p><font color="#800000" face="helvetica"><b>'.$uctitle.':</b>'.
-        "</FONT> $instruction<br />".&simpletextfield($name,$value,80);
+    return '<tr><td><font color="#800000" face="helvetica">'.
+        '<b>'.$uctitle.':&nbsp;</b></font></td><td>'.
+                &simpletextfield($name,$value,50)."</td></tr>\n";
 }
 
 sub dateboxes {
@@ -613,21 +721,27 @@ END
 }
 
 sub selectbox {
-    my ($title,$name,$value,$anyvalue,$anytag,$functionref,@idlist)=@_;
-    my $uctitle=uc($title);
-    my $selout="\n".'<p><font color="#800000" face="helvetica">'.
-        '<b>'.$uctitle.':</b></font><br /><select name="'.$name.'">';
-    foreach ($anyvalue,@idlist) {
+    my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
+    if (! defined($functionref)) { $functionref = sub { $_[0]}; }
+    my $selout='';
+    if (defined($title)) {
+        my $uctitle=uc($title);
+        $selout="\n".'<p><font color="#800000" face="helvetica">'.
+            '<b>'.$uctitle.': </b></font>';
+    }
+    $selout .= '<select name="'.$name.'">';
+    unshift @idlist,$anyvalue if (defined($anyvalue));
+    foreach (@idlist) {
         $selout.='<option value="'.$_.'"';
-        if ($_ eq $value and !/^any$/) {
+        if ($_ eq $default and !/^any$/) {
 	    $selout.=' selected >'.&{$functionref}($_).'</option>';
 	}
-	elsif ($_ eq $value and /^$anyvalue$/) {
+	elsif ($_ eq $default and /^$anyvalue$/) {
 	    $selout.=' selected >'.$anytag.'</option>';
 	}
         else {$selout.='>'.&{$functionref}($_).'</option>';}
     }
-    return $selout.'</select>';
+    return $selout.'</select>'.(defined($title)?'</p>':' ');
 }
 
 ######################################################################
@@ -635,17 +749,28 @@ sub selectbox {
 
 =pod 
 
-=item &advancedsearch()
+=item &parse_advanced_search()
+
+Parse advanced search form and return the following:
+
+=over 4
+
+=item $query Scalar containing an SQL query.
+
+=item $customquery Scalar containing a custom query.
 
-Parse advanced search results.
+=item $customshow Scalar containing commands to show custom metadata.
+
+=item $libraries_to_query Reference to array of domains to search.
+
+=back
 
 =cut
 
 ######################################################################
 ######################################################################
-sub advancedsearch {
-    my ($r,$envhash,$hidden)=@_;
-    my %ENV=%{$envhash};
+sub parse_advanced_search {
+    my ($r)=@_;
     my $fillflag=0;
     # Clean up fields for safety
     for my $field ('title','author','subject','keywords','url','version',
@@ -656,7 +781,7 @@ sub advancedsearch {
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year',
 		   'notes','abstract','mime','language','owner',
-		   'custommetadata','customshow') {
+		   'custommetadata','customshow','category') {
 	$ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
     }
     foreach ('mode','form','element') {
@@ -665,6 +790,12 @@ sub advancedsearch {
 	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
 	$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
     }
+    # Preprocess the category form element.
+    if ($ENV{'form.category'} ne 'any') {
+        my @extensions = &Apache::loncommon::filecategorytypes
+            ($ENV{'form.category'});
+        $ENV{'form.mime'} = join ' OR ',@extensions;
+    }
     # Check to see if enough information was filled in
     for my $field ('title','author','subject','keywords','url','version',
 		   'notes','abstract','mime','language','owner',
@@ -675,25 +806,26 @@ sub advancedsearch {
     }
     unless ($fillflag) {
 	&output_blank_field_error($r);
-	return OK;
+	return ;
     }
     # Turn the form input into a SQL-based query
     my $query='';
     my @queries;
     # Evaluate logical expression AND/OR/NOT phrase fields.
     foreach my $field ('title','author','subject','notes','abstract','url',
-		       'keywords','version','owner') {
+		       'keywords','version','owner','mime') {
 	if ($ENV{'form.'.$field}) {
 	    push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
-	}
+        }
+    }
+    # I dislike the hack below.
+    if ($ENV{'form.category'}) {
+        $ENV{'form.mime'}='';
     }
     # Evaluate option lists
     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'}\")";
     }
@@ -715,49 +847,53 @@ sub advancedsearch {
     # Test to see if date windows are legitimate
     if ($datequery=~/^Incorrect/) {
 	&output_date_error($r,$datequery);
-	return OK;
+	return ;
     }
     elsif ($datequery) {
 	push @queries,$datequery;
     }
     # Process form information for custom metadata querying
-    my $customquery='';
+    my $customquery=undef;
     if ($ENV{'form.custommetadata'}) {
 	$customquery=&build_custommetadata_query('custommetadata',
 				      $ENV{'form.custommetadata'});
     }
-    my $customshow='';
+    my $customshow=undef;
     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).
+    ## ---------------------------------------------------------------
+    ## Deal with restrictions to given domains
+    ## 
+    my $libraries_to_query = undef;
+    # $ENV{'form.domains'} can be either a scalar or an array reference.
+    # We need an array.
+    my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}} 
+                           :  ($ENV{'form.domains'}) );
+    my %domain_hash = ();
+    foreach (@allowed_domains) {
+        $domain_hash{$_}++;
+    }
+    foreach (keys(%Apache::lonnet::libserv)) {
+        if ($_ eq 'any') {
+            $libraries_to_query = undef;
+            last;
+        }
+        if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
+            push @$libraries_to_query,$_;
+        }
+    }
+    #
     if (@queries) {
 	$query=join(" AND ",@queries);
 	$query="select * from metadata where $query";
-	my $reply; # reply hash reference
-	unless ($customquery or $customshow) {
-	    $reply=&Apache::lonnet::metadata_query($query);
-	}
-	else {
-	    $reply=&Apache::lonnet::metadata_query($query,
-						   $customquery,$customshow);
-	}
-	&output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
-        return OK;
     } elsif ($customquery) {
-	my $reply; # reply hash reference
-	$reply=&Apache::lonnet::metadata_query('',
-					       $customquery,$customshow);
-	&output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
-        return OK;
+        $query = '';
     }
-    # should not get to this point
-    return 'Error.  Should not have gone to this point.';
+    return ($query,$customquery,$customshow,$libraries_to_query);
 }
 
 ######################################################################
@@ -765,17 +901,16 @@ sub advancedsearch {
 
 =pod 
 
-=item &basicsearch() 
+=item &parse_basic_search() 
 
-Parse basic search form.
+Parse the basic search form and return a scalar containing an sql query.
 
 =cut
 
 ######################################################################
 ######################################################################
-sub basicsearch {
-    my ($r,$envhash,$hidden)=@_;
-    my %ENV=%{$envhash};
+sub parse_basic_search {
+    my ($r)=@_;
     # Clean up fields for safety
     for my $field ('basicexp') {
 	$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g;
@@ -801,16 +936,7 @@ sub basicsearch {
     $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)
-#    &Apache::lonnet::logthis("metadata query started:".time);
-    my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);
-#    &Apache::lonnet::logthis("metadata query finished:".time);
-    # Output search results
-
-    &output_results('Basic',$r,$envhash,$query,$reply,$hidden);
-
-    return OK;
+    return 'select * from metadata where '.$query;
 }
 
 
@@ -1000,29 +1126,39 @@ contacted, etc.)
 sub output_results {
 #    &Apache::lonnet::logthis("output_results:".time);
     my $fnum; # search result counter
-    my ($mode,$r,$envhash,$query,$replyref,$hidden)=@_;
-    my %ENV=%{$envhash};
+    my ($mode,$r,$replyref,$hidden)=@_;
     my %rhash=%{$replyref};
     my $compiledresult='';
     my $timeremain=300; # (seconds)
     my $elapsetime=0;
     my $resultflag=0;
     my $tflag=1;
+    ##
+    ## Set viewing function
+    ##
+    my $viewfunction = $Views{$ENV{'form.viewselect'}};
+    if (!defined($viewfunction)) {
+        $r->print("Internal Error - Bad view selected.\n");
+        $r->rflush();
+        return;
+    }
     #
     # make query information persistent to allow for subsequent revision
-    my $persistent=&make_persistent();
-    # spit out the generic header
-    $r->print(&search_results_header());
+    my $persistent=&make_persistent(\%ENV);
+    #
+    # Begin producing output
+    $r->print(&search_results_header($mode));
     $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>
-CATALOGBEGIN
-        $r->print(<<CATALOGCONTROLS);
-<form name='results' method="post" action="/adm/searchcat">
+    my $action = "/adm/searchcat";
+    if ($mode eq 'Basic') { 
+        $action .= "?reqinterface=basic";
+    } elsif ($mode eq 'Advanced') {
+        $action .= "?reqinterface=advanced";
+    }
+    $r->print(<<CATALOGCONTROLS);
+<form name='results' method="post" action="$action">
 $hidden
 <input type='hidden' name='acts' value='' />
 <input type='button' value='Revise search request'
@@ -1031,21 +1167,9 @@ $importbutton
 $closebutton
 $persistent
 <hr />
-<h3>Search Query</h3>
 CATALOGCONTROLS
     #
-    # Remind them what they searched for
-    #
-    if ($mode eq 'Basic') {
-	$r->print('<p><b>Basic search:</b> '.$ENV{'form.basicexp'}.'</p>');
-    } elsif ($mode eq 'Advanced') {
-	$r->print('<p><b>Advanced search</b> '.$query.'</p>');
-    }
-    $r->print('<h3>Search Results</h3>');
-    $r->rflush();
-    #
     # make the pop-up window for status
-    #
     $r->print(&make_popwin(%rhash));
     $r->rflush();
     ##
@@ -1122,7 +1246,8 @@ CATALOGCONTROLS
 	} # end of if ($reply eq 'con_lost') else statement
         my %Fields = undef;     # Holds the data to be sent to the various 
                                 # *_view routines.
-        my ($extrashow,$customfields,$customhash) = &handle_custom_fields(\@results);
+        my ($extrashow,$customfields,$customhash) = 
+                                    &handle_custom_fields(\@results);
         my @customfields = @$customfields;
         my %customhash   = %$customhash;
 	untie %hash if (keys %hash);
@@ -1139,6 +1264,21 @@ CATALOGCONTROLS
 		chomp $result;
 		next unless $result;
                 %Fields = &parse_raw_result($result,$rkey);
+                #
+                # Check copyright tags and skip results the user cannot use
+                my (undef,undef,$resdom,$resname) = split('/',$Fields{'url'});
+                # Check for priv
+                if (($Fields{'copyright'} eq 'priv') && 
+                    (($ENV{'user.name'} ne $resname) &&
+                     ($ENV{'user.domain'} ne $resdom))) {
+                    next;
+                }
+                # Check for domain
+                if (($Fields{'copyright'} eq 'domain') &&
+                    ($ENV{'user.domain'} ne $resdom)) {
+                    next;
+                }
+                #
 		$Fields{'extrashow'}=$extrashow;
 		if ($extrashow) {
 		    foreach my $field (@customfields) {
@@ -1147,9 +1287,6 @@ CATALOGCONTROLS
                         $Fields{'extrashow'}=~s/\<\!\-\- $field \-\-\>/ $value/g;
                     }
                 }
-                if ($compiledresult or $servercount!=$servernum) {
-                    $compiledresult.="<hr align='left' width='200' noshade />";
-                }
                 $compiledresult.="\n<p>\n";
                 if ($ENV{'form.catalogmode'} eq 'interactive') {
                     my $titleesc=$Fields{'title'};
@@ -1176,29 +1313,11 @@ END
 # <input type="hidden" name="url$fnum" value="$url" />
                     $fnum++;
 		}
-	        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 => $rkey );
-		}
-                elsif ($viewselect eq 'Summary View') {
-		    $compiledresult.=&summary_view
-                        (%Fields, hostname => $rkey );
-	        }
-                elsif ($viewselect eq 'Fielded Format') {
-		    $compiledresult.=&fielded_format_view
-                        (%Fields, hostname => $rkey );
-	        }
-                elsif ($viewselect eq 'XML/SGML') {
-		    $compiledresult.=&xml_sgml_view
-                        (%Fields, hostname => $rkey );
-		}
+                # Render the result into html
+                $compiledresult.= &$viewfunction(%Fields, hostname => $rkey );
+                if ($compiledresult or $servercount!=$servernum) {
+                    $compiledresult.="<hr align='left' width='200' noshade />";
+                }
             }
             untie %hash;
         }
@@ -1206,14 +1325,15 @@ END
 	    $resultflag=1;
             $r->print($compiledresult);
 	}
-        my $percent=sprintf('%3.0f',($servercount/$servernum*100));
       } # End of foreach loop over servers remaining
     }   # End of big loop - while($serversleft && $timeremain)
     unless ($resultflag) {
         $r->print("\nThere were no results that matched your query\n");
     }
-#    $r->print('<script type="text/javascript">'.'popwin.close()</script>'."\n"); $r->rflush(); 
+    $r->print('<script type="text/javascript">'.'popwin.close()</script>'.
+              "\n"); 
     $r->print("</body>\n</html>\n");
+    $r->rflush(); 
     return;
 }
 
@@ -1277,6 +1397,9 @@ sub parse_raw_result {
         &Apache::loncommon::copyrightdescription($Fields{'copyright'});
     $Fields{'mimetag'} =
         &Apache::loncommon::filedescription($Fields{'mime'});
+    if ($Fields{'author'}=~/^(\s*|error)$/) {
+        $Fields{'author'}="Unknown Author";
+    }
     # Put spaces in the keyword list, if needed.
     $Fields{'keywords'}=~ s/,([A-z])/, $1/g; 
     if ($Fields{'title'}=~ /^\s*$/ ) { 
@@ -1347,10 +1470,18 @@ sub handle_custom_fields {
 
 =item &search_results_header
 
-Output the proper javascript code to deal with different calling modes.
+Output the proper html headers and javascript code to deal with different 
+calling modes.
 
-Takes inputs directly from from %ENV.  The following environment variables
-are checked:
+Takes most inputs directly from %ENV, except $mode.  
+
+=over 4
+
+=item $mode is either (at this writing) 'Basic' or 'Advanced'
+
+=back
+
+The following environment variables are checked:
 
 =over 4
 
@@ -1373,12 +1504,20 @@ Checked for existance & 'edit' mode.
 ######################################################################
 ######################################################################
 sub search_results_header {
+    my ($mode) = @_;
+    $mode = lc($mode);
+    my $title;
+    if ($mode eq 'advanced') {
+        $title = "Advanced Search Results";
+    } elsif ($mode eq 'basic') {
+        $title = "Basic Search Results";
+    }
     my $result = '';
     # output beginning of search page
     $result.=<<BEGINNING;
 <html>
 <head>
-<title>The LearningOnline Network with CAPA</title>
+<title>$title</title>
 BEGINNING
     # conditional output of script functions dependent on the mode in
     # which the search was invoked
@@ -1461,6 +1600,12 @@ SCRIPT
     }
 </script>
 SCRIPT
+    $result.=<<END;
+</head>
+<body bgcolor="#ffffff">
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<h1>$title</h1>
+END
     return $result;
 }
 
@@ -1486,16 +1631,13 @@ sub make_popwin {
     # rows of 10 each.  No longer used to index images.
     my $sn=1;
     foreach 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 ";
+	    $hc="BAD CONNECTION ";
 	}
 	else {
 	    $hc="'+\"'\"+\"+hc['$sk']+\"+\"'\"+'";
@@ -1584,30 +1726,17 @@ extra custom metadata to show.
 sub detailed_citation_view {
     my %values = @_;
     my $result=<<END;
-<i>$values{'owner'}</i>, last revised $values{'lastrevisiondate'}
 <h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
     target='search_preview'>$values{'title'}</a></h3>
-<h3>$values{'author'}</h3>
-</p>
 <p>
-<b>Subject:</b> $values{'subject'}<br />
-<b>Keyword(s):</b> $values{'keywords'}<br />
-<b>Notes:</b> $values{'notes'}<br />
-<b>MIME Type:</b>
-END
-    $result.=&Apache::loncommon::filedescription($values{'mime'});
-    $result.=<<END;
-<br />
-<b>Language:</b> 
-END
-    $result.=&Apache::loncommon::languagedescription($values{'lang'});
-    $result.=<<END;
-<br />
-<b>Copyright/Distribution:</b> 
-END
-    $result.=&Apache::loncommon::copyrightdescription($values{'copyright'});
-    $result.=<<END;
-<br />
+<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
+
+<b>Subject:       </b> $values{'subject'}<br />
+<b>Keyword(s):    </b> $values{'keywords'}<br />
+<b>Notes:         </b> $values{'notes'}<br />
+<b>MIME Type:     </b> $values{'mimetag'}<br />
+<b>Language:      </b> $values{'language'}<br />
+<b>Copyright/Distribution:</b> $values{'cprtag'}<br />
 </p>
 $values{'extrashow'}
 <p>
@@ -1761,7 +1890,7 @@ sub filled {
 sub output_blank_field_error {
     my ($r)=@_;
     # make query information persistent to allow for subsequent revision
-    my $persistent=&make_persistent();
+    my $persistent=&make_persistent(\%ENV);
 
     $r->print(<<BEGINNING);
 <html>
@@ -1807,7 +1936,7 @@ Output a full html page with an error me
 sub output_date_error {
     my ($r,$message)=@_;
     # make query information persistent to allow for subsequent revision
-    my $persistent=&make_persistent();
+    my $persistent=&make_persistent(\%ENV);
 
     $r->print(<<RESULTS);
 <html>