X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FUtils.pm;h=4c73adf94a704ed2fdd9b649912afe9440dbabc3;hp=4f2580c98692248283aa1fd8347aeba4c8dbb6c7;hb=11ce7318b4b78e0bd90a7e0a0c89e871bd2456b1;hpb=e6f90536b01635b196212bc09fbd7477d5b01f0e

diff --git a/lib/ZOOM/IRSpy/Utils.pm b/lib/ZOOM/IRSpy/Utils.pm
index 4f2580c..4c73adf 100644
--- a/lib/ZOOM/IRSpy/Utils.pm
+++ b/lib/ZOOM/IRSpy/Utils.pm
@@ -9,6 +9,8 @@ use Scalar::Util;
 
 use Exporter 'import';
 our @EXPORT_OK = qw(utf8param
+		    trimField
+		    utf8paramTrim
 		    isodate
 		    xml_encode 
 		    cql_quote
@@ -82,7 +84,6 @@ sub utf8param {
     return $cooked;
 }
 
-
 # Utility functions follow, exported for use of web UI
 sub utf8param_apache1 {
     my($r, $key, $value) = @_;
@@ -104,8 +105,8 @@ sub isodate {
 		   $year+1900, $mon+1, $mday, $hour, $min, $sec);
 }
 
-# strips whitespaces and start and ends of fields
-sub trimFields {
+# strips whitespaces at start and ends of a field
+sub trimField {
     my $field  = shift;
 
     $field =~ s/^\s+//;
@@ -114,6 +115,17 @@ sub trimFields {
     return $field;
 }
 
+# utf8param() with trim
+sub utf8paramTrim {
+    my $result = utf8param(@_);
+
+    if (defined $result) {
+	$result = trimField($result);	
+    }
+
+    return $result;
+}
+
 # I can't -- just can't, can't, can't -- believe that this function
 # isn't provided by one of the core XML modules.  But the evidence all
 # says that it's not: among other things, XML::Generator and
@@ -804,7 +816,7 @@ sub calc_reliability_stats {
     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);
+    my $percent = int(100*$nok/$nall + 0.5);
     return ($nok, $nall, $percent);
 }