Changeset 1319

Timestamp:

Sep 5, 2010, 1:58:20 AM (11 years ago)

Author:

teymour

Message:

Indexation des commentaires
+ amélioration de la tache d'indexation

Location:

cpc/trunk/project/lib

Files:

• model/doctrine/Citoyen.class.php (modified) (1 diff)
• model/doctrine/Commentaire.class.php (modified) (1 diff)
• model/solr/SolrCommands.class.php (modified) (1 diff)
• task/indexSolrTask.class.php (modified) (2 diffs)

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

@@ -6 +6 @@
 class Citoyen extends BaseCitoyen
 {
+  public function __toString() {
+    return $this->getLogin();
+  }
+
   public function isPasswordCorrect($password) {
     return ($this->password == sha1($password));

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

@@ -6 +6 @@
 class Commentaire extends BaseCommentaire
 {
+  public function getTitre() {
+    return $this->getPresentation();
+  }
+
   public function __toString() {
     $str = substr($this->commentaire, 0, 250);

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

@@ -22 +22 @@
       self::$file = fopen(self::getFileCommands(), 'w');
     }
-    $str = $status.' : '.json_encode($json);
+    $str = $status.' : '.json_encode($json)."\n";
     fwrite(self::$file, $str, strlen($str));
     sem_release(self::getSemaphore());

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

@@ -34 +34 @@
     $solr = new SolrConnector();
 
+    $solr->deleteAll();
 
-    foreach(array("Parlementaire", "QuestionEcrite", "Amendement", "Intervention") as $table) {
+    foreach(array("Parlementaire", "Commentaire", "QuestionEcrite", "Amendement", "Intervention") as $table) {
       while (1) {
         $q = Doctrine::getTable($table)
@@ -54 +55 @@
           $this->state[$table] = $o->id;
         }
+        $solr->updateFromCommands();
         $this->writeState();
       }
     }
+    unlink($this->file_conf);
   }
+  
 }