Refactor filter query, export csv, excel

mantisbt · Mar 5, 2018 · 5f5a0c4 · 5f5a0c4
1 parent e4addd7
commit 5f5a0c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/csv_export.php b/csv_export.php
@@ -55,13 +55,10 @@
 # Get current filter
 $t_filter = filter_get_bug_rows_filter();
 
-# Get the query clauses
-$t_query_clauses = filter_get_bug_rows_query_clauses( $t_filter );
+$t_filter_query = new BugFilterQuery( $t_filter );
+$t_filter_query->set_limit( EXPORT_BLOCK_SIZE );
 
-# Get the total number of bugs that meet the criteria.
-$p_bug_count = filter_get_bug_count( $t_query_clauses, /* pop_params */ false );
-
-if( 0 == $p_bug_count ) {
+if( 0 == $t_filter_query->get_bug_count() ) {
 	print_header_redirect( 'view_all_set.php?type=0' );
 }
 
@@ -106,7 +103,8 @@
 	bug_clear_cache_all();
 
 	# select a new block
-	$t_result = filter_get_bug_rows_result( $t_query_clauses, EXPORT_BLOCK_SIZE, $t_offset, /* pop params */ false );
+	$t_filter_query->set_offset( $t_offset );
+	$t_result = $t_filter_query->execute();
 	$t_offset += EXPORT_BLOCK_SIZE;
 
 	# Keep reading until reaching max block size or end of result set

diff --git a/excel_xml_export.php b/excel_xml_export.php
@@ -77,13 +77,10 @@
 # Get current filter
 $t_filter = filter_get_bug_rows_filter();
 
-# Get the query clauses
-$t_query_clauses = filter_get_bug_rows_query_clauses( $t_filter );
+$t_filter_query = new BugFilterQuery( $t_filter );
+$t_filter_query->set_limit( EXPORT_BLOCK_SIZE );
 
-# Get the total number of bugs that meet the criteria.
-$p_bug_count = filter_get_bug_count( $t_query_clauses, /* pop_params */ false );
-
-if( 0 == $p_bug_count ) {
+if( 0 == $t_filter_query->get_bug_count() ) {
 	print_header_redirect( 'view_all_set.php?type=0&print=1' );
 }
 
@@ -94,7 +91,8 @@
 	bug_clear_cache_all();
 
 	# select a new block
-	$t_result = filter_get_bug_rows_result( $t_query_clauses, EXPORT_BLOCK_SIZE, $t_offset, /* pop params */ false );
+	$t_filter_query->set_offset( $t_offset );
+	$t_result = $t_filter_query->execute();
 	$t_offset += EXPORT_BLOCK_SIZE;
 
 	# Keep reading until reaching max block size or end of result set