--- loncom/interface/lonsearchcat.pm	2001/03/13 15:36:15	1.8
+++ loncom/interface/lonsearchcat.pm	2001/03/14 16:57:04	1.10
@@ -111,11 +111,11 @@ END
 <br>
 between:
 CREATIONDATESTART
-    $scrout.=&dateboxes('creationdatestart');
+    $scrout.=&dateboxes('creationdatestart',1,1,1976);
     $scrout.=<<CREATIONDATEEND;
 and:
 CREATIONDATEEND
-    $scrout.=&dateboxes('creationdateend');
+    $scrout.=&dateboxes('creationdateend',12,31,2051);
     $scrout.="</p>";
 
     $scrout.=<<LASTREVISIONDATESTART;
@@ -124,11 +124,11 @@ CREATIONDATEEND
 </b></font>
 <br>between:
 LASTREVISIONDATESTART
-    $scrout.=&dateboxes('lastrevisiondatestart');
+    $scrout.=&dateboxes('lastrevisiondatestart',1,1,1976);
     $scrout.=<<LASTREVISIONDATEEND;
 and:
 LASTREVISIONDATEEND
-    $scrout.=&dateboxes('lastrevisiondateend');
+    $scrout.=&dateboxes('lastrevisiondateend',12,31,2051);
     $scrout.='</p>';
 
     $scrout.=&searchphrasefield('Limit by publisher/owner','owner',
@@ -200,10 +200,10 @@ END
 }
 
 sub dateboxes {
-    my ($name)=@_;
+    my ($name,$defaultmonth,$defaultday,$defaultyear)=@_;
     return<<END;
 <select name="${name}_month">
-<option value="01"> </option>
+<option value="$defaultmonth"> </option>
 <option value="01">January</option>
 <option value="02">February</option>
 <option value="03">March</option>
@@ -218,7 +218,7 @@ sub dateboxes {
 <option value="12">December</option>
 </select>
 <select name="${name}_day">
-<option value="1"> </option>
+<option value="$defaultday"> </option>
 <option value=1>1</option>
 <option value=2>2</option>
 <option value=3>3</option>
@@ -252,7 +252,7 @@ sub dateboxes {
 <option value=31>31</option>
 </select>
 <select name="${name}_year">
-<option value=1976> </option>
+<option value="$defaultyear"> </option>
 <option value=1976>1976</option>
 <option value=1977>1977</option>
 <option value=1978>1978</option>
@@ -377,7 +377,8 @@ sub basicsearch {
     my $compiledresult='';
 
     foreach my $result (@results) {
-	my ($title,$author,$subject,$notes,$abstract,$mime,$lang,
+	my ($title,$author,$subject,$url,$keywords,$version,
+	    $notes,$abstract,$mime,$lang,
 	    $creationdate,$lastrevisiondate,$owner,$copyright
 	    )=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));
 	my $shortabstract=$abstract;
@@ -387,15 +388,16 @@ sub basicsearch {
 END
 	$compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
-onClick="javascript:select_data('$title','/res/msu/shh1/poobah1.html')">
+onClick="javascript:select_data('$title','$url')">
 </font>
 <br>
 END
         $compiledresult.=<<END;
+<b>URL: </b> $url<br>
 <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>
 <b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> <i>not available yet</i><br>
+<b>Keyword(s):</b> $keywords<br>
 <b>Notes:</b> $notes<br>
 <b>Abstract:</b> $shortabstract<br>
 <b>MIME Type:</b> $mimetag{$mime}<br>
@@ -413,8 +415,19 @@ END
 	$compiledresult="There were no results that matched your query";
     }
 
-# Question... allow to ask question from this page, or click to
-# search again?
+    # 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);
+
     $r->print(<<BEGINNING);
 <html>
 <head>
@@ -444,7 +457,9 @@ SCRIPT
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Search Catalog</h1>
 <form method="post" action="/adm/searchcat">
-<a href=''>Revise search request</a>
+<input type='button' value='Revise search request'
+onClick='this.form.submit();'>
+$persistent
 <hr>
 <h3>Search Query</h3>
 <p>
