--- loncom/lond	2021/03/31 02:19:58	1.566
+++ loncom/lond	2021/06/15 20:52:27	1.567
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.566 2021/03/31 02:19:58 raeburn Exp $
+# $Id: lond,v 1.567 2021/06/15 20:52:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.566 $'; #' stupid emacs
+my $VERSION='$Revision: 1.567 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -214,6 +214,7 @@ my %trust = (
                autovalidatecourse => {remote => 1, enroll => 1},
                autovalidateinstcode => {domroles => 1, remote => 1, enroll => 1},
                autovalidateinstcrosslist => {remote => 1, enroll => 1},
+               autoinstsecreformat => {remote => 1, enroll => 1},
                changeuserauth => {remote => 1, domroles => 1},
                chatretr => {remote => 1, enroll => 1},
                chatsend => {remote => 1, enroll => 1},
@@ -6106,6 +6107,62 @@ sub validate_class_access_handler {
 &register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);
 
 #
+#    Modify institutional sections (using customized &instsec_reformat()
+#    routine in localenroll.pm), to either clutter or declutter, for  
+#    purposes of ensuring an institutional course section (string) can
+#    be unambiguously separated into institutional course and section.
+#
+# Formal Parameters:
+#    $cmd     - The command request that got us dispatched.
+#    $tail    - The tail of the command.   In this case this is a colon separated
+#               set of values that will be split into:
+#               $cdom        - The LON-CAPA domain of the course.
+#               $action      - Either: clutter or declutter
+#                              clutter adds character(s) to eliminate ambiguity
+#                              declutter removes the added characters (e.g., for
+#                              display of the institutional course section string.
+#               $info        - A frozen hash in which keys are: 
+#                              LON-CAPA course number:Institutional course code
+#                              and values are a reference to an array of the
+#                              items to modify -- either institutional sections,
+#                              or institutional course sections (for crosslistings). 
+#    $client  - The socket open on the client.
+# Returns:
+#    1 - continue processing.
+#   
+
+sub instsec_reformat_handler {
+    my ($cmd, $tail, $client) = @_;
+    my $userinput = "$cmd:$tail";
+    my ($cdom,$action,$info) = split(/:/,$tail);
+    my $instsecref = &Apache::lonnet::thaw_unescape($info);
+    my ($outcome,$result);
+    eval {
+        local($SIG{__DIE__})='DEFAULT';
+        $outcome=&localenroll::instsec_reformat($cdom,$action,$instsecref);
+        if ($outcome eq 'ok') {
+            if (ref($instsecref) eq 'HASH') {
+                foreach my $key (keys(%{$instsecref})) {
+                    $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($instsecref->{$key}).'&';
+                }
+                $result =~ s/\&$//;
+            }
+        }
+    };
+    if (!$@) {
+        if ($outcome eq 'ok') {
+            &Reply( $client, \$result, $userinput);
+        } else {
+            &Reply($client,\$outcome, $userinput);
+        }
+    } else {
+        &Failure($client,"unknown_cmd\n",$userinput);
+    }
+    return 1;
+}
+&register_handler("autoinstsecreformat",\&instsec_reformat_handler, 0, 1, 0);
+
+#
 #   Validate course owner or co-owners(s) access to enrollment data for all sections
 #   and crosslistings for a particular course.
 #