From ca67f913a1f21aae1fc7f9e02eb815f47e5949fe Mon Sep 17 00:00:00 2001 From: dms Date: Sat, 6 Jan 2001 12:54:33 +0000 Subject: [PATCH] - new time delta function - Debian.pl: \Q\E in validPackage git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@231 c11ca15a-4712-0410-83d8-924469b57eb5 --- src/Modules/Debian.pl | 14 +++++++------- src/Modules/Factoids.pl | 22 +++++++++++----------- src/Modules/Freshmeat.pl | 8 ++++---- src/Modules/Search.pl | 4 ++-- src/Net.pl | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl index 00baa96..7652c8c 100644 --- a/src/Modules/Debian.pl +++ b/src/Modules/Debian.pl @@ -192,7 +192,7 @@ sub searchContents { } # start of search. - my $start_time = &main::gettimeofday(); + my $start_time = &main::timeget(); my $found = 0; my %contents; @@ -299,7 +299,7 @@ sub searchContents { @list = sort { length $a <=> length $b } @list; # show how long it took. - my $delta_time = &main::gettimeofday() - $start_time; + my $delta_time = &main::timedelta($start_time); &main::status(sprintf("Debian: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0); my $prefix = "Debian Search of '$query' "; @@ -319,7 +319,7 @@ sub searchAuthor { $query =~ s/^\s+|\s+$//g; # start of search. - my $start_time = &main::gettimeofday(); + my $start_time = &main::timeget(); &main::status("Debian: starting author search."); my $files; @@ -400,7 +400,7 @@ sub searchAuthor { my @pkg = sort keys %{$pkg{$list[0]}}; # show how long it took. - my $delta_time = &main::gettimeofday() - $start_time; + my $delta_time = &main::timedelta($start_time); &main::status(sprintf("Debian: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0); my $email = join(', ', keys %{$maint{$list[0]}}); @@ -416,7 +416,7 @@ sub searchDesc { $query =~ s/^\s+|\s+$//g; # start of search. - my $start_time = &main::gettimeofday(); + my $start_time = &main::timeget(); &main::status("Debian: starting desc search."); my $files; @@ -479,7 +479,7 @@ sub searchDesc { } # show how long it took. - my $delta_time = &main::gettimeofday() - $start_time; + my $delta_time = &main::timedelta($start_time); &main::status(sprintf("Debian: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0); } @@ -906,7 +906,7 @@ sub validPackage { next; } - if (/^$package\n$/) { + if (/^\Q$package\E\n$/) { push(@files,$file); } $count++; diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl index bde4b98..5fe634b 100644 --- a/src/Modules/Factoids.pl +++ b/src/Modules/Factoids.pl @@ -165,13 +165,13 @@ sub CmdFactStats { } elsif ($type =~ /^broken$/i) { &status("factstats(broken): starting..."); - my $start_time = &gettimeofday(); - my %data = &dbGetCol("factoids", "factoid_key","factoid_value"); + my $start_time = &timeget(); + my %data = &dbGetCol("factoids", "factoid_key","factoid_value"); my @list; - my $delta_time = &gettimeofday() - $start_time; + my $delta_time = &timedelta($start_time); &status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0); - $start_time = &gettimeofday(); + $start_time = &timeget(); # parse the factoids. foreach (keys %data) { @@ -181,7 +181,7 @@ sub CmdFactStats { } } - $delta_time = &gettimeofday() - $start_time; + $delta_time = &timedelta($start_time); &status(sprintf("factstats(broken): %.02f sec to complete.", $delta_time)) if ($delta_time > 0); # bail out on no results. @@ -227,11 +227,11 @@ sub CmdFactStats { return &formListReply(1, $prefix, @newlist); } elsif ($type =~ /^dup(licate|e)$/i) { - my $start_time = &gettimeofday(); &status("factstats(dupe): starting..."); - my %hash = &dbGetCol("factoids", "factoid_key", "factoid_value", 1); + my $start_time = &timeget(); + my %hash = &dbGetCol("factoids", "factoid_key", "factoid_value", 1); + my $refs = 0; my @list; - my $refs = 0; my $v; foreach $v (keys %hash) { @@ -259,7 +259,7 @@ sub CmdFactStats { } &status("factstats(dupe): (good) dupe refs: $refs."); - my $delta_time = &gettimeofday() - $start_time; + my $delta_time = &timedelta($start_time); &status(sprintf("factstats(dupe): %.02f sec to complete", $delta_time)) if ($delta_time > 0); # bail out on no results. @@ -355,7 +355,7 @@ sub CmdFactStats { } elsif ($type =~ /^part(ial)?dupe$/i) { ### requires "custom" select statement... oh well... - my $start_time = &gettimeofday(); + my $start_time = &timeget(); # form length|key and key=length hash list. &status("factstats(partdupe): forming length hash list."); @@ -395,7 +395,7 @@ sub CmdFactStats { push(@list, join(" ,",@sublist)) if (scalar @sublist); } - my $delta_time = sprintf("%.02fs", &gettimeofday() - $start_time); + my $delta_time = sprintf("%.02fs", &timedelta($start_time) ); &status("factstats(partdupe): $delta_time sec to complete.") if ($delta_time > 0); # bail out on no results. diff --git a/src/Modules/Freshmeat.pl b/src/Modules/Freshmeat.pl index 2ecd143..a09e810 100644 --- a/src/Modules/Freshmeat.pl +++ b/src/Modules/Freshmeat.pl @@ -42,7 +42,7 @@ sub Freshmeat { } if (!&showPackage($sstr)) { # no exact match. - my $start_time = &main::gettimeofday(); + my $start_time = &main::timeget(); my %hash; # search by key/NAME first. @@ -65,7 +65,7 @@ sub Freshmeat { } # show how long it took. - my $delta_time = &main::gettimeofday() - $start_time; + my $delta_time = &main::timedelta($start_time); &main::status(sprintf("freshmeat: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0); for (@list) { @@ -98,7 +98,7 @@ sub showPackage { } sub downloadIndex { - my $start_time = &main::gettimeofday(); # set the start time. + my $start_time = &main::timeget(); # set the start time. my $idx = "$main::param{tempDir}/fm_index.txt"; &main::msg($main::who, "Updating freshmeat index... please wait"); @@ -186,7 +186,7 @@ sub downloadIndex { &main::DEBUG("FM: data ".scalar(@data) ); &main::dbRaw("UNLOCK", "UNLOCK TABLES"); - my $delta_time = &main::gettimeofday() - $start_time; + my $delta_time = &main::timedelta($start_time); &main::status(sprintf("Freshmeat: %.02f sec to complete.", $delta_time)) if ($delta_time > 0); my $count = &main::countKeys("freshmeat"); diff --git a/src/Modules/Search.pl b/src/Modules/Search.pl index e307902..0c0e3f3 100644 --- a/src/Modules/Search.pl +++ b/src/Modules/Search.pl @@ -11,7 +11,7 @@ use strict; # Search(keys||vals, str); sub Search { my ($type, $str) = @_; - my $start_time = &main::gettimeofday(); + my $start_time = &main::timeget(); my @list; $type =~ s/s$//; # nice work-around. @@ -22,7 +22,7 @@ sub Search { @list = &main::searchTable("factoids", "factoid_key", "factoid_key", $str); } - my $delta_time = sprintf("%.02f", &main::gettimeofday() - $start_time); + my $delta_time = sprintf("%.02f", &main::timedelta($start_time) ); &main::status("search: took $delta_time sec for query.") if ($delta_time > 0); my $prefix = "Factoid search of '\002$str\002' by $type "; diff --git a/src/Net.pl b/src/Net.pl index 5f662dd..09557c8 100644 --- a/src/Net.pl +++ b/src/Net.pl @@ -65,7 +65,7 @@ sub ftpGet { return 0; } - my $start_time = &gettimeofday(); + my $start_time = &timeget(); if (defined $lfile) { &status("FTP: getting $file as $lfile.") if ($verbose_ftp); $ftp->get($file,$lfile); @@ -81,7 +81,7 @@ sub ftpGet { } } - my $delta_time = &gettimeofday() - $start_time; + my $delta_time = &timedelta($start_time); if ($delta_time > 0 and $verbose_ftp) { &status(sprintf("FTP: %.02f sec to complete.", $delta_time)); my ($rateunit,$rate) = ("B", $size / $delta_time); -- 2.39.2