[Agora-commits] agora/ecrire/include/bd newsletter_instance.php, 1.19, 1.20

[oliviermansour at adullact1.hosting.cri74.org]

Update of /cvsroot/agora/agora/ecrire/include/bd
In directory adullact1:/tmp/cvs-serv30931/ecrire/include/bd

Modified Files:
	newsletter_instance.php 
Log Message:
just a small test of optimisation

Index: newsletter_instance.php
===================================================================
RCS file: /cvsroot/agora/agora/ecrire/include/bd/newsletter_instance.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- newsletter_instance.php	1 Sep 2005 12:04:17 -0000	1.19
+++ newsletter_instance.php	1 Sep 2005 12:41:03 -0000	1.20
@@ -766,7 +766,7 @@
                 null, null, null, null, false);
       	}else{
 				 	$queryDeleteDone = "";
-     		  $queryDeleteDone .= " DELETE FROM spip_cm_posts_done  ";
+     		  $queryDeleteDone .= " DELETE FROM ".$GLOBALS['table_prefix']."_cm_posts_done  ";
     			$queryDeleteDone .= " 			 WHERE pst_id = $pst_id ";
 					$db->query($queryDeleteDone);
 					
@@ -775,7 +775,7 @@
       	 		 }				
     			else{
 							$queryDeleteModele = "";
-     		  		$queryDeleteModele .= " DELETE FROM spip_cm_posts  ";
+     		  		$queryDeleteModele .= " DELETE FROM ".$GLOBALS['table_prefix']."_cm_posts  ";
     					$queryDeleteModele .= " 			 WHERE pst_id = $pst_id ";
 							$db->query($queryDeleteModele);
 							if ((DB::isError($resultTotal))&&(DB::isError($resultQueued))&&(DB::isError($resultDone))) {
@@ -794,13 +794,15 @@
       	 return PEAR::raiseError("[".get_class($this)." BD_newsletterInstance : consult_pst_done()] ".$db->getMessage()."", null,
                 null, null, null, null, false);
       	}else{
-              $queryConsultDone  = 'SELECT *'
-                      . ' FROM spip_cm_posts_done, spip_cm_subscribers, spip_cm_lists_subscribers'
-                      . ' WHERE spip_cm_posts_done.pst_id ='.$pst_id
-                      . ' AND spip_cm_subscribers.sub_id = spip_cm_posts_done.id_sub'
-                      . ' AND spip_cm_lists_subscribers.sub_id = '
-                      . ' spip_cm_posts_done.id_sub'
-                      . ' AND spip_cm_lists_subscribers.lst_id='.$lst_id.' ORDER BY spip_cm_subscribers.sub_email ASC';
+              $queryConsultDone  = "SELECT *"
+                      . " FROM ".$GLOBALS['table_prefix']."_cm_posts_done, ".$GLOBALS['table_prefix']."_cm_subscribers "
+                        //.$GLOBALS['table_prefix']."_cm_lists_subscribers'
+                      . " WHERE ".$GLOBALS['table_prefix']."_cm_posts_done.pst_id =".$pst_id
+                      . " AND ".$GLOBALS['table_prefix']."_cm_subscribers.sub_id = ".$GLOBALS['table_prefix']."_cm_posts_done.id_sub"
+                      //. " AND ".$GLOBALS['table_prefix']."_cm_lists_subscribers.sub_id = "
+                      //. " ".$GLOBALS['table_prefix']."_cm_posts_done.id_sub"
+                      //. " AND ".$GLOBALS['table_prefix']."_cm_lists_subscribers.lst_id=".$lst_id
+                      . " ORDER BY ".$GLOBALS['table_prefix']."_cm_subscribers.sub_email ASC";
               //echo $queryConsultDone;							
               $resultConsultDone = $db->query($queryConsultDone);
 							
@@ -828,7 +830,7 @@
       	}
 			
 			$queryQueued .= " SELECT count( id_sub ) AS nbSubQueued ";
-			$queryQueued .= " 			 FROM spip_cm_posts_queued ";	
+			$queryQueued .= " 			 FROM ".$GLOBALS['table_prefix']."_cm_posts_queued ";	
 
 			$resultQueued = $db->query($queryQueued);