Changeset 1369

Timestamp:

Sep 12, 2010, 3:40:20 PM (10 years ago)

Author:

teymour

Message:

Correction bug index_if
+ clarification des droits sur le log solr

Location:

cpc/trunk/project/lib/model/solr

Files:

• SolrCommands.class.php (modified) (2 diffs)
• SolrListener.php (modified) (4 diffs)

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

@@ -4 +4 @@
 {
   public static function getFileCommands() {
+    umask(0002);
+    if (!file_exists(sfConfig::get('sf_log_dir').'/solr/')) {
+      mkdir (sfConfig::get('sf_log_dir').'/solr/');
+    }
     return sfConfig::get('sf_log_dir').'/solr/commands.log';
   }
@@ -48 +52 @@
       $this->file = null;
     }
+    if (!file_exists($this->getFileCommands()))
+      touch($this->getFileCommands());
     rename($this->getFileCommands(), $lockfile);
     sem_release($this->semaphore);

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

@@ -61 +61 @@
   {
     $obj = $event->getInvoker();
-    
-    if ($t = $this->_options['index_if'] && $t && $obj->get($t))
+
+    $t = null;
+    if (isset( $this->_options['index_if']) && $t = $this->_options['index_if'] && $t && !$obj->get($t))
       return ;
     
@@ -70 +71 @@
     $json['object_name'] = get_class($obj);
     
-    if ($t = $this->_options['description']) {
+    if (isset($this->_options['description']) && $t = $this->_options['description']) {
       $content = $this->getObjFieldsValue($obj, $t);
       $wordcount = str_word_count($content);
@@ -99 +100 @@
       
     // par default la date est la created_at
-    if ( !($t = $this->_options['date'])) {
+    if (!isset($this->_options['date']) || !($t = $this->_options['date'])) {
       $t = 'created_at';
     }
@@ -114 +115 @@
     }catch (Exception $e) {}
     
-    if ($t = $this->_options['moretags']) {
+    if (isset($this->_options['moretags']) && $t = $this->_options['moretags']) {
       if (!is_array($t)) {
         $s = $this->get_and_strip($obj, $t);