From: hadaq <hadaq@hades33.gsi.de>
Date: Fri, 14 Aug 2020 13:06:14 +0000 (+0200)
Subject: readd remote serial access to HMP
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=307632763f6ee2b354a692a80a4d71ccbe8843ab;p=labtools.git

readd remote serial access to HMP
---

diff --git a/powersupplies/web/htdocs/pwr.pl b/powersupplies/web/htdocs/pwr.pl
index 06f2a6c..4dcd631 100755
--- a/powersupplies/web/htdocs/pwr.pl
+++ b/powersupplies/web/htdocs/pwr.pl
@@ -50,11 +50,11 @@ if($ser_dev =~ /^IP(.*)/) {
   $ser_dev = $1;
   $isIP = 1;
   }
-# elsif($ser_dev =~ /^SER(.*)/) {
-#   my $str = $1;
-#   ($isRemote,$ser_dev) = split('/',$str,2);
-#   $ser_dev = '/'.$ser_dev;
-#   }
+elsif($ser_dev =~ /^SER(.*)/) {
+  my $str = $1;
+  ($isRemote,$ser_dev) = split('/',$str,2);
+  $ser_dev = '/'.$ser_dev;
+  }
 else {  
   if ($ser_speed != 0){
       my $command = "stty -F $ser_dev speed $ser_speed -opost -onlcr -isig -icanon -iexten -echo -echoe -echok -echoctl -echoke";
@@ -64,18 +64,19 @@ else {
     }
   }
 
-# if(defined $isRemote) {
-#   my $env = $ENV{'QUERY_STRING'};
-#   $env =~ s/&/!/g;
-#   my $cmd = "bash -c \"ssh $isRemote 'QUERY_STRING=".$env." perl'\" <htdocs/tools/pwr/pwr_remote.pl";
-#   print qx($cmd);
-#   }
-# else {
+ if(defined $isRemote) {
+  my $env = $ENV{'QUERY_STRING'};
+  $env =~ s/&/!/g;
+  my $cmd = "bash -c \"ssh $isRemote 'QUERY_STRING=".$env." perl'\" <htdocs/pwr_remote.pl";
+#   print $cmd;
+  print qx($cmd);
+  }
+ else {
   print HMP_serial() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 0) or $ser_type eq "PST";
   print PWRSW_serial() if $ser_type eq "PWRSW";
   print HMP_ethernet() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 1);
   print PSP() if $ser_type eq 'PSP';
-#   }
+  }
 
 
 
@@ -239,7 +240,7 @@ sub addDB {
   $db->{$cmd}{tim} = time();
   }
   
-lock_store($db,$file);  
+#lock_store($db,$file);  
 print "\n";
   
 exit 1;