Changeset 1412

Timestamp:

Sep 25, 2010, 9:02:00 PM (10 years ago)

Author:

roux

Message:

proposition changements index solr

Location:

cpc/trunk/project

Files:

• bin/updateDB3.sh (modified) (2 diffs)
• config/doctrine/schema.yml (modified) (4 diffs)
• lib/model/doctrine/Parlementaire.class.php (modified) (1 diff)
• lib/model/doctrine/QuestionEcrite.class.php (modified) (1 diff)
• lib/model/doctrine/Section.class.php (modified) (1 diff)

cpc/trunk/project/bin/updateDB3.sh

@@ -7 +7 @@
 #cat bin/updateDB3.model.sql | mysql $MYSQLID $DBNAME
 php symfony doctrine:build --all --no-confirmation
-zcat data/sql/dumps/nosdeputes_prod.100912.sql.gz | mysql --default-character-set=utf8 $MYSQLID $DBNAME
+
+echo "ALTER TABLE `parlementaire` ADD `photo` LONGBLOB NULL AFTER `profession`;" | mysql $MYSQLID $DBNAME
+
+zcat data/sql/dumps/nosdeputes_prod.100925.sql.gz | mysql --default-character-set=utf8 $MYSQLID $DBNAME
+
+echo "ALTER TABLE `parlementaire` DROP `photo`;" | mysql $MYSQLID $DBNAME
 
 cat bin/updateDB3.1.sql | mysql $MYSQLID $DBNAME
+
+php symfony update:Deputes
 
 cd batch/hemicycle
@@ -129 +136 @@
 
 php symfony top:Deputes
-bash bin/update_tops
+bash bin/update_tops.sh
 
 #bash bin/update_hardcache_all

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

@@ -163 +163 @@
     Timestampable: ~
     Taggable: ~
+    Solrable:
+      title: [titre_complet]
+      extra_weight: 1.3
+      index_if: is_parent
+      date: max_date
   columns:
     md5:
@@ -237 +242 @@
     Timestampable: ~
     Taggable: ~
-    Solrable:
+    Solrable: 
+      title: [titre]
       description: [expose, texte, signataires]
       moretags: [Parlementaires, sort]
@@ -284 +290 @@
       description: [Parlementaire, question, ministere, reponse, themes]
       moretags: [Parlementaire, ministere, motif_retrait, numero, themes]
-      date: date
+      date: last_date
   columns:
     source:
@@ -334 +340 @@
       fields: [login]
       unique: true
+    Solrable:
+      title: [login]
+      extra_weight: 1.1
+      description: [activite]
+      moretags: [activite]
+      index_if: is_active
   columns:
     login:

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

@@ -555 +555 @@
   }
 
-  public function addVille($ville) {
-    if (!isset($this->array_villes) || !$this->array_villes) {
-      $villes = $this->getVille();
-      $this->array_villes = explode(', ', $villes);
-    }
-    array_push($this->array_villes, $ville);
-    return $this->_set('villes', implode(', ', $this->array_villes));
-  }
-
-  public function setVille($ville) {
-    $this->array_villes = null;
-    return parent::setVille($ville);
-  }
-
   public function getTop() {
     //A supprimer lorsque les top seront unifiés (cf. parlementaire action)

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

@@ -21 +21 @@
     } else if (!$str) $str = "";
     return $str;
+  }
+
+  public function getLastDate() {
+    if ($this->date_cloture)
+      return $this->date_cloture;
+    return $this->date;
   }
 

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

@@ -70 +70 @@
   }
 
+  public function isParent() {
+    if ($this->section_id == $this->id && !preg_match('/questions/i', $this->titre))
+      return true;
+    return false;
+  }
+
   public function getTitre() {
     return ucfirst(preg_replace('/\s*\?$/', '', $this->_get('titre')));