Changeset 536

Show
Ignore:
Timestamp:
06/18/07 13:02:11 (1 year ago)
Author:
kindlund
Message:

Merged trunk changes back into DB branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent.pm

    r425 r536  
    10271027 
    10281028        } else { 
    1029              
     1029 
    10301030            # If we've gotten this far, then the run() thread is no longer active, 
    10311031            # which means that we have to manually update the driver state 

  • honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Driver/Browser.pm

    r416 r536  
    15011501                                 scalar(keys(%{$self->links_ignored})); 
    15021502 
     1503    # Figure out if the next_link_to_visit is set. 
     1504    my $next_link_is_set = 0; 
     1505    if (defined($self->next_link_to_visit)) { 
     1506        $next_link_is_set = 1;  
     1507    } 
     1508 
    15031509    # Set the number of relative links to process. 
    1504     $status->{relative_links_remaining} = scalar(keys(%{$self->relative_links_to_visit})); 
     1510    $status->{relative_links_remaining} = scalar(keys(%{$self->relative_links_to_visit})) + 
     1511                                          $next_link_is_set; 
    15051512 
    15061513    # Figure out how many total links are left to process. 
    1507     $status->{links_remaining} = scalar(keys(%{$self->relative_links_to_visit})) + 
     1514    $status->{links_remaining} = $status->{relative_links_remaining} + 
    15081515                                 scalar(keys(%{$self->links_to_visit})); 
    15091516