more loop fixes

barbie · Dec 8, 2012 · c487046 · c487046
1 parent 43992d7
commit c487046
Showing 1 changed file with 34 additions and 38 deletions.
diff --git a/lib/CPAN/Testers/Data/Generator.pm b/lib/CPAN/Testers/Data/Generator.pm
@@ -1023,54 +1023,50 @@ sub _consume_reports {
         # sync, we have to look at previous entries to ensure we are starting
         # from the right point
         my ($update,$prev,$last) = ($start,$start,$start);
-        my @times = ($start);
+        my @times = ();
 
-        while($update le $end || $prev le $end) {
-            $prev = $update;
+        while($update le $end) {
 
-            # get list of guids from given start date
-            my $guids = $self->get_next_guids($start);
+            # get list of guids from last update date
+            my $guids = $self->get_next_guids($update);
+            last    unless($guids);
 
-            if($guids) {
-                @guids = grep { !$guids{$_} } @$guids;
-                for my $guid (@guids) {
-                    $self->_log("GUID [$guid]");
+            @guids = grep { !$guids{$_} } @$guids;
+            for my $guid (@guids) {
+                # don't process too far
+                shift @times    if(@times > 4); # one off
+                push @times, $update;           # one on ... max 5
 
-                    $self->{processed}++;
+                my $times = 0;
+                for my $time (@times) {
+                    next    if(_date_diff($end,$time) <= 0);
+                    $times++;
+                }
 
-                    if(my $time = $self->already_saved($guid)) {
-                        $self->_log(".. already saved\n");
-                        $update = $time;
-                        next;
-                    }
+                last    if($times == @times);   # stop if all past endh
 
-                    if(my $report = $self->get_fact($guid)) {
-                        $update = $report->{metadata}{core}{update_time};
-                        $self->{report}{guid}   = $guid;
-                        next    if($self->parse_report(report => $report)); # true if invalid report
-
-                        if($self->store_report()) { $self->_log(".. stored"); $self->{stored}++;    }
-                        else                      { $self->_log(".. already stored");       }
-                        if($self->cache_report()) { $self->_log(".. cached\n"); $self->{cached}++;  }
-                        else                      { $self->_log(".. bad cache data\n");     }
-                    } else {
-                        $self->_log(".. FAIL\n");
-                    }
+                # okay process
+                $self->_log("GUID [$guid]");
 
-                    shift @times    if(@times > 4); # one off
-                    push @times, $update;           # one on ... max 5
+                $self->{processed}++;
 
-                    my $times = 0;
-                    for my $time (@times) {
-                        next    if(_date_diff($end,$time) <= 0);
-                        $times++;
-                    }
+                if(my $time = $self->already_saved($guid)) {
+                    $self->_log(".. already saved\n");
+                    $update = $time;
+                    next;
+                }
 
-                    last    if($times == @times);   # stop if all past endh
+                if(my $report = $self->get_fact($guid)) {
+                    $update = $report->{metadata}{core}{update_time};
+                    $self->{report}{guid}   = $guid;
+                    next    if($self->parse_report(report => $report)); # true if invalid report
 
-#                    last    if($update gt $end && $last gt $end);
-#                    $prev = $last;
-#                    $last = $update;
+                    if($self->store_report()) { $self->_log(".. stored"); $self->{stored}++;    }
+                    else                      { $self->_log(".. already stored");       }
+                    if($self->cache_report()) { $self->_log(".. cached\n"); $self->{cached}++;  }
+                    else                      { $self->_log(".. bad cache data\n");     }
+                } else {
+                    $self->_log(".. FAIL\n");
                 }
             }