Changeset 2633 for cpc/trunk/project/batch

Timestamp:

Feb 5, 2012, 2:45:50 PM (9 years ago)

Author:

goya

Message:

fix bugs amdmts

File:

• cpc/trunk/project/batch/amendements/cut_amdmt.pl (modified) (3 diffs)

cpc/trunk/project/batch/amendements/cut_amdmt.pl

@@ -3 +3 @@
 $file = shift;
 use HTML::TokeParser;
+require ("../common/common.pm");
 
 my %amdmt;
@@ -190 +191 @@
             numero();
         }
-    } elsif ($line =~ /date_amend.(\d{1,2}) avril (\d{4})\D/i && !$amdmt{'date'}) {
-           $amdmt{'date'} = $2.'-04-'.sprintf('%02d', $1);
+    } elsif ($line =~ /date_?amend.*([0-9]+e?r? \S+ [0-9]+)\D/i && !$amdmt{'date'}) {
+           $amdmt{'date'} = join '/', reverse datize($1);
     } elsif ($line =~ /class="amddispotitre"/i && !$amdmt{'sujet'}) {
             $line =~ s/<[^>]+>//g;
@@ -276 +277 @@
             texte();
         }
-    } elsif ($presente == 1 && $line =~ /<(p style=".*text-indent:.*|td align="center"[^>]*)>.*M[\.Mml]/i) { 
+    } elsif ($presente == 1 && $line =~ /<(p style=".*text-indent:.*|td align="center"[^>]*)>.*(M[\.Mml]|Le gouvern)/i) { 
         auteurs();
     } elsif ($line =~ /\<p style=".*text-indent:/i) {