--- loncom/lond	2008/04/16 22:51:21	1.399
+++ loncom/lond	2008/06/30 03:59:23	1.406
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.399 2008/04/16 22:51:21 raeburn Exp $
+# $Id: lond,v 1.406 2008/06/30 03:59:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.399 $'; #' stupid emacs
+my $VERSION='$Revision: 1.406 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1535,11 +1535,15 @@ sub ls3_handler {
             &Failure($client,"refused\n","$cmd:$tail");
             return 1;
         }
-    } elsif (defined($alternate_root)) {
+    } elsif ($alternate_root ne '') {
         $dir_root = $alternate_root;
     }
-    if (defined($dir_root)) {
-        $ulsdir = $dir_root.'/'.$ulsdir;
+    if ($dir_root ne '') {
+        if ($ulsdir =~ /^\//) {
+            $ulsdir = $dir_root.$ulsdir;
+        } else {
+            $ulsdir = $dir_root.'/'.$ulsdir;
+        }
     }
     my $obs;
     my $rights;
@@ -1576,10 +1580,10 @@ sub ls3_handler {
         }
     } else {
         $ulsout='no_such_dir';
-   }
-   if ($ulsout eq '') { $ulsout='empty'; }
-   &Reply($client, \$ulsout, $userinput); # This supports debug logging.
-   return 1;
+    }
+    if ($ulsout eq '') { $ulsout='empty'; }
+    &Reply($client, \$ulsout, $userinput); # This supports debug logging.
+    return 1;
 }
 &register_handler("ls3", \&ls3_handler, 0, 1, 0);
 
@@ -3611,7 +3615,17 @@ sub put_course_id_hash_handler {
 #                            key, value pairs in the item's hash, or as a 
 #                            colon-separated list of (in order) description,
 #                            institutional code, and course owner.
-#    
+#                 selfenrollonly - filter by courses allowing self-enrollment  
+#                                  now or in the future (selfenrollonly = 1).
+#                 catfilter - filter by course category, assigned to a course 
+#                             using manually defined categories (i.e., not
+#                             self-cataloging based on onstitutional code).   
+#                 showhidden - include course in results even if course  
+#                              was set to be excluded from course catalog (DC only). 
+#                 caller -  if set to 'coursecatalog', courses set to be hidden
+#                           from course catalog will be excluded from results (unless
+#                           overridden by "showhidden".
+#
 #     $client  - The socket open on the client.
 # Returns:
 #    1     - Continue processing.
@@ -3622,7 +3636,8 @@ sub dump_course_id_handler {
     my $userinput = "$cmd:$tail";
 
     my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
-        $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly) =split(/:/,$tail);
+        $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden,
+        $caller) =split(/:/,$tail);
     my $now = time;
     if (defined($description)) {
 	$description=&unescape($description);
@@ -3663,6 +3678,9 @@ sub dump_course_id_handler {
     if (defined($regexp_ok)) {
         $regexp_ok=&unescape($regexp_ok);
     }
+    if (defined($catfilter)) {
+        $catfilter=&unescape($catfilter);
+    }
     my $unpack = 1;
     if ($description eq '.' && $instcodefilter eq '.' && $coursefilter eq '.' && 
         $typefilter eq '.') {
@@ -3693,20 +3711,35 @@ sub dump_course_id_handler {
                     $unesc_val{'inst_code'} = $items->{'inst_code'};
                     $unesc_val{'owner'} = $items->{'owner'};
                     $unesc_val{'type'} = $items->{'type'};
-                    $selfenroll_types = $items->{'selfenroll_types'};
-                    $selfenroll_end = $items->{'selfenroll_end_date'};
-                    if ($selfenrollonly) {
-                        next if (!$selfenroll_types);
-                        if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
-                            next;
-                        }
+                }
+                $selfenroll_types = $items->{'selfenroll_types'};
+                $selfenroll_end = $items->{'selfenroll_end_date'};
+                if ($selfenrollonly) {
+                    next if (!$selfenroll_types);
+                    if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
+                        next;
+                    }
+                }
+                if ($catfilter ne '') {
+                    next if ($items->{'categories'} eq '');
+                    my @categories = split('&',$items->{'categories'}); 
+                    next if ((@categories == 0) || 
+                             (!grep(/^\Q$catfilter\E$/,@categories)));
+                }
+                if ($caller eq 'coursecatalog') {
+                    if ($items->{'hidefromcat'} eq 'yes') {
+                        next if !$showhidden;
                     }
                 }
             } else {
+                next if ($catfilter ne '');
+                next if ($selfenrollonly); 
                 $is_hash =  0;
                 my @courseitems = split(/:/,$value);
                 $lasttime = pop(@courseitems);
-                next if ($lasttime<$since);
+                if ($hashref->{$lasttime_key} eq '') {
+                    next if ($lasttime<$since);
+                }
 	        ($val{'descr'},$val{'inst_code'},$val{'owner'},$val{'type'}) = @courseitems;
             }
             my $match = 1;