From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 8 Feb 2009 13:27:43 +0000 (+0100)
Subject: cleanup response handling code a bit
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/commitdiff_plain/65d527a7b64bd23ecf054c65dfbbbc212ccb0760

cleanup response handling code a bit
---

diff --git a/rsbs2.pl b/rsbs2.pl
index 51d9c64..601e332 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -151,7 +151,7 @@ sub _req {
 	$request->content('<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ>'.$xml.'</RMCSEQ>');
 	$response = $ua->request($request);
 	die("Error in request: " . $response->status_line . "\n") unless ($response->is_success);
-	XMLin($response->content, SuppressEmpty => '');
+	XMLin($response->content, SuppressEmpty => '')->{RESP};
 }
 
 sub _cmd {
@@ -159,12 +159,12 @@ sub _cmd {
 
 	my $reqstr='<REQ CMD="'.$cmd.'"></REQ>';
 	my $res = _req($reqstr);
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "${cmd} failed: ".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "${cmd} failed: ".$res->{RC}."\n";
 		undef;
 	}
 
-	$res->{RESP};
+	$res;
 }
 
 sub _getprop {
@@ -175,8 +175,8 @@ sub _getprop {
 
 	print "get: ${property}\n" if ($verbose);
 	
-	if ($resp->{RESP}->{RC} ne '0x0') {
-		$resp->{RESP}->{RC};
+	if ($resp->{RC} ne '0x0') {
+		$resp->{RC};
 	} else {
 		$resp;
 	}
@@ -197,7 +197,7 @@ sub setprop {
 	my $property = shift;
 	my $value = shift;
 
-	my $oldval = _getprop($property)->{RESP}->{PROPLIST}->{PROP}->{VAL};
+	my $oldval = _getprop($property)->{PROPLIST}->{PROP}->{VAL};
 
 	if ($value eq $oldval) {
 		print "${property} is already ${value}\n" if ($verbose);
@@ -207,8 +207,8 @@ sub setprop {
 	my $reqstr='<REQ CMD="propset"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></REQ>';
 	my $res = _req($reqstr);
 
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
 		undef;
 	} else {
 		print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -231,8 +231,8 @@ sub serveraction {
 	my $reqstr='<REQ CMD="serveraction"><ACT>'.$action.'</ACT></REQ>';
 	my $res = _req($reqstr);
 
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "FAILED:".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "FAILED:".$res->{RC}."\n";
 	}
 }
 
@@ -260,7 +260,7 @@ sub powercycle {
 sub showprop {
 	my $property = shift;
 
-	my $phash = _getprop($property)->{RESP}->{PROPLIST}->{PROP};
+	my $phash = _getprop($property)->{PROPLIST}->{PROP};
 
 	print "${property}: " . ${phash}->{VAL} . " (" . ${phash}->{PERMS} . ")\n";
 }
@@ -270,14 +270,14 @@ sub board_properties {
 	my $resp = _req($reqstr);
 
 	print " * Board Properties:\n";
-	foreach my $bprop (@{$resp->{RESP}->{BPROPLIST}->{BPROP}}) {
+	foreach my $bprop (@{$resp->{BPROPLIST}->{BPROP}}) {
 		print " * " . ${bprop}->{NAME} . ": " . ${bprop}->{VAL} . "\n";
 	}
 }
 
 sub show_boarddesc {
 	my $reqstr='<REQ CMD="boardpropget"><BPROPLIST><BPROP NAME="BOARD_DESCRIPTION"/></BPROPLIST></REQ>';
-	my $boarddesc64 = _req($reqstr)->{RESP}->{BPROPLIST}->{BPROP}->{VAL};
+	my $boarddesc64 = _req($reqstr)->{BPROPLIST}->{BPROP}->{VAL};
 	my $boarddesc = decode_base64($boarddesc64);
 	my @board = split(//, $boarddesc);
 	foreach my $byte (@board) {
@@ -315,7 +315,7 @@ sub getusrprops {
 	my $usr = shift;
 
 	my $reqstr = '<REQ CMD="usrpropget"><USER NAME="'.$usr.'"></USER></REQ>';
-	my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
+	my $res = _req($reqstr)->{USER}->{PROP};
 
 	$res;
 }
@@ -325,8 +325,8 @@ sub usradd {
 
 	my $reqstr='<REQ CMD="usradd"><USER NAME="'.$usr.'"/></REQ>';
 	my $res = _req($reqstr);
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "FAILED:".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "FAILED:".$res->{RC}."\n";
 	}
 }
 
@@ -338,7 +338,7 @@ sub setusrprop {
 	my $reqstr='<REQ CMD="usrpropget"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"></PROP></USER></REQ>';
 	my $res = _req($reqstr);
 
-	my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
+	my $oldval = ${res}->{USER}->{PROP}->{VAL};
 
 	if ($value eq $oldval) {
 		print "${property} is already ${value}\n" if ($verbose);
@@ -348,8 +348,8 @@ sub setusrprop {
 	$reqstr='<REQ CMD="usrpropset"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></USER></REQ>';
 	$res = _req($reqstr);
 
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
 		undef;
 	} else {
 		print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -363,15 +363,15 @@ sub syslog_debug {
 
 	my $reqstr='<REQ CMD="dbgmsglancfg"><IP>'.${destination_ip}.'</IP><BCAST>'.${bcast}.'</BCAST><STORE>FALSE</STORE></REQ>';
 	my $res = _req($reqstr);
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "FAILED:".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "FAILED:".$res->{RC}."\n";
 		return;
 	}
 
 	$reqstr='<REQ CMD="dbgmsgcfg"><ON>TRUE</ON><CHANNELMASK>0x1</CHANNELMASK><MMASK>0x1</MMASK><STORE>FALSE</STORE></REQ>';
 	$res = _req($reqstr);
-	if ($res->{RESP}->{RC} ne '0x0') {
-		print "FAILED:".$res->{RESP}->{RC}."\n";
+	if ($res->{RC} ne '0x0') {
+		print "FAILED:".$res->{RC}."\n";
 		return;
 	}
 
@@ -394,7 +394,7 @@ sub get_sensors {
 	$req .= '</SENSORLIST></REQ>';
 
 	my $sprop = _req($req);
-	foreach my $s (@{$sprop->{RESP}->{SENSORLIST}->{SENSOR}}) {
+	foreach my $s (@{$sprop->{SENSORLIST}->{SENSOR}}) {
 		my $sensor = {};
 		foreach my $sp (@{$s->{PROP}}) {
 			$sensor->{$sp->{NAME}} = $sp->{VAL};
@@ -697,6 +697,7 @@ if (@sprop) {
 
 if (@xmlsend) {
 	foreach my $x (@xmlsend) {
+		$Data::Dumper::Terse = 1;
 		print Dumper(_req($x));
 	}
 }
@@ -713,7 +714,7 @@ if ($save ne '') {
 	foreach my $ts (@fw_vars) {
 		next if (grep(/^${ts}$/, @dontsave));
 
-		my $phash = _getprop($ts)->{RESP}->{PROPLIST}->{PROP};
+		my $phash = _getprop($ts)->{PROPLIST}->{PROP};
 		next if ($phash->{PERMS} ne 'RW');
 		
 		print SAVEFILE "${ts}=".$phash->{VAL}."\n";