Changeset 82628 in spip-zone

Timestamp:

May 20, 2014, 8:01:50 PM (7 years ago)

Author:

marcimat@…

Message:

Les facettes en colonne testent la nouvelle boucle (SPHINX2).

Location:

_plugins_/indexer/trunk

Files:

• aside/sphinx.html (modified) (3 diffs)
• aside/sphinx2.html (added)
• inclure/liste_sphinx_facette.html (modified) (1 diff)
• iterateur/sphinx.php (modified) (3 diffs)
• iterateur/sphinx2.php (modified) (6 diffs)
• liste/sphinx_documents.html (modified) (1 diff)

_plugins_/indexer/trunk/aside/sphinx.html

@@ -5 +5 @@
 
 [(#INCLURE{fond=inclure/liste_sphinx_facette, env,
-    facette=properties.authors,
+    critere=properties.authors,
     cle=auteur,
     titre=Liste des auteurs,
@@ -13 +13 @@
 
 [(#INCLURE{fond=inclure/liste_sphinx_facette, env,
-    facette=properties.tags,
+    critere=properties.tags,
     cle=tag,
     titre=Liste des tags,
@@ -20 +20 @@
 
 [(#INCLURE{fond=inclure/liste_sphinx_facette, env,
-    facette=YEAR(date),
+    critere=YEAR(date),
     cle=annee,
     titre=Par année,
     texte_vide=Non renseignée,
-    order=date DESC
+    tri=date,
+    sens_tri=-1
 })]
 

_plugins_/indexer/trunk/inclure/liste_sphinx_facette.html

@@ -1 @@
-[(#ENV{order}|=={date}|?{#SET{order,date DESC}})]
 
-[(#SET{sqlf, [(#ENV{source,spip}
-    |sphinx_get_query_facette{
-        #ENV{facette},
-        #ENV{cle},
-        #ENV*{recherche},
-        #GET{order}})]})]
+#SET{tri,#ENV{tri,nb}}
+#SET{sens_tri,#ENV{sens_tri,DESC}}
+#SET{groupby,#ENV{critere}}
 
-<BOUCLE_resultats(DATA) {source SphinxQL, #GET{sqlf}}>
-    <B_facette>
-        <h2>#ENV{titre}</h2>
-        <div class='liste'>
-            <ul class='liste-items'>
-    <BOUCLE_facette(DATA){source tableau, #DOCS}{0, 10}>
-                <li class='item'>
-                    <a href="[(#SELF|parametre_url{#ENV{cle},[(#VALEUR{facette}|sinon{-})]})]">
-                        [(#VALEUR{facette}|sinon{<i>#ENV{texte_vide}</i>})]
-                    </a> (#VALEUR{c} documents)
-                </li>
-    </BOUCLE_facette>
-            </ul>
-        </div>
-    </B_facette>
-</BOUCLE_resultats>
+[(#ENV{critere}|match{'\[\(\]'}|oui)
+        #SET{groupby,valeur}
+]
+
+<B_resultats_facette>
+        <h2>#ENV{titre}</h2>
+                <div class='liste'>
+                        <ul class='liste-items'>
+<BOUCLE_resultats_facette(SPHINX2)
+        {index #ENV{source,spip}}
+        {recherche #ENV*{recherche}}
+
+        {select COUNT(*) AS nb}
+        {select GROUPBY() AS facette}
+        {select (#ENV{critere}|concat{' '}) AS valeur}
+
+        {groupby #GET{groupby}}
+
+        {filter #ENV{annee},  'YEAR(date) = @valeur' }
+        {filter #ENV{tag},    'IN(properties.tags, @valeurs)',    'LENGTH(properties.tags) = 0'}
+        {filter #ENV{auteur}, 'IN(properties.authors, @valeurs)', 'LENGTH(properties.authors) = 0'}
+
+        {par #GET{tri}}{inverse #GET{sens_tri}}
+
+        {0,10}
+>
+                        <li class='item'>
+                                <a href="[(#SELF|parametre_url{#ENV{cle},[(#FACETTE|sinon{-})]})]">
+                                        [(#FACETTE|sinon{<i>#ENV{texte_vide}</i>})]
+                                </a> (#NB documents)
+                        </li>
+</BOUCLE_resultats_facette>
+                </ul>
+        </div>
+</B_resultats_facette>

_plugins_/indexer/trunk/iterateur/sphinx.php

@@ -103 +103 @@
                         'selection' => array(),
                         'recherche' => array(),
+                        'orderby'   => array(),
+                        'groupby'   => array(),
                         'snippet'   => array(),
                         'facet'     => array(),
-                        'filter' => array(),
+                        'filter'    => array(),
                 );
 
@@ -119 +121 @@
                 $this->setSelection($this->command['selection']);
                 $this->setRecherche($this->command['recherche']);
-                $this->setOrderBy($this->command['orderby']);
+                $this->setOrderBy($this->command['order']);
+                $this->setGroupBy($this->command['groupby']);
                 $this->setFacet($this->command['facet']);
 
@@ -239 +242 @@
                         }
                         $this->queryApi->orderby($order);
+                }
+                return true;
+        }
+
+
+        public function setGroupby($groupby) {
+                if (!is_array($groupby)) $groupby = array($groupby);
+                $groupby = array_filter($groupby);
+                if (!$groupby) {
+                        return false;
+                }
+                foreach ($groupby as $group) {
+                        $this->queryApi->groupby($group);
                 }
                 return true;

_plugins_/indexer/trunk/iterateur/sphinx2.php

@@ -109 +109 @@
                         'selection' => array(),
                         'recherche' => array(),
+                        'orderby'   => array(),
+                        'group'     => array(),
                         'snippet'   => array(),
                         'facet'     => array(),
-                        'filter' => array(),
+                        'filter'    => array(),
                 );
 
@@ -126 +128 @@
                 $this->setRecherche($this->command['recherche']);
                 $this->setOrderBy($this->command['orderby']);
+                $this->setGroupBy($this->command['group']); // groupby interfère avec spip :/
                 $this->setFacet($this->command['facet']);
 
@@ -249 +252 @@
                         }
                         $this->queryApi->orderby($order);
+                }
+                return true;
+        }
+
+        public function setGroupby($groupby) {
+                if (!is_array($groupby)) $groupby = array($groupby);
+                $groupby = array_filter($groupby);
+                if (!$groupby) {
+                        return false;
+                }
+                foreach ($groupby as $group) {
+                        $this->queryApi->groupby($group);
                 }
                 return true;
@@ -475 +490 @@
          */
         public function rewind() {
+                if (!is_array($this->result['docs'])) return false;
                 reset($this->result['docs']);
                 list($this->cle, $this->valeur) = each($this->result['docs']);
@@ -585 +601 @@
 
 /**
+ * Indiquer les group by de la requête
+ *
+ * @param string $idb
+ * @param object $boucles
+ * @param object $crit
+ */
+function critere_SPHINX2_groupby_dist($idb, &$boucles, $crit) {
+        $boucle = &$boucles[$idb];
+        // critere multiple
+        $boucle->hash .= "\n\tif (!isset(\$group_init)) { \$command['group'] = array(); \$group_init = true; }\n";
+
+        foreach ($crit->param as $param){
+                $boucle->hash .= "\t\$command['group'][] = "
+                                . calculer_liste($param, array(), $boucles, $boucles[$idb]->id_parent) . ";\n";
+        }
+}
+
+
+/**
  * Indiquer les snippets de la requête
  *
@@ -708 +743 @@
                 $t = $order.$sens;
                 $boucle->order[] = $t;
-        }
-}
-
-function critere_SPHINX2_pages_dist($idb, &$boucles, $crit) {
-        $boucle = &$boucles[$idb];
-
-        // critere multiple
-        $boucle->hash .= "\n\tif (!isset(\$pagination_init)) { \$command['pagination'] = array(); \$pagination_init = true; }\n";
-
-        foreach ($crit->param as $param){
-                $boucle->hash .= "\t\$command['pagination'][] = "
-                                . calculer_liste($param, array(), $boucles, $boucles[$idb]->id_parent) . ";\n";
         }
 }

_plugins_/indexer/trunk/liste/sphinx_documents.html

@@ -9 +9 @@
         [<div class="pagination">(#DEBUT_DOCUMENTS|?{#PAGINATION,#ANCRE_PAGINATION})</div>]
         <ul class='liste-items'>
-<BOUCLE_documents(DATA){source tableau, #DOCS}{pagination 100}>
+<BOUCLE_documents(DATA){source tableau, #DOCS}{pagination 20}>
             [(#SET{properties,#PROPERTIES|json_decode{1}})]
             <li class='item'>