[Fusionforge-commits] r8498 - in trunk/gforge: plugins/projects_hierarchy/www www/softwaremap

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Dec 10 14:16:04 CET 2009


Author: lolando
Date: 2009-12-10 14:16:04 +0100 (Thu, 10 Dec 2009)
New Revision: 8498

Modified:
   trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php
   trunk/gforge/www/softwaremap/trove_list.php
Log:
db_query_qpa for trove map and projects_hierarchy plugin

Modified: trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php
===================================================================
--- trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php	2009-12-10 13:15:50 UTC (rev 8497)
+++ trunk/gforge/plugins/projects_hierarchy/www/softwaremap.php	2009-12-10 13:16:04 UTC (rev 8498)
@@ -68,6 +68,9 @@
 		$discrim_url = '';
 		$discrim_desc = '';
 		
+		$qpa_alias = db_construct_qpa () ;
+		$qpa_and = db_construct_qpa () ;
+
 		if (isset($discrim) && $discrim) {
 			unset ($discrim_queryalias);
 			unset ($discrim_queryand);
@@ -89,18 +92,19 @@
 				// make sure these are all ints, no url trickery
 				$expl_discrim[$i] = intval($expl_discrim[$i]);
 		
+
 				// need one aliased table for everything
-		//[CB]		$discrim_queryalias .= ', trove_group_link trove_group_link_'.$i.' ';
-				$discrim_queryalias .= ', trove_agg trove_agg_'.$i.' ';
-				
-				// need additional AND entries for aliased tables
-		//[CB]		$discrim_queryand .= 'AND trove_group_link_'.$i.'.trove_cat_id='
-		//[CB]			.$expl_discrim[$i].' AND trove_group_link_'.$i.'.group_id='
-		//[CB]			.'trove_group_link.group_id ';
-				$discrim_queryand .= 'AND trove_agg_'.$i.'.trove_cat_id='
-					.$expl_discrim[$i].' AND trove_agg_'.$i.'.group_id='
-					.'trove_agg.group_id ';
+				$qpa_alias = db_construct_qpa ($qpa_alias,
+							       sprintf (', trove_agg trove_agg_%d',
+									$i)) ;
 		
+				// need additional AND entries for aliased tables
+				$qpa_and = db_construct_qpa ($qpa_and,
+							     sprintf (' AND trove_agg_%d.trove_cat_id=$%d AND trove_agg_%d.group_id=trove_agg.group_id ',
+								      $i, $i+1, $i),
+							     array ($expl_discrim[$i])) ;
+
+
 				// must build query string for all urls
 				if ($i==0) {
 					$discrim_url .= $expl_discrim[$i];
@@ -229,22 +233,14 @@
 		<?php
 		// one listing for each project
 		
-		if(!isset($discrim_queryalias)) {
-			$discrim_queryalias = '';
-		}
-		
-		if(!isset($discrim_queryand)) {
-			$discrim_queryand = '';
-		}
-		
-		$res_grp = db_query("
-			SELECT * 
-			FROM trove_agg
-			$discrim_queryalias
-			WHERE trove_agg.trove_cat_id='$form_cat'
-			$discrim_queryand
-			ORDER BY trove_agg.trove_cat_id ASC, trove_agg.ranking ASC
-		", $TROVE_HARDQUERYLIMIT, 0, SYS_DB_TROVE);
+		$qpa = db_construct_qpa () ;
+		$qpa = db_construct_qpa ($qpa, 'SELECT * FROM trove_agg') ;
+		$qpa = db_join_qpa ($qpa, $qpa_alias) ;
+		$qpa = db_construct_qpa ($qpa, ' WHERE trove_agg.trove_cat_id=$1', array ($form_cat)) ;
+		$qpa = db_join_qpa ($qpa, $qpa_and) ;
+		$qpa = db_construct_qpa ($qpa, ' ORDER BY trove_agg.trove_cat_id ASC, trove_agg.ranking ASC') ;
+		$res_grp = db_query_qpa ($qpa, $TROVE_HARDQUERYLIMIT, 0, SYS_DB_TROVE);
+
 		echo db_error();
 		$querytotalcount = db_numrows($res_grp);
 			

Modified: trunk/gforge/www/softwaremap/trove_list.php
===================================================================
--- trunk/gforge/www/softwaremap/trove_list.php	2009-12-10 13:15:50 UTC (rev 8497)
+++ trunk/gforge/www/softwaremap/trove_list.php	2009-12-10 13:16:04 UTC (rev 8498)
@@ -225,14 +225,6 @@
 <?php
 // one listing for each project
 
-if(!isset($discrim_queryalias)) {
-	$discrim_queryalias = '';
-}
-
-if(!isset($discrim_queryand)) {
-	$discrim_queryand = '';
-}
-
 $qpa = db_construct_qpa () ;
 $qpa = db_construct_qpa ($qpa, 'SELECT * FROM trove_agg') ;
 $qpa = db_join_qpa ($qpa, $qpa_alias) ;




More information about the Fusionforge-commits mailing list