--- loncom/enrollment/localenroll.pm	2007/02/26 20:52:55	1.18
+++ loncom/enrollment/localenroll.pm	2007/07/25 20:43:48	1.21
@@ -1,6 +1,6 @@
 # functions to glue school database system into Lon-CAPA for 
 # automated enrollment
-# $Id: localenroll.pm,v 1.18 2007/02/26 20:52:55 raeburn Exp $
+# $Id: localenroll.pm,v 1.21 2007/07/25 20:43:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,11 @@ use strict;
 ################################
 # sub run
 # set this to return 1 if you want the auto enrollment to run
+#
+# Beginning with LON-CAPA version 2.4, use of this routine is
+# deprecated.  Whether or not Autoenroll.pl should run is set
+# by the Domain Coordinator via "Set domain configuration",
+# provided in the Domain Management section of the Main menu. 
 ################################
 
 sub run() {
@@ -507,7 +512,7 @@ sub allusers_info {
 ###############################
 # sub get_userinfo
 #
-# Incoming data: four required arguments and two optional arguments
+# Incoming data: four required arguments and t optional arguments
 # Retrieves institutional data for a single user either by username
 # if $uname is included as second argument, or by ID if $id is 
 # included as a third argument.  Either (b) or (c) must be provided. 
@@ -526,6 +531,13 @@ sub allusers_info {
 #                 if a single ID matches multiple usernames.
 # (f) $types - optional reference to array which contains 
 #              institutional types to check.
+# (g) $srchby - optional if $uname or $id defined, otherwise required.
+#               Allowed values include: 1. lastfirst, 2. last, 3. uname
+#               corresponding to searches by 1. lastname,firstname;
+#               2. lastname; 3. username
+# (h) $srchterm - optional if $uname or $id defined, otherwise required
+#                String to search for.
+# (i) $srchtype - optional. Allowed value: contains
 #
 # returns 1 parameter - ('ok' or other value).
 # side effects - populates the $instusers and $instids refs to hashes.
@@ -536,7 +548,8 @@ sub allusers_info {
 ###############################
 
 sub get_userinfo {
-    my ($dom,$uname,$id,$instusers,$instids,$types) = @_;
+    my ($dom,$uname,$id,$instusers,$instids,$types,
+        $srchby,$srchterm,$srchtype) = @_;
     my $outcome = 'ok';
     return $outcome;
 }
@@ -560,6 +573,8 @@ sub get_userinfo {
 
 sub inst_usertypes {
     my ($dom,$usertypes,$order) = @_;
+    @{$order} = ();
+    %{$usertypes} = ();
     my $outcome = 'ok';
     return $outcome;
 }