fix regexps

This commit is contained in:
Romain Bignon 2012-03-13 12:35:07 +01:00
commit db85b651d4

View file

@ -32,13 +32,13 @@ use warnings;
my @monitored = split(/ /, $ENV{'freemonitored'} || 'voice sms'); my @monitored = split(/ /, $ENV{'freemonitored'} || 'voice sms');
my $cachefile = $ENV{'HOME'} . '/.config/weboob/munin/freemobile-munin'; my $cachefile = $ENV{'HOME'} . '/.config/weboob/munin/freemobile-munin';
my $weboob = "/usr/local/bin/weboob-cli ICapBill get_details coin -f table |"; my $weboob = "/usr/bin/env weboob-cli ICapBill get_details coin -f table |";
my %label = ( my %label = (
'voice' => "Voix en France (min)\n", 'voice' => "Voix en France (min)\n",
'voicetoint' => "Voix vers l'international (min)\n", 'voicetoint' => "Voix vers l'international (min)\n",
'sms' => "SMS en France\n", 'sms' => "SMS en France\n",
'mms' => "MMS en France", 'mms' => "MMS en France\n",
'data' => "Data en France\n", 'data' => "Data en France\n",
'voiceint' => "Voix à l\'international (min)\n", 'voiceint' => "Voix à l\'international (min)\n",
'smsint' => "SMS à l\'international\n", 'smsint' => "SMS à l\'international\n",
@ -61,13 +61,13 @@ my %linenum = (
my %regexp = ( my %regexp = (
'voice' => 'Consommation : (\d+)h(\d+)min(\d+)s', 'voice' => 'Consommation : (\d+)h(\d+)min(\d+)s',
'voicetoint' => 'International : (\d+)h(\d+)min(\d+)s', 'voicetoint' => 'International : (\d+)h(\d+)min(\d+)s',
'sms' => 'Conso SMS \| (\d+) \/ (\d+)', 'sms' => 'Conso SMS \| (\d+) \/ (.*)',
'mms' => 'Vous avez consommé (\d+) MMS', 'mms' => 'Vous avez consommé (\d+) MMS',
'data' => 'Vous avez consommé (\d+) o', 'data' => 'Vous avez consommé ([\d\-]+) Mo',
'voiceint' => 'Appels émis (\d+)h(\d+)min(\d+)s', 'voiceint' => 'Appels émis (\d+)h(\d+)min(\d+)s',
'smsint' => 'Conso SMS (international) \| (\d+)', 'smsint' => 'Conso SMS (international) \| (\d+)',
'mmsint' => 'Vous avez consommé (\d+) MMS', 'mmsint' => 'Vous avez consommé (\d+) MMS',
'dataint' => 'Vous avez consommé (\d+) o' 'dataint' => 'Vous avez consommé ([\d\-]+) Mo'
); );
my %post = ( my %post = (