better parsing of automated logging

diff --git a/Open-ILS/src/Android/kenstir_parse_logcat.pl b/Open-ILS/src/Android/kenstir_parse_logcat.pl
index d8aaba6..7a11a28 100644 (file)
--- a/Open-ILS/src/Android/kenstir_parse_logcat.pl
+++ b/Open-ILS/src/Android/kenstir_parse_logcat.pl
@@ -12,9 +12,15 @@ use JSON;
 my $logcat = `adb logcat -d`;
 my @lines = split(/\n/, $logcat);
 foreach my $line (@lines) {
-    if ($line =~ /org.opensrf.net.http.GatewayRequest.*service:(\S+) method:(\S+) result:(.*)/) {
-        my($svc,$method,$json) = ($1,$2,$3);
-        my $obj = decode_json($json);
-        print "$method $svc -> ", Dumper($obj);
+    chomp($line);
+    $line =~ s/\015$//;
+    if ($line =~ /org.opensrf.net.http.GatewayRequest\(\d+\): ([^:]+):(.+)/) {
+        my($key,$val) = ($1,$2);
+        if ($key eq 'result') {
+            my $obj = decode_json($val);
+            print "$key -> ", Dumper($obj);
+        } else {
+            print "${key}:${val}\n";
+        }
     }
 }