Changeset 1405

Timestamp:

Sep 24, 2010, 1:27:55 AM (10 years ago)

Author:

teymour

Message:

Correction de divers bug + modif de l'indexation de parlementaires

Location:

cpc/trunk/project

Files:

• config/doctrine/schema.yml (modified) (1 diff)
• lib/model/doctrine/Parlementaire.class.php (modified) (4 diffs)
• lib/model/solr/SolrConnector.class.php (modified) (1 diff)
• lib/model/solr/SolrListener.php (modified) (1 diff)

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

@@ -24 +24 @@
   actAs:
     Solrable:
-      title: nom
+      title: [nom, long_statut]
       extra_weight: 1.5
-      description: [num_circo, nom_circo, villes]
+      description: [villes]
       moretags: [profession, nom_circo]
   columns:

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

@@ -11 +11 @@
   }
   public function getTitre() {
-    return $this->getNom().', '.$this->getStatut();
+    return $this->getNom().', '.$this->getLongStatut();
   }
   public function getPersonne() {
@@ -21 +21 @@
     return "";
   }
-
-  /*  public function save() {
-    Doctrine::getTable('Personnalite')->hasChanged();
-    return parent::save($conn);
-    }*/
 
   public function setCirconscription($str) {
@@ -71 +66 @@
     $groupe = "";
     if ($this->groupe_acronyme != "") {
-      if ($link == 1)
+      if ($link && function_exists('link_to'))
         $groupe = " ".link_to($this->groupe_acronyme, '@list_parlementaires_groupe?acro='.$this->groupe_acronyme);
       else $groupe = " ".$this->groupe_acronyme;
@@ -80 +75 @@
   public function getLongStatut($link = 0) {
     $circo = $this->nom_circo;
-    if ($link == 1) {
+    if ($link && function_exists('link_to')) {
       $circo = link_to($this->nom_circo, '@list_parlementaires_departement?departement='.$circo);
     }

cpc/trunk/project/lib/model/solr/SolrConnector.class.php

@@ -31 +31 @@
     $file = SolrCommands::getInstance()->getCommandContent();
     foreach(file($file) as $line) {
-      echo "$line\n";
       if (preg_match('/(UPDATE|DELETE) : (.+)/', $line, $matches)) {
         $obj = json_decode($matches[2]);

cpc/trunk/project/lib/model/solr/SolrListener.php

@@ -133 +133 @@
         $i = preg_replace('/([A-Z].*)s$/', '\1', $i);
         foreach($content as $c) {
-          if (get_class($c)) {
-              echo $c->nom."\n";
-          }
           $s = $c;
           if (strlen($s)) {