Changeset 86539 in spip-zone

Timestamp:

Dec 8, 2014, 12:27:28 PM (5 years ago)

Author:

cedric@…

Message:

Optimisation : ne pas compter les subscribers a chaque demande, mais une seule fois pour toutes les listes, et memorisee dans une meta qu'on reset a chaque desinscription/inscription

Location:

_plugins_/mailsubscribers/trunk

Files:

• newsletter/subscribe.php (modified) (1 diff)
• newsletter/subscribers.php (modified) (3 diffs)
• newsletter/unsubscribe.php (modified) (1 diff)
• paquet.xml (modified) (1 diff)
• prive/squelettes/navigation/mailsubscribers.html (modified) (1 diff)

_plugins_/mailsubscribers/trunk/newsletter/subscribe.php

@@ -158 +158 @@
                 autoriser_exception("instituer","mailsubscriber",$row['id_mailsubscriber'],false);
         }
+        effacer_meta("newsletter_subscribers_count");
 
         return true;

_plugins_/mailsubscribers/trunk/newsletter/subscribers.php

@@ -25 +25 @@
  */
 function newsletter_subscribers_dist($listes = array(),$options = array()){
+        static $count = null;
 
         $select = "email,nom,listes,lang,'on' AS status,jeton";
@@ -33 +34 @@
         if (!$listes OR !is_array($listes)){
                 $listes = array(mailsubscribers_normaliser_nom_liste());
+        }
+
+        // si simple comptage d'une seule liste, faisons plus rapidement pour eviter les regexp sur une grosse base
+        // on en profite pour tout compter pour ne le faire qu'une fois
+        if (isset($options['count']) AND $options['count'] AND count($listes)==1){
+                if (is_null($count)
+                        AND !_request('var_mode')
+                  AND isset($GLOBALS['meta']['newsletter_subscribers_count'])
+                  AND $c = unserialize($GLOBALS['meta']['newsletter_subscribers_count']))
+                        $count = $c;
+                if (is_null($count)){
+                        $rows = sql_allfetsel("listes,count(id_mailsubscriber) as n","spip_mailsubscribers",$where,"listes");
+                        foreach($rows as $row){
+                                $ls = explode(",",$row["listes"]);
+                                $ls = array_filter($ls);
+                                $ls = array_unique($ls);
+                                foreach($ls as $l){
+                                        if (!isset($count[$l])) $count[$l] = 0;
+                                        $count[$l] += $row['n'];
+                                }
+                        }
+                        ecrire_meta("newsletter_subscribers_count",serialize($count));
+                }
+                $liste = reset($listes);
+                return (isset($count[$liste])?$count[$liste]:0);
         }
 
@@ -45 +71 @@
         }
 
-        // si simple comptage
+        // si simple comptage de plusieurs listes, on arrive ici
         if (isset($options['count']) AND $options['count'])
                 return sql_countsel("spip_mailsubscribers",$where);

_plugins_/mailsubscribers/trunk/newsletter/unsubscribe.php

@@ -84 +84 @@
                 }
         }
+        effacer_meta("newsletter_subscribers_count");
 
         return true;

_plugins_/mailsubscribers/trunk/paquet.xml

@@ -2 +2 @@
         prefix="mailsubscribers"
         categorie="communication"
-        version="1.6.7"
+        version="1.6.8"
         etat="stable"
         compatibilite="[3.0.0;3.0.*]"

_plugins_/mailsubscribers/trunk/prive/squelettes/navigation/mailsubscribers.html

@@ -6 +6 @@
         <BOUCLE_listes(POUR){tableau #REM|mailsubscribers_listes}>
                 <li class="item[(#ENV{liste}|=={#CLE}|oui)on]">[(#SELF|parametre_url{liste,#CLE}|lien_ou_expose{#VALEUR{titre},#ENV{liste}|=={#CLE}})]
-                [(#SET{listes,[(^|,)(#CLE)($|,)]})]
-                <BOUCLE_cpt(MAILSUBSCRIBERS){listes==#GET{listes}}{tout} />([(#TOTAL_BOUCLE)])<//B_cpt>
+                ([(#CLE|mailsubscribers_compte_inscrits)])
                 </li>
         </BOUCLE_listes>