From e18a4e85a86af1241d386488ef85d6d46aa34831 Mon Sep 17 00:00:00 2001
From: Florent <weboob@flo.fourcot.fr>
Date: Mon, 16 Jul 2012 11:41:34 +0200
Subject: [PATCH] Catch unit for data

---
 contrib/freemobile-munin | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/contrib/freemobile-munin b/contrib/freemobile-munin
index eccc52a0..90deb673 100755
--- a/contrib/freemobile-munin
+++ b/contrib/freemobile-munin
@@ -87,11 +87,11 @@ my %regexp = (
     'specialvoice' => '\| (\d+)h(\d+) min (\d+)s',
     'sms'          => 'Conso SMS                  \| (\d+) \/ (.*)',
     'mms'          => 'Vous avez consommé (\d+) MMS',
-    'data'         => 'Vous avez consommé ([\d\-\.]+) Mo',
+    'data'         => 'Vous avez consommé ([\d\-\.]+) (Mo|Go)',
     'voiceint'     => 'Appels émis (\d+)h(\d+)min(\d+)s',
     'smsint'       => 'Conso SMS (international)  \| (\d+)',
     'mmsint'       => 'Vous avez consommé (\d+) MMS',
-    'dataint'      => 'Vous avez consommé ([\d\-]+) Mo',
+    'dataint'      => 'Vous avez consommé ([\d\-]+) (Mo|Go)',
 );
 
 my %post = (
@@ -100,11 +100,11 @@ my %post = (
     'specialvoice' => 'postvoice',
     'sms'          => 'simplepost',
     'mms'          => 'simplepost',
-    'data'         => 'simplepost',
+    'data'         => 'datapost',
     'voiceint'     => 'postvoice',
     'smsint'       => 'simplepost',
     'mmsint'       => 'simplepost',
-    'dataint'      => 'simplepost',
+    'dataint'      => 'datapost',
 );
 
 sub doubleprint {
@@ -127,6 +127,16 @@ sub simplepost {
     return 0;
 }
 
+sub datapost {
+    my @args = @_;
+    my $multi = 1;
+    my $unit = $args[1];
+    if ($unit == "Go") {
+        $multi = 1024;
+    }
+    return $args[0] * $multi;
+}
+
 sub config {
     binmode STDOUT, ':encoding(iso-8859-1)';
     print <<'EOF';