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

[oliviermansour at adullact1.hosting.cri74.org]

Update of /cvsroot/agora/agora/ecrire/include/bd
In directory adullact1:/tmp/cvs-serv28455/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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- newsletter_instance.php	1 Sep 2005 10:23:13 -0000	1.18
+++ newsletter_instance.php	1 Sep 2005 12:04:17 -0000	1.19
@@ -711,19 +711,21 @@
                 null, null, null, null, false);
       	}
       $queryTotal = "";
- 		  $queryTotal .= " SELECT count( sub_id ) AS nbSubTotal ";
+ 		  /*
+          $queryTotal .= " SELECT  sub_id  AS nbSubTotal ";
 			$queryTotal .= " 			 FROM ".$GLOBALS['table_prefix']."_lists_subscribers ";
 			$queryTotal .= " 			 WHERE lst_id = $id_newsletter ";
+            */
 			
-			$queryQueued .= " SELECT count( id_sub ) AS nbSubQueued ";
+			$queryQueued .= " SELECT  id_sub  AS nbSubQueued ";
 			$queryQueued .= " 			 FROM ".$GLOBALS['table_prefix']."_cm_posts_queued ";
 			$queryQueued .= " 			 WHERE pst_id = $id_post";			
 
-			$queryDone .= " SELECT count( id_sub ) AS nbSubDone ";
+			$queryDone .= " SELECT  id_sub  AS nbSubDone ";
 			$queryDone .= " 			 FROM ".$GLOBALS['table_prefix']."_cm_posts_done ";
 			$queryDone .= " 			 WHERE pst_id = $id_post";		
 
-      $resultTotal = $db->query($queryTotal);
+            // $resultTotal = $db->query($queryTotal);
 			$resultQueued = $db->query($queryQueued);
 			$resultDone =  $db->query($queryDone);
 			
@@ -732,17 +734,21 @@
       	 }				
     	else{
 			//traitement
-				 $rowTotal = $resultTotal->fetchRow();
-				 $rowQueued = $resultQueued->fetchRow();
-				 $resultDone = $resultDone->fetchRow();
-
+				 // $nbTotal = $resultTotal->numRows();
+				 $nbQueued = $resultQueued->numRows();
+				 $nbDone = $resultDone->numRows();
+                 
+                 $nbTotal = $nbQueued + $nbDone;  
+                 $nbCurrent = $nbDone; 
+        /*
 				 if($resultDone['nbSubDone']==0){
 	 				  $nbTotal = $rowTotal['nbSubTotal'];
 						$nbCurrent = 0;	 
 				 }elseif($resultDone['nbSubDone']>0){
 				 		$nbTotal = $rowTotal['nbSubTotal'];
 				 		$nbCurrent = $rowTotal['nbSubTotal'] - $rowQueued['nbSubQueued'];				 		
-				 } 
+				 }
+         */ 
          return(array($nbCurrent,$nbTotal));
 
         }