Changeset 1304

Timestamp:

Aug 29, 2010, 11:54:01 PM (11 years ago)

Author:

teymour

Message:

On peut sauver un objet solarisé sans solr
L'ajout des objects dans solr se fait via un fichier de commandes

Location:

cpc/trunk/project

Files:

• lib/model/solr/SolrListener.php (modified) (9 diffs)
• test/unit/solrableTest.php (modified) (5 diffs)

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

@@ -1 +1 @@
 <?php
+
 
 class SolrConnector extends sfLogger
@@ -6 +7 @@
   private $_options = NULL;
 
+  public static function getFileCommands() {
+    return sfConfig::get('sf_log_dir').'/solr/commands.log';
+  }
+
   protected function doLog($message, $priority)
   {
@@ -28 +33 @@
   }
   
+
+  public function updateFromCommands() {
+    if (!file_exists(self::getFileCommands().'.lock') && file_exists(self::getFileCommands()))
+      rename(self::getFileCommands(), self::getFileCommands().'.lock');
+    if (!file_exists(self::getFileCommands().'.lock'))
+      return ;
+    foreach(file(self::getFileCommands().'.lock') as $line) {
+      if (preg_match('/(UPDATE|REMOVE): ([^\/]+)\/(\d+)/', $line, $matches)) {
+        if ($matches[1] == 'UPDATE') {
+          $obj = Doctrine::getTable($matches[2])->find($matches[3]);
+          if ($obj)
+            $this->updateLuceneRecord($obj);
+          else
+            echo $matches[2].'/'.$matches[3]." not found\n";
+        }else{
+          $this->solr->deleteById($matches[2].'/'.$matches[3]);
+        }
+      }
+    }
+    unlink(self::getFileCommands().'.lock');
+  }
+
   private function get_and_strip($obj, $field) {
     $f = $obj->get($field);
@@ -92 +119 @@
       $document->addField('title', $this->getObjFieldsValue($obj, $t), 1.2 * $extra_weight);
     }
+
     // La description
       if (isset($content)) {
@@ -153 +181 @@
      */
     protected $_options = array();
+
+    protected static $fileCommand = null;
+    protected static $fileDispatcher = null;
+
+    protected static function getFileCommand() {
+      if (!self::$fileDispatcher) {
+        self::$fileDispatcher = new sfEventDispatcher();
+      }
+      if (!self::$fileCommand) {
+        self::$fileCommand = new sfFileLogger(self::$fileDispatcher, array('file' => SolrConnector::getFileCommands()));
+      }
+      return self::$fileCommand;
+    }
+
+    private $command = null;
+
     /**
      * __construct
@@ -162 +206 @@
     {
       $this->_options = $options;
+      $this->command = self::getFileCommand();
     }
 
@@ -170 +215 @@
       return $this->solr;
     }
+
+    private function sendCommand($status, $obj) {
+      $this->command->log($status.': '.get_class($obj).'/'.$obj->id);
+    }
     
     // Réindexation après une création / modification
@@ -175 +224 @@
     {
       $obj = $event->getInvoker();
-      $this->getSolrConnector()->updateLuceneRecord($obj);
+      //      $this->getSolrConnector()->updateLuceneRecord($obj);
+      $this->sendCommand('UPDATE', $obj);
     }
     
@@ -181 +231 @@
     public function postDelete(Doctrine_Event $event)
     {
-      $this->getSolrConnector()->deleteLuceneRecord($event->getInvoker());
+      $obj = $event->getInvoker();
+      //      $this->getSolrConnector()->deleteLuceneRecord($obj);
+      $this->sendCommand('DELETE', $obj);
     }
     

cpc/trunk/project/test/unit/solrableTest.php

@@ -23 +23 @@
 $i->addTag('loi:1987');
 $i->save();
-
+$s->updateFromCommands();
 $id = "Intervention/".$i->id;
 $a = $s->search("id:$id");
+print_r($a);
 $t->is(count($a['response']['docs']), 1, "L'intervention a été ajoutée");
 $a = $s->search("bonjour id:$id");
+print_r($a);
 $t->is($a['response']['docs'][0]['id'], $id, "L'intervention est trouvable");
 $a = $s->search("salut id:$id");
@@ -33 +35 @@
 $i->intervention = $inter." salut";
 $i->save();
+$s->updateFromCommands();
 $a = $s->search("salut id:$id");
 $t->is($a['response']['docs'][0]['id'], $id, "L'intervention retournée sur des mots reindexés");
@@ -39 +42 @@
 $p->nom = "Benjamin Ooghe";
 $p->save();
+$s->updateFromCommands();
 $id = "Parlementaire/".$p->id;
 $a = $s->search("id:$id");
@@ -53 +57 @@
 $q->ministere = "Ministere de la crise et du déficit";
 $q->save();
+$s->updateFromCommands();
 $id = "QuestionEcrite/".$q->id;
 $a = $s->search("id:$id");
@@ -62 +67 @@
 $a = Doctrine::getTable('Amendement')->find(2);
 $a->save();
+$s->updateFromCommands();
+
 $id = "Amendement/".$a->id;
 $r = $s->search("id:$id");