[whimsy] branch master updated: Tidy up imports

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new c662cc6c Tidy up imports
c662cc6c is described below

commit c662cc6c5f89074e7470639578c65af3181c9fbc
Author: Sebb <s...@apache.org>
AuthorDate: Sun Feb 12 17:34:48 2023 +0000

    Tidy up imports
---
 www/members/list-traffic.cgi  | 8 +++++---
 www/officers/list-traffic.cgi | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/members/list-traffic.cgi b/www/members/list-traffic.cgi
index a39543fb..e0b01631 100755
--- a/www/members/list-traffic.cgi
+++ b/www/members/list-traffic.cgi
@@ -4,12 +4,10 @@ $LOAD_PATH.unshift '/srv/whimsy/lib'
 
 require 'wunderbar'
 require 'wunderbar/bootstrap'
-require 'wunderbar/jquery'
 require 'whimsy/asf'
-require 'whimsy/asf/agenda'
 require 'date'
 require 'mail'
-require '../../tools/mboxhdr2csv.rb'
+require_relative '../../tools/mboxhdr2csv'
 require 'whimsy/asf/meeting-util'
 
 user = ASF::Person.new($USER)
@@ -210,13 +208,17 @@ end
 
 # Return just sorted data counts as JSON
 _json do
+  $stderr.puts [__LINE__, Time.now].inspect
   months = Dir["#{SRV_MAIL}/*"].map {|path| File.basename(path)}.grep(/^\d+$/)
   data = Hash.new {|h, k| h[k] = {} }
   months.sort.reverse.each do |month|
+    $stderr.puts [__LINE__, Time.now, month].inspect
     tmp = MailUtils.get_mails_month(mailroot: SRV_MAIL, yearmonth: month, 
nondiscuss: MailUtils::NONDISCUSSION_SUBJECTS["<#{LIST_ROOT}.apache.org>"])
+    $stderr.puts [__LINE__, Time.now, month].inspect
     next if tmp.empty?
     data[month][MailUtils::TOOLCOUNT] = tmp[MailUtils::TOOLCOUNT]
     data[month][MailUtils::MAILCOUNT] = tmp[MailUtils::MAILCOUNT]
   end
+  $stderr.puts [__LINE__, Time.now].inspect
   data
 end
diff --git a/www/officers/list-traffic.cgi b/www/officers/list-traffic.cgi
index 06bc9341..29cbfd67 100755
--- a/www/officers/list-traffic.cgi
+++ b/www/officers/list-traffic.cgi
@@ -4,12 +4,10 @@ $LOAD_PATH.unshift '/srv/whimsy/lib'
 
 require 'wunderbar'
 require 'wunderbar/bootstrap'
-require 'wunderbar/jquery'
 require 'whimsy/asf'
-require 'whimsy/asf/agenda'
 require 'date'
 require 'mail'
-require '../../tools/mboxhdr2csv.rb'
+require_relative '../../tools/mboxhdr2csv'
 
 user = ASF::Person.new($USER)
 unless user.asf_chair_or_member?