calc_reliability_stats() uses only probes within last 60 days.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Utils.pm

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 856e602..53e53fc 100644 (file)
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -181,6 +181,7 @@ sub cql_target {
     }
 
     return "rec.id=" . cql_quote($id);
+    #return "rec.id_raw=" . cql_quote($id);
 }
 
 
@@ -284,13 +285,14 @@ sub _irspy_identifier2target {
     confess "_irspy_identifier2target(): id is undefined"
        if !defined $id;
 
-    my($protocol, $target) = ($id =~ /(.*?):(.*)/);
+    my($prefix, $protocol, $target) = ($id =~ /([^:]*,)?(.*?):(.*)/);
+    $prefix ||= "";
     if (uc($protocol) eq "Z39.50" || uc($protocol) eq "TCP") {
-       return "tcp:$target";
+       return "${prefix}tcp:$target";
     } elsif (uc($protocol) eq "SRU") {
-       return "sru=get,http:$target";
+       return "${prefix}sru=get,http:$target";
     } elsif (uc($protocol) eq "SRW") {
-       return "sru=srw,http:$target";
+       return "${prefix}sru=srw,http:$target";
     }
 
     warn "_irspy_identifier2target($id): unrecognised protocol '$protocol'";
@@ -812,11 +814,21 @@ sub calc_reliability_string {
 sub calc_reliability_stats {
     my($xc) = @_;
 
+    my $sixtyDaysAgo = time() - 60*24*60*60;
+    my $iso60DA = isodate($sixtyDaysAgo);
     my @allpings = $xc->findnodes("i:status/i:probe");
-    my $nall = @allpings;
+
+    my($nall, $nok) = (0, 0);
+    foreach my $node (@allpings) {
+       my $ok = $xc->findvalue('@ok', $node);
+       my $when = $node->to_literal();
+       #warn "$when cmp $iso60DA == ", ($when cmp $iso60DA), "\n";
+       next if $when lt $iso60DA;
+       $nall++;
+       $nok += !!$ok;
+    }
+
     return (0, 0, 0) if $nall == 0;
-    my @okpings = $xc->findnodes('i:status/i:probe[@ok = "1"]');
-    my $nok = @okpings;
     my $percent = int(100*$nok/$nall + 0.5);
     return ($nok, $nall, $percent);
 }
@@ -848,7 +860,7 @@ sub validate_record {
     my @errors = $id;
 
     if ($tests{'protocol'}) {
-       push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/;
+       push(@errors, 'protocol number is not valid') if $protocol !~ /^(z39\.50|sru|srw|tcp)$/i;
     }
 
     if ($tests{'port'}) {
@@ -861,7 +873,7 @@ sub validate_record {
 
     if ($tests{'database'}) {
        push(@errors, 'database name is not valid') if $dbname =~ m,/,i;
-       push(@errors, 'database has trailing spaces') if $dbname ne trimField($dbname);
+       push(@errors, 'database has trailing spaces') if $dbname =~ /^\s+|\s+$/;
     }
 
     if ($tests{'hosturl'}) {