[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / lond

[raeburn]

raeburn		Wed Feb 10 15:05:51 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	lond 
  Log:
  - For 2.11
    Backport 1.565 (part)
  
  
Index: loncom/lond
diff -u loncom/lond:1.489.2.39 loncom/lond:1.489.2.40
--- loncom/lond:1.489.2.39	Mon Oct 26 03:47:15 2020
+++ loncom/lond	Wed Feb 10 15:05:51 2021
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.39 2020/10/26 03:47:15 raeburn Exp $
+# $Id: lond,v 1.489.2.40 2021/02/10 15:05:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.39 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.40 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -4662,7 +4662,7 @@
 # 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,28 +4679,14 @@
 sub get_domain_handler {
     my ($cmd, $tail, $client) = @_;
 
-
     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/\&$//;
-            &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);
     }
 
     return 1;