--- loncom/interface/lonpickcourse.pm	2003/03/26 04:57:04	1.2
+++ loncom/interface/lonpickcourse.pm	2003/03/26 19:34:42	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.2 2003/03/26 04:57:04 www Exp $
+# $Id: lonpickcourse.pm,v 1.4 2003/03/26 19:34:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,10 +54,12 @@ ENDDOCUMENT
                  'sincefilter','form','cnumelement','cdomelement']);
     my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;
-    unless ($domainfilter) { $domainfilter='.'; }
+    unless ($domainfilter) { $domainfilter=''; }
+    my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter,
+                                                          'domainfilter',1);
     my $descriptfilter=$ENV{'form.descriptfilter'};
-    $descriptfilter=~s/\W//g;
-    unless ($descriptfilter) { $descriptfilter='.'; }
+    $descriptfilter=~s/[^\w\s]//g;
+    unless ($descriptfilter) { $descriptfilter=''; }
     my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/\D//g;
     unless ($sincefilter) { $sincefilter=0; }
@@ -75,15 +77,30 @@ function gochoose(cname,cdom) {
     self.close();
 }
 </script>
+<form method="post">
+<br />
+Course Domain: $domainselectform
+<br />
+Course Description:
+<input type="text" name="descriptfilter" size="40" value="$descriptfilter" />
+<input type="submit" name="gosearch" value="Search" />
+</form>
+
 ENDSCRIPT
     $r->rflush();
 # ---------------------------------------------------------------- Get the data
+    unless ($descriptfilter) { $descriptfilter='.'; }
     my %courses=
      &Apache::lonnet::courseiddump($domainfilter,$descriptfilter,$sincefilter);
+    $r->print('<form>');
     foreach (keys %courses) {
-	$r->print($_.': '.$courses{$_}.'<br />');
+        my ($cdom,$cnum)=split(/\_/,$_);
+	$r->print('<input type="button" value="Select" onClick="gochoose('.
+		  "'".$cnum."','".$cdom."')".'" /> '.$courses{$_}.' ('.
+		  ($Apache::lonnet::domaindescription{$cdom}?
+                   $Apache::lonnet::domaindescription{$cdom}:$cdom).')<br />');
     }
-    $r->print('</body></html>');
+    $r->print('</form></body></html>');
     return OK;
 }