--- loncom/lond	2020/10/26 04:08:56	1.489.2.35.2.3
+++ loncom/lond	2021/02/10 16:07:28	1.489.2.35.2.4
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.35.2.3 2020/10/26 04:08:56 raeburn Exp $
+# $Id: lond,v 1.489.2.35.2.4 2021/02/10 16:07:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.35.2.3 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.35.2.4 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -4662,7 +4662,7 @@ sub put_domain_handler {
 # domain directory.
 #
 # Parameters:
-#   $cmd             - Command request keyword (get).
+#   $cmd             - Command request keyword (getdom).
 #   $tail            - Tail of the command.  This is a colon separated list
 #                      consisting of the domain and the 'namespace' 
 #                      which selects the gdbm file to do the lookup in,
@@ -4679,31 +4679,17 @@ sub put_domain_handler {
 sub get_domain_handler {
     my ($cmd, $tail, $client) = @_;
 
-
     my $userinput = "$cmd:$tail";
 
     my ($udom,$namespace,$what)=split(/:/,$tail,3);
-    chomp($what);
     if ($namespace =~ /^enc/) {
         &Failure( $client, "refused\n", $userinput);
     } else {
-        my @queries=split(/\&/,$what);
-        my $qresult='';
-        my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
-        if ($hashref) {
-            for (my $i=0;$i<=$#queries;$i++) {
-                $qresult.="$hashref->{$queries[$i]}&";
-            }
-            if (&untie_domain_hash($hashref)) {
-                $qresult=~s/\&$//;
-                &Reply($client, \$qresult, $userinput);
-            } else {
-                &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                          "while attempting getdom\n",$userinput);
-            }
+        my $res = LONCAPA::Lond::get_dom($userinput);
+        if ($res =~ /^error:/) {
+            &Failure($client, \$res, $userinput);
         } else {
-            &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                     "while attempting getdom\n",$userinput);
+            &Reply($client, \$res, $userinput);
         }
     }
 
@@ -4716,38 +4702,24 @@ sub encrypted_get_domain_handler {
 
     my $userinput = "$cmd:$tail";
 
-    my ($udom,$namespace,$what)=split(/:/,$tail,3);
-    chomp($what);
-    my @queries=split(/\&/,$what);
-    my $qresult='';
-    my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
-    if ($hashref) {
-        for (my $i=0;$i<=$#queries;$i++) {
-            $qresult.="$hashref->{$queries[$i]}&";
-        }
-        if (&untie_domain_hash($hashref)) {
-            $qresult=~s/\&$//;
-            if ($cipher) {
-                my $cmdlength=length($qresult);
-                $qresult.="         ";
-                my $encqresult='';
-                for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
-                    $encqresult.= unpack("H16",
-                                         $cipher->encrypt(substr($qresult,
-                                                                 $encidx,
-                                                                 8)));
-                }
-                &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
-            } else {
-                &Failure( $client, "error:no_key\n", $userinput);
+    my $res = LONCAPA::Lond::get_dom($userinput);
+    if ($res =~ /^error:/) {
+        &Failure($client, \$res, $userinput);
+    } else {
+        if ($cipher) {
+            my $cmdlength=length($res);
+            $res.="         ";
+            my $encres='';
+            for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+                $encres.= unpack("H16",
+                                 $cipher->encrypt(substr($res,
+                                                         $encidx,
+                                                         8)));
             }
+            &Reply( $client,"enc:$cmdlength:$encres\n",$userinput);
         } else {
-            &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                      "while attempting egetdom\n",$userinput);
+            &Failure( $client, "error:no_key\n",$userinput);
         }
-    } else {
-        &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                 "while attempting egetdom\n",$userinput);
     }
     return 1;
 }