Changeset 82602 in spip-zone

Timestamp:

May 19, 2014, 10:00:20 PM (5 years ago)

Author:

marcimat@…

Message:

Réparer l'indexation avec le passage à mysqli…

Location:

_plugins_/indexer/trunk/lib

Files:

• Indexer/Storage/Sphinx.php (modified) (1 diff)
• Sphinx/SphinxQL/SphinxQL.php (modified) (1 diff)

_plugins_/indexer/trunk/lib/Indexer/Storage/Sphinx.php

@@ -26 +26 @@
                 (id,  title, summary, content, date, uri, properties, signature)
             VALUES
-                (:id, :title, :summary, :content, :date, :uri, :properties, :signature)
         ";
-        $prepare = $this->sphinxql->prepare($query);
 
+        // insertion document par document
+        // il semble que sphinxql n'aime pas plusieurs lignes d'un coup.
         foreach ($documents as $document) {
             $data = $this->reformatDocument($document);
-            if (!$prepare->execute($data)){
-                echo "<pre>".print_r($prepare->errorInfo(), true)."</pre>";
+            $data = array_map(array($this->sphinxql, 'escape_string'), $data);
+            $q = $query . "('" . implode("', '", $data) . "')";
+            if (!$this->sphinxql->query($q)) {
+                echo "<pre>".print_r($this->sphinxql->errors(), true)."</pre>";
+                echo "<pre>".print_r($q, true)."</pre>";
                 exit;
-            }
+            }          
         }
+
+        // par lot de 10 entrées
+        /*
+        $sep = $values = '';
+        $n = 0;
+        foreach ($documents as $document) {
+            $data = $this->reformatDocument($document);
+            $data = array_map(array($this->sphinxql, 'escape_string'), $data);
+            $values .= $sep . " ('" . implode("', '", $data) . "')";
+            $sep = ',';
+            if (++$n == 10) {
+                if (!$this->sphinxql->query($query . $values)) {
+                    echo "<pre>".print_r($this->sphinxql->errors(), true)."</pre>";
+                    exit;
+                }
+                $n = 0;
+                $sep = $values = '';
+            };
+        }
+
+        if ($n and !$this->sphinxql->query($query . $values)) {
+            echo "<pre>".print_r($this->sphinxql->errors(), true)."</pre>";
+            exit;
+        }*/
     }
 

_plugins_/indexer/trunk/lib/Sphinx/SphinxQL/SphinxQL.php

@@ -40 +40 @@
         }
 
+
         /**
-         * Prépare une requête
+         * Échappe une chaîne
         **/
-        public function prepare($query) {
+        public function escape_string($string) {
                 if (!$this->sql) {
                         return false;
                 }
-                return $this->sql->prepare($query);
+                return $this->sql->escape_string($string);
+        }
+
+        /**
+         * Récupère les dernières erreurs
+        **/
+        public function errors() {
+                if (!$this->sql) {
+                        return false;
+                }
+                return $this->sql->error_list;
         }