Changeset 1334

Timestamp:

Sep 8, 2010, 12:36:04 PM (10 years ago)

Author:

goya

Message:

correction risque doublons organismes

File:

• cpc/trunk/project/lib/model/doctrine/OrganismeTable.class.php (modified) (2 diffs)

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

@@ -6 +6 @@
 {
   public function findOneByNomType($nom, $type) {
-    $nom = strtolower($nom);
-    $nom = preg_replace('/(’|\')/', '’', $nom);
-    $nom = preg_replace('/\W+$/', '', $nom);
-    $nom = preg_replace('/\([^\)]*\)/', '', $nom);
-    $nom = preg_replace('/\([^\)]*$/', '', $nom);
-    $nom = preg_replace('/^[^\)]*\)/', '', $nom);
-    $nom = preg_replace('/’/', '\'', $nom);
-    $nom = preg_replace('/^\s*assemblée\s+nationale\s*$/i', 'bureau de l\'assemblée nationale', $nom);
-    trim($nom);
-    $nom = preg_replace('/^\s*de la /', '', $nom);
-    $nom = preg_replace('/\s+/', ' ', $nom);
+    $nom = self::cleanNom($nom);
 
     if ($option = Doctrine::getTable('VariableGlobale')->findOneByChamp('commissions')) {
@@ -64 +54 @@
     $org = new Organisme();
     $org->type = $type;
-    $org->nom = $nom;
+    $org->nom = self::cleanNom($nom);
     $org->save();
     return $org;
   }
+  
+  private static function cleanNom($nom) {
+    $nom = strtolower($nom);
+    $nom = preg_replace('/(’|\')/', '’', $nom);
+    $nom = preg_replace('/\W+$/', '', $nom);
+    $nom = preg_replace('/\([^\)]*\)/', '', $nom);
+    $nom = preg_replace('/\([^\)]*$/', '', $nom);
+    $nom = preg_replace('/^[^\)]*\)/', '', $nom);
+    $nom = preg_replace('/’/', '\'', $nom);
+    $nom = preg_replace('/^\s*assemblée\s+nationale\s*$/i', 'bureau de l\'assemblée nationale', $nom);
+    trim($nom);
+    $nom = preg_replace('/^\s*de la /', '', $nom);
+    $nom = preg_replace('/\s+/', ' ', $nom);
+    return $nom;
+  }
 }