From 77cf62a347e3def9d63d63a4cc7f75c9f2bac805 Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Tue, 12 Nov 2002 16:45:46 +0000
Subject: [PATCH] updated from SF site

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@1239 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd-web/src/pmd.rb    |  2 +-
 pmd-web/src/webpmd.pl | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pmd-web/src/pmd.rb b/pmd-web/src/pmd.rb
index a6fad99648..8f665a2392 100644
--- a/pmd-web/src/pmd.rb
+++ b/pmd-web/src/pmd.rb
@@ -66,7 +66,7 @@ class Job
   end
   
   def run_pmd
-   cmd="java -jar pmd-1.0rc2.jar \"#{@sourceDirectory}\" html rulesets/unusedcode.xml > \"#{reportFile()}\""
+   cmd="java -jar pmd-1.0.jar \"#{@sourceDirectory}\" html rulesets/unusedcode.xml > \"#{reportFile()}\""
    `#{cmd}`
    arr = IO.readlines(reportFile())
    newFile=File.open(reportFile(), "w")
diff --git a/pmd-web/src/webpmd.pl b/pmd-web/src/webpmd.pl
index ac18afecbd..727a956653 100644
--- a/pmd-web/src/webpmd.pl
+++ b/pmd-web/src/webpmd.pl
@@ -26,13 +26,13 @@ sub default() {
   print p(), b("Added "), b($project->getTitle()), b(" to the schedule"), p();
  } 
 
- print "PMD is run hourly (at 10 minutes past the hour) on these projects:";
+ print "PMD is run every two hours (at 10 minutes past the hour) on these projects:";
  print loadProjectList();
 
  printStats();
 
  print hr(); 
- print "Want to run PMD every hour on your Java Sourceforge/Jakarta project?  Fill in the blanks and hit go:";
+ print "Want to run PMD on your Java Sourceforge/Jakarta project?  Fill in the blanks and hit go:";
  print start_form();
  print "Project title (i.e., PMD): ", textfield(-name=>'title',-default=>'',-override=>1);
  print br(), "Project location: ", radio_group(-name=>'location',-values=>['Sourceforge','Jakarta'],-default=>'Sourceforge',-override=>1);
@@ -69,7 +69,12 @@ sub printStats() {
 sub getTimeUntil() {
  # we're starting each build at 10 past the hour, so...
  my $offset = 10;
- return ((60 + $offset) - localtime()->min) % 60;
+ my $everyXHours = 2;
+ my $minutes = ((60 + $offset) - localtime()->min) % 60;
+ if (localtime()->hour % $everyXHours != 0) {
+  $minutes += 60;
+ }
+ return $minutes;
 }
 
 sub loadProjectList() {
@@ -95,7 +100,10 @@ sub loadProjectList() {
 sub addProject() {
  my ($project) = @_;
  my $cmd = "echo \"@{[$project->getString()]}\" > @{[$project->getJobsFile()]}";
- `${cmd}`;
+ eval {
+  # for some reason this succeeds, but the CGI script fails.  Very odd.
+  `${cmd}`;
+ }
 }
 
 $page=param("state") || "default";