[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Sun Jan  5 21:53:43 2025 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Reverse part of changes in lonnet.pm rev. 1.1530.
    Use lonnet:store_userdata() instead of lonnet::cstore() to store passback 
    information in student's $cdom_$cnum_lp_passback.db GDBM file.
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.391 loncom/homework/lonhomework.pm:1.392
--- loncom/homework/lonhomework.pm:1.391	Fri Dec 20 00:24:39 2024
+++ loncom/homework/lonhomework.pm	Sun Jan  5 21:53:42 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.391 2024/12/20 00:24:39 raeburn Exp $
+# $Id: lonhomework.pm,v 1.392 2025/01/05 21:53:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2084,7 +2084,7 @@
                             }
                             $value=~s/\&$//;
                             &Apache::lonnet::courselog(&escape($linkuri).':'.$uname.':'.$udom.':EXPORT:'.$value);
-                            &Apache::lonnet::cstore({'score' => $score},$skey,$namespace,$udom,$uname,'',$ip,1);
+                            &Apache::lonnet::store_userdata({'score' => $score},$skey,$namespace,$udom,$uname);
                         }
                     } else {
                         if ($item->{'linkprot'}) {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1532 loncom/lonnet/perl/lonnet.pm:1.1533
--- loncom/lonnet/perl/lonnet.pm:1.1532	Fri Dec 27 02:32:55 2024
+++ loncom/lonnet/perl/lonnet.pm	Sun Jan  5 21:53:43 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1532 2024/12/27 02:32:55 raeburn Exp $
+# $Id: lonnet.pm,v 1.1533 2025/01/05 21:53:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6749,7 +6749,7 @@
 # -------------------------------------------------------------- Critical Store
 
 sub cstore {
-    my ($storehash,$symb,$namespace,$domain,$stuname,$laststore,$ip,$nolog) = @_;
+    my ($storehash,$symb,$namespace,$domain,$stuname,$laststore) = @_;
     my $home='';
 
     if ($stuname) { $home=&homeserver($stuname,$domain); }
@@ -6774,11 +6774,7 @@
     }
     if (!$home) { $home=$env{'user.home'}; }
 
-    if ($ip ne '') {
-        $$storehash{'ip'} = $ip;
-    } else {
-        $$storehash{'ip'} = &get_requestor_ip();
-    }
+    $$storehash{'ip'} = &get_requestor_ip();
     $$storehash{'host'}=$perlvar{'lonHostID'};
 
     my $namevalue='';
@@ -6786,9 +6782,7 @@
         $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
     }
     $namevalue=~s/\&$//;
-    unless ($nolog) {
-        &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue);
-    }
+    &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue);
     return critical
                 ("store:$domain:$stuname:$namespace:$symb:$namevalue:$laststore","$home");
 }
@@ -11690,7 +11684,7 @@
 }
 
 sub store_userdata {
-    my ($storehash,$datakey,$namespace,$udom,$uname) = @_;
+    my ($storehash,$datakey,$namespace,$udom,$uname,$ip) = @_;
     my $result;
     if ($datakey ne '') {
         if (ref($storehash) eq 'HASH') {
@@ -11702,7 +11696,11 @@
             if (($uhome eq '') || ($uhome eq 'no_host')) {
                 $result = 'error: no_host';
             } else {
-                $storehash->{'ip'} = &get_requestor_ip();
+                if ($ip ne '') {
+                    $storehash->{'ip'} = $ip;
+                } else {
+                    $storehash->{'ip'} = &get_requestor_ip();
+                }
                 $storehash->{'host'} = $perlvar{'lonHostID'};
 
                 my $namevalue='';