Changeset 82584 in spip-zone

Timestamp:

May 19, 2014, 5:16:58 PM (7 years ago)

Author:

fil@…

Message:

PDO ne marchant pas bien sur seenthis (impossible de faire SHOW META), je rebascule tout sur mysqli

Location:

_plugins_/indexer/trunk

Files:

• indexer_fonctions.php (modified) (1 diff)
• lib/Sphinx/SphinxQL/SphinxQL.php (modified) (4 diffs)
• prive/squelettes/contenu/indexer.html (modified) (1 diff)

_plugins_/indexer/trunk/indexer_fonctions.php

@@ -110 +110 @@
 
     if ($orderby) {
+        // permettre un order by (formule compliquee AS tseg) dans la boucle DATA
+        if (preg_match(',^(.*) AS (\w+),i', $orderby, $r)) {
+            $sq->select($r[0]);
+            $orderby = str_replace($r[0], $r[2], $orderby);
+        }
         $sq->orderby($orderby);
     }

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

@@ -9 +9 @@
         private $host;
         private $port;
-        private $sql; // objet PDO
+        private $sql; // objet MySQLi
 
         public function __construct($host = '127.0.0.1', $port = 9306) {
@@ -22 +22 @@
         public function connect() {
                 try {
-                        $this->sql = new \PDO("mysql:host=" . $this->host . ";port=" . $this->port, "", "");
+                        $this->sql = new \MySQLi($this->host, null, null, null, $this->port);
                 } catch (\Exception $e) {
                         var_dump($e->getMessage());
@@ -37 +37 @@
                         return false;
                 }
-                return $this->sql->query($query);
+                return $this->sql->multi_query($query);
         }
 
@@ -66 +66 @@
                 );
 
-                if ($docs = $this->query($query)) {
-                        // les jeux de réponses sont les suivant :
+                try {
+                        $docs = $this->query($query);
+
+                        // les jeux de réponses sont les suivants :
                         // 1) les documents trouvés
                         // 2+) les FACET à la suite
                         $reponses = array();
-                         do {
-                                $reponses[] = $docs->fetchAll(\PDO::FETCH_ASSOC);
-                        } while ($docs->nextRowset());
+                        do {
+                                if ($result = $this->sql->store_result()) {
+                                        $reponses[] = $result->fetch_all(MYSQLI_ASSOC);
+                                        $result->free();
+                                }
+                        } while ($this->sql->next_result());
 
                         $liste['docs']   = array_shift($reponses);
                         $liste['facets'] = $this->parseFacets($reponses);
 
-                        $meta = $this->query('SHOW meta');
-                        if ($errs = $this->sql->errorInfo()) {
-                                # TODO: comprendre le pourquoi de l'erreur
-                                # Cannot execute queries while other unbuffered queries are active. Consider using PDOStatement::fetchAll(). Alternatively, if your code is only ever going to run against mysql, you may enable query buffering by setting the PDO::MYSQL_ATTR_USE_BUFFERED_QUERY attribute.
-                                var_dump($errs);
-                        }
-                        if ($meta) {
-                                $liste['meta']   = $this->parseMeta($meta->fetchAll(\PDO::FETCH_ASSOC));
-                        }
-                } elseif ($errs = $this->sql->errorInfo()) {
-                        var_dump($errs);
+                } catch  (\Exception $e) {
+                        echo "\n<div><tt>",htmlspecialchars($query),"</tt></div>\n";
+                        var_dump($e->getMessage());
+                        return false;
+                }
+
+                // recuperer les META
+                if ($meta = $this->query('SHOW META')) {
+                        $result = $this->sql->store_result();
+                        $liste['meta']   = $this->parseMeta($result->fetch_all(MYSQLI_ASSOC));
                 }
 

_plugins_/indexer/trunk/prive/squelettes/contenu/indexer.html

@@ -12 +12 @@
                 new Sphinx\SphinxQL\SphinxQL(SPHINX_SERVER_HOST, SPHINX_SERVER_PORT), SPHINX_DEFAULT_INDEX)
         );
-    } catch( PDOException $e ) {
+    } catch( \Exception $e ) {
         if (!$message = $e->getMessage())
             $message = _L('Erreur inconnue');