Diff for /loncom/Attic/lonManage between versions 1.10 and 1.12

version 1.10, 2003/08/18 10:43:31 version 1.12, 2003/08/18 11:08:07
Line 50 Line 50
 #    not the IP address of the host.  #    not the IP address of the host.
 #  #
 #  $Log$  #  $Log$
   #  Revision 1.12  2003/08/18 11:08:07  foxr
   #  Debug request building in Transact.
   #
   #  Revision 1.11  2003/08/18 10:45:32  foxr
   #  Felt strongly enough about hoisting ReadConfiguration into a separate sub
   #  that I did it now before I forgot.
   #
 #  Revision 1.10  2003/08/18 10:43:31  foxr  #  Revision 1.10  2003/08/18 10:43:31  foxr
 #  Code/test ValidHost.  The hosts.tab and the perl variables are read in as  #  Code/test ValidHost.  The hosts.tab and the perl variables are read in as
 #  global hashes as a side effect.  May later want to clean this up by making  #  global hashes as a side effect.  May later want to clean this up by making
Line 202  sub ParseArgs { Line 209  sub ParseArgs {
     return @result;      return @result;
 }  }
 #  #
   #  Read the loncapa configuration stuff.
   #
   sub ReadConfig {
       my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
       %perlvar       = %{$perlvarref};
       my $hoststab   = LONCAPA::Configuration::read_hosts(
    "$perlvar{'lonTabDir'}/hosts.tab");
       %hostshash     = %{$hoststab};
   
   }
   #
 #  Determine if the target host is valid.  #  Determine if the target host is valid.
 #  This is done by reading the current hosts.tab file.  #  This is done by reading the current hosts.tab file.
 #  For the host to be valid, it must be inthe file.  #  For the host to be valid, it must be inthe file.
Line 214  sub ParseArgs { Line 232  sub ParseArgs {
 #  #
 sub ValidHost {  sub ValidHost {
     my $host       = shift;      my $host       = shift;
      
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');      ReadConfig;
     %perlvar       = %{$perlvarref};  
     my $hoststab   = LONCAPA::Configuration::read_hosts(  
  "$perlvar{'lonTabDir'}/hosts.tab");  
     %hostshash     = %{$hoststab};  
   
     return defined $hostshash{$host};      return defined $hostshash{$host};
   
 }  }
   #
   #  Performs a transaction with lonc.
   #  By the time this is called, the transaction has already been
   #  validated by the caller.
   #
   #   Parameters:
   #
   #   host    - hosts.tab name of the host whose lonc we'll be talking to.
   #   command - The base command we'll be asking lond to execute.
   #   body    - [optional] If supplied, this is a command body that is a ref.
   #             to an array of lines that will be appended to the 
   #             command.
   #
   #  NOTE:
   #    The command will be done as an encrypted operation.
   #
 sub Transact {  sub Transact {
       my $host    = shift;
       my $command = shift;
       my $haveBody= 0;
       my $body;
       my $i;
   
       if(scalar @ARG) {
    $body = shift;
    $haveBody = 1;
       }
       #  Construct the command to send to the server:
       
       my $request = "encrypt\:"; # All requests are encrypted.
       $request   .= $command;
       if($haveBody) {
    $request .= "\:";
    my $bodylines = scalar @$body;
    for($i = 0; $i < $bodylines; $i++) {
       $request .= $$body[$i];
    }
       } else {
    $request .= "\n";
       }
       # Body is now built..
   
       print "$request";
 }  }
 #  #
 #   Called to push a file to the remote system.  #   Called to push a file to the remote system.
Line 266  sub PushFile { Line 321  sub PushFile {
   
     if( ($tablename eq "host")    ||      if( ($tablename eq "host")    ||
  ($tablename eq "domain")) {   ($tablename eq "domain")) {
  Transact($host, "pushfile:$tablename:",\@table);   Transact($host, "pushfile:$tablename",\@table);
     } else {      } else {
  die "EINVAL - Invalid parameter. tablename: $tablename must be host or domain";   die "EINVAL - Invalid parameter. tablename: $tablename must be host or domain";
     }      }

Removed from v.1.10  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>