Merge branch 'devel' of h1dev:/srv/APKPM/

[APKPM.git] / lib / H1 / ZTEMSAN.pm

diff --git a/lib/H1/ZTEMSAN.pm b/lib/H1/ZTEMSAN.pm
old mode 100755 (executable)
new mode 100644 (file)
index 4bf8144..dd0c4f9
--- a/lib/H1/ZTEMSAN.pm
+++ b/lib/H1/ZTEMSAN.pm
@@ -33,14 +33,21 @@ sub parse {
        my $last_line;
        foreach my $line ( split(/[\n\r]+/, $out) ) {
                warn "# $line\n";
-               if ( $line =~ m/^(\S+.*?)\s+:+\s+(\S+.*?)\s*$/ ) {
+               if ( $line =~ m/^(\S+)\s*:\s*(\S*.*?)\s*$/ ) {
                        my ($n,$v) = ($1,$2);
                        $n =~ s/\(.+\)//;
-                       if ( $v =~ s/\s+(\S+)\s*:\s+(\S+.+)// ) {
+                       if ( $v =~ s/\s+([a-zA-Z]\S+)\s*:\s*(\S*.*?)\s*$// ) {
                                # strip second column
                                my ($n2,$v2) = ($1,$2);
                                $n2 =~ s/\(.+\)//;
-                               $hash->{ $section . $n2 } = $2;
+                               $hash->{ $section . $n2 } = $v2;
+                               warn "## $n2 = $v2\n";
+                       } elsif ( $v =~ s/(\d+)([a-zA-Z]\S+)\s*:\s*(\S*.*?)\s*$/$1/ ) { # numberField without space
+                               # strip second column
+                               my ($n2,$v2) = ($1,$2);
+                               $n2 =~ s/\(.+\)//;
+                               $hash->{ $section . $n2 } = $v2;
+                               warn "## $n2 = $v2\n";
                        }
                        $hash->{ $section . $n } = $v;
                        warn "## $n = $v\n";
@@ -60,6 +67,7 @@ sub commands {{
        'show adsl port %s' => [],
        'show adsl port %s line-config' => [],
        'show adsl port %s physical-table' => [],
+       'show adsl port %s perf-data' => [],
 }}
 
 sub fixup_row {