Merge pull request #72 from daldoyle/master

fixing total calculation in search dataservice

grnoc-tsds-services.spec

@@ -1,7 +1,7 @@
 Summary: GRNOC TSDS Services
 Name: grnoc-tsds-services
 Version: 1.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GRNOC
 Group: Measurement
 URL: http://globalnoc.iu.edu

lib/GRNOC/TSDS/DataService/Search.pm

@@ -664,7 +664,7 @@ sub _get_search_result_data {
         # Since this was the query that determined the later "by" clause it actually
         # has the total we want to expose upwards, not the queries below
         ${$total} += $self->parser()->total() if($meta_ids eq 'ALL');
-        
+
         my @additional_wheres;
         foreach my $where_result (@$where_results){
             my @arr;

lib/GRNOC/TSDS/Parser.pm

@@ -2107,14 +2107,20 @@ sub _get_meta_limit_result {
 						   }
 						  ])->all();
 
-        my $total_count = $limit_result[0]->{'totals'}[0]->{'count'};
-
-	$limited_results = $limit_result[0]->{'results'};
+	my $total_raw = 0;
+	my $total_count = 0;
+	foreach my $total_res (@{$limit_result[0]->{'totals'}}){
+	    $total_count++;
+	    $total_raw += $total_res->{'count'};
+	}
 
         # keep track of how many total matched
         # vs just the ones we limit/offset'd
         $self->total($total_count);
-        $self->total_raw($total_count);
+        $self->total_raw($total_raw);
+
+
+	$limited_results = $limit_result[0]->{'results'};
 
 	# Reverse of above, we might get something back
 	# like "circuit: {name: " and we want to cast that back

t/12search.t

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests => 37;
+use Test::More tests => 39;
 use GRNOC::Config;
 use GRNOC::Log;
 use GRNOC::TSDS::DataService::Search;
@@ -24,7 +24,18 @@ my $ds = GRNOC::TSDS::DataService::Search->new( config_file => $config_file,
 ok( $ds, "search data service connected" );
 
 
-my $results = $ds->search( search => 'xe-0/1/0.0',
+# Test to make sure meta results (total) is correct in case
+# where we have no search term and an order by
+my $results = $ds->search( search => undef,
+                           measurement_type => ['tsdstest'],
+			   limit => 2,
+			   offset => 0,
+			   order_by => ["name_1", "name_2"]);
+
+is($results->{'total'}, 22, "got correct total for rtr.chic search");
+is(@{$results->{'results'}}, 2, "got correctly limited results for rtr.chic search");
+
+$results = $ds->search( search => 'xe-0/1/0.0',
 			   measurement_type => ['tsdstest'] )->{'results'};
 
 is( @$results, 1, "1 search result for xe-0/1/0.0" );