From: Bill Erickson Date: Fri, 10 Aug 2012 13:35:02 +0000 (-0400) Subject: URLVerify.pm; docs; tested redirect max/loops and repairs X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=262438fc43905d40333c960683b90d378da0735b;p=evergreen%2Fequinox.git URLVerify.pm; docs; tested redirect max/loops and repairs Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm index c02af13eea..4e86dcd35e 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm @@ -343,7 +343,7 @@ sub verify_url { $cur_url = $url_resp->{redirect_url} or last; } - if ($loop_detected or $redir_count == $max_redirects) { + if ($loop_detected or $redir_count > $max_redirects) { my $vcation = Fieldmapper::url_verify::url_verification->new; $vcation->url($cur_url->id); @@ -356,7 +356,7 @@ sub verify_url { $vcation->res_text('Redirect Loop'); } else { - $logger->info("url: max redirects reached for " . $cur_url->full_url); + $logger->info("url: max redirects reached for source URL " . $url->full_url); $vcation->res_code('995'); $vcation->res_text('Max Redirects'); } @@ -454,7 +454,9 @@ sub find_matching_url_for_attempt { select => {uvuv => ['id']}, from => { uvuv => { - uvva => {}, # attempt + uvva => { # attempt + filter => {id => $attempt->id} + }, uvu => {} # url } },