Changeset 2707

Timestamp:

May 14, 2012, 12:35:57 AM (9 years ago)

Author:

teymour

Message:

Ajout des présences pour l'APF, l'UIP et les groupes d'amitiés

Location:

cpc/trunk/project

Files:

• batch/presences/load_all.sh (added)
• batch/presences/parse_orga_inter.pl (modified) (4 diffs)
• bin/loadupdate (modified) (3 diffs)
• bin/updateDB5.sh (modified) (1 diff)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/model/doctrine/Seance.class.php (modified) (1 diff)
• lib/task/loadJOTask.class.php (modified) (2 diffs)

cpc/trunk/project/batch/presences/parse_orga_inter.pl

@@ -8 +8 @@
 
 $url = shift;
-$organisme = shift;
+$deforganisme = shift;
 $a->get($url);
 $html = $a->content;
@@ -52 +52 @@
         
         my ( $year, $month, $day )  = split /-/, $datesrange[0];
+        return () if($year < 2000);
         my ($eyear, $emonth, $eday) = split /-/, $datesrange[1];
 
@@ -78 +79 @@
                 $titre =~ s/&#8217;/'/g;
                 $titre =~ s/&#8211;/-/g;
+                $titre =~ s/&#8209;/-/g;
                 $titre =~ s/\xc2\x92/'/g;
                 $titre =~ s/\xc2\x96/-/g;
                 @date = findDate($_);
+                $organisme = '';
+                if($titre =~ /groupe d'amitié/i) {
+                    $titre =~ s/\s+\-\s+/-/g;
+                    $titre =~ s/- France/-France/gi;
+                    $titre =~ s/Groupe d'amitié France \/ /Groupe d'amitié France-/gi;
+                    $titre =~ s/Royaume Uni/Royaume-Uni/gi;
+                    $titre =~ s/Île Maurice/Île-Maurice/gi;
+                    $titre =~ s/Union des Comores/France-Comores/gi;
+                    $titre =~ s/Cap Vert/Cap-Vert/gi;
+                    $titre =~ s/Burkina Faso/Burkina-Faso/gi;
+                    $titre =~ s/France-Union des Comores/France-Comores/gi;
+                    $organisme = lc($1) if ($titre =~ /(groupe d'amitié [^:.,\( ]*) ?/i);
+                    $organisme =~ s/(\S*)-france/France-$1/i;
+                }
                 next;
         }
@@ -86 +102 @@
         while (/fiches_id.(\d+).asp">([^<]*)<\/a>/g) {
                 $nom = $2; $id = $1;
+                $nom =~ s/députée?s?//;
                 next if ($id{$id});
                 $id{$id} = 1;
                 $nom =~ s/&nbsp;/ /g;
+                $organisme = $deforganisme unless($organisme);
                 foreach $d (@date) {
                         print "{\"depute\":\"$nom\", \"id_an\":\"$id\", \"reunion\":\"$d\", \"commission\":\"$organisme\", \"source\": \"$url\", \"session\":\"$titre\"}\n";

cpc/trunk/project/bin/loadupdate

@@ -67 +67 @@
   cd batch/jo ; perl compute_latest.pl ; cd -
 fi
+if [[ $questions -eq 2 ]]; then
+  echo International
+  echo =======================
+  cd batch/presences ; bash load_all.sh  ; cd -    
+fi
 echo Hemicycles
 echo =======================
@@ -89 +94 @@
 echo Rapports et Textes de lois
 echo ==========================
-cd batch/documents
+cd batch/documents 
 if [[ $questions -eq 2 ]]; then
-  bash reload_latest_ppl.sh
+ bash reload_latest_ppl.sh
 fi
 bash compute_latest.sh
@@ -107 +112 @@
   echo =======================
   while ! php symfony load:JO ; do
+        php symfony cc --env=test  --app=frontend > /dev/null
+  done;
+fi
+if [[ $questions -eq 2 ]]; then
+  echo load International
+  echo =======================
+  while ! php symfony load:JO --source=international; do
         php symfony cc --env=test  --app=frontend > /dev/null
   done;

cpc/trunk/project/bin/updateDB5.sh

@@ -7 +7 @@
 echo 'select a.id, count(tg.id) FROM tagging tg LEFT JOIN amendement a ON a.id = tg.taggable_id LEFT JOIN tag t ON t.id = tg.tag_id  WHERE a.sort <> "Rectifié" AND t.triple_key = "amendement" AND taggable_model = "Amendement" group by a.id' |  mysql $MYSQLID $DBNAME | grep ^[0-9]  | awk '{print "UPDATE amendement SET nb_multiples = "$2" WHERE id = "$1";"}'  | mysql $MYSQLID $DBNAME
 
+echo 'ALTER TABLE seance CHANGE moment moment VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL' | mysql $MYSQLID $DBNAME
+
 php symfony doctrine:build-model

cpc/trunk/project/config/doctrine/schema.yml

@@ -126 +126 @@
       type: enum
       values: ['commission', 'hemicycle']
-    moment: string(30)
+    moment: string(255)
     organisme_id: integer
     tagged: boolean

cpc/trunk/project/lib/model/doctrine/Seance.class.php

@@ -67 +67 @@
  
   public static function convertMoment($moment) {
+    if (strlen($moment) > 25)
+      return substr($moment, 0, 255);
     if (preg_match('`(seance|séance)`i', $moment)) {
         if (preg_match('`1`', $moment)) return "1ère séance";

cpc/trunk/project/lib/task/loadJOTask.class.php

@@ -8 +8 @@
     $this->name = 'JO';
     $this->briefDescription = 'Load Présences from JO data or CRI';
-    $this->addOption('source', null, sfCommandOption::PARAMETER_OPTIONAL, 'Define the source to load: jo or cri', 'jo');
+    $this->addOption('source', null, sfCommandOption::PARAMETER_OPTIONAL, 'Define the source to load: jo or cri or international', 'jo');
     $this->addOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'Changes the environment this task is run in', 'test');
     $this->addOption('app', null, sfCommandOption::PARAMETER_OPTIONAL, 'Changes the environment this task is run in', 'frontend');
@@ -21 +21 @@
       $workdir = "commission/presents";
       $typesource = "compte-rendu";
+    } else if ($options['source'] === "international") {
+      $workdir = "presences/json";
+      $typesource = "international";
     } else {
       echo "Error wrong value for option --source, choose cri or jo";