fix consumable name

[snmp-json.git] / printer-callbacks.pl

diff --git a/printer-callbacks.pl b/printer-callbacks.pl
index 43816dc..cd9d4f3 100755 (executable)
--- a/printer-callbacks.pl
+++ b/printer-callbacks.pl
@@ -23,7 +23,7 @@ hostname                      iso.3.6.1.2.1.43.5.1.1.16.1
 serial                         iso.3.6.1.2.1.43.5.1.1.17.1
 pages                          iso.3.6.1.2.1.43.10.2.1.4.1
 @message                       iso.3.6.1.2.1.43.18.1.1.8
-@consumable_name       iso.3.6.1.2.1.43.11.1.1.6.1.1
+@consumable_name       iso.3.6.1.2.1.43.11.1.1.6.1
 @consumable_max                iso.3.6.1.2.1.43.11.1.1.8.1
 @consumable_curr       iso.3.6.1.2.1.43.11.1.1.9.1
 @tray_dim_x                    iso.3.6.1.2.1.43.8.2.1.4.1
@@ -47,12 +47,19 @@ sub columns_cb {
 
        warn "# $oid $name var_bind_list ", dump( $session->var_bind_list );
        my $results = $session->var_bind_list;
-       while ( my ($r_oid,$val) = each %$results ) {
+       foreach my $r_oid ( sort {
+                       my ($af,$bf) = ($a,$b);
+                       $af =~ s{\.(\d+)$}{sprintf("%03d",$1)}eg;
+                       $bf =~ s{\.(\d+)$}{sprintf("%03d",$1)}eg;
+                       $af cmp $bf
+       } keys %$results ) {
+               my $var = $results->{$r_oid};
                if ( $name =~ m{^\@} ) {
-                       my $offset = $1 - 1 if $r_oid =~ m{^\Q$oid\E\.?(\d+)};
-                       $response->{ $session->hostname }->{ $name }->[ $offset ] = $results->{$r_oid};
+                       my $no_prefix = $name;
+                       $no_prefix =~ s{^\@}{};
+                       push @{ $response->{ $session->hostname }->{ $no_prefix } }, $var;
                } else {
-                       $response->{ $session->hostname }->{ $name } = $results->{$r_oid};
+                       $response->{ $session->hostname }->{ $name } = $var;
                }
        }
 }