Changeset 2636 for cpc/trunk/project/batch

Timestamp:

Feb 10, 2012, 7:29:03 PM (9 years ago)

Author:

goya

Message:

fix amdmts

File:

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

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

@@ -3 +3 @@
 $file = shift;
 use HTML::TokeParser;
+use File::stat;
+use Date::Format;
 require ("../common/common.pm");
 
@@ -96 +98 @@
     $line2 = $line;
     $line2 =~ s/\s*\<\/?[^\>]+\>//g;
-    if (!($line2 =~ /\s*Adt\s+n°\s*$/)) {
+    $line2 =~ s/^[ \s]*//;
+    $line2 =~ s/[\s ]*$//;
+    if ($line2 !~ /^$/ && !($line2 =~ /\s*Adt\s+n°\s*$/)) {
         $output = 'texte';
         if ($texte == 2) { $output = 'expose'; }
@@ -167 +171 @@
 
 $string =~ s/\r//g;
+$string =~ s/\t//g;
+$string =~ s/\s*\n+\s*/\n/g;
 $string =~ s/&nbsp;/ /g;
 $string =~ s/\|(\W+)\|/$1/g;
-$string =~ s/([^>]\s*)\n/\1/g;
+$string =~ s/([^>])\n/\1/g;
+$string =~ s/>\n([^<])/> \1/g;
 foreach $line (split /\n/, $string)
 {
@@ -314 +321 @@
 $amdmt{'auteurs'} =~ s/([^,\s])\s*(les\s*membres.*groupe.*)$/\1, \2/i;
 
+if (!$amdmt{'date'}) {
+  $time = stat($file)->mtime;
+  $amdmt{'date'} = time2str("%Y-%m-%d", $time);
+}
+if (!$amdmt{'sort'} && $amdmt{'texte'} =~ /amendement irrecevable/i) {
+  $amdmt{'sort'} = 'Irrecevable';
+}
+
 print '{"source": "'.$source.'", "legislature": "'.$amdmt{'legislature'}.'", "loi": "'.$amdmt{'loi'}.'", "numero": "'.$amdmt{'numero'}.'", "serie": "'.$amdmt{'serie'}.'", "rectif": "'.$amdmt{'rectif'}.'", "parent": "'.$amdmt{'parent'}.'", "date": "'.$amdmt{'date'}.'", "auteurs": "'.$amdmt{'auteurs'}.'", "sort": "'.$amdmt{'sort'}.'", "sujet": "'.$amdmt{'sujet'}.'", "texte": "'.$amdmt{'texte'}.'", "expose": "'.$amdmt{'expose'}.'" } '."\n";