From 32894d145c2fbc0325eaba24ab93a1dc93779afb Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Wed, 9 Oct 2002 18:59:38 +0000
Subject: [PATCH] added the 'currently processing' thingy

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@1089 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd-web/src/pmd.rb       |  3 +++
 pmd-web/src/processor.rb |  2 ++
 pmd-web/src/webpmd.pl    | 29 +++++++++++++++--------------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pmd-web/src/pmd.rb b/pmd-web/src/pmd.rb
index 81ed37533a..2cb6ad1661 100644
--- a/pmd-web/src/pmd.rb
+++ b/pmd-web/src/pmd.rb
@@ -45,6 +45,9 @@ end
 
 
 class Job
+
+  attr_reader :unixName
+
   def initialize(title, unixName, moduleDirectory, sourceDirectory )
     @title = title
     @unixName = unixName
diff --git a/pmd-web/src/processor.rb b/pmd-web/src/processor.rb
index c8c9a15aed..0550c388ff 100644
--- a/pmd-web/src/processor.rb
+++ b/pmd-web/src/processor.rb
@@ -15,9 +15,11 @@ jobsDir.each { |candidate|
    end
    job = PMD::Job.new(title,unixname,moduleDir,srcDir)
    puts "Processing #{job}"
+   File.open("currentjob.txt", "w") { |file| file.syswrite(job.unixName) }
    job.checkout_code
    job.run_pmd
    job.clear
+   File.delete("currentjob.txt");
   end
  rescue
   puts "Exiting with error: #{$!}"
diff --git a/pmd-web/src/webpmd.pl b/pmd-web/src/webpmd.pl
index 287b518704..4157da76da 100644
--- a/pmd-web/src/webpmd.pl
+++ b/pmd-web/src/webpmd.pl
@@ -37,7 +37,7 @@ sub default() {
  print "Project title (i.e., PMD): ", textfield(-name=>'title',-default=>'',-override=>1);
  print br(), "Project's Unix name (i.e., pmd): ", textfield(-name=>'unixname',-default=>'',-override=>1);
  print br(), "Module directory (i.e., pmd-dcpd): ", textfield(-name=>'moduledirectory',-default=>'',-override=>1);
- print br(), "Source directory (including module directory, i.e., pmd-dcpd/src): ", textfield(-name=>'srcdir',-default=>'',-override=>1);
+ print br(), "Source directory (i.e., pmd-dcpd/src): ", textfield(-name=>'srcdir',-default=>'',-override=>1);
  my $cachebuster=`date`;
  print $query->hidden(-name=>'cachebuster', -value=>${cachebuster});
  print br(), submit(-value=>'Go');
@@ -49,7 +49,14 @@ sub default() {
 
 sub printStats() {
  print hr(); 
- print b("Stats:"), br(), "There are ", getTimeUntil(), " minutes until the next run";
+ print b("Stats"); 
+ if (-e "currentjob.txt") {
+  open(FILE, "currentjob.txt");
+  my $currentjob = <FILE>;
+  close(FILE);
+  print br(), "Currently processing $currentjob";
+ }
+ print br(), "There are ", getTimeUntil(), " minutes until the next scheduled run";
  open(FILE,"lastruntime.txt");
  my $lastruntime=<FILE>;
  close(FILE);
@@ -72,18 +79,14 @@ sub loadProjectList() {
    open(FILE,"jobs/${file}");
    my $jobdata=<FILE>;
    close(FILE);
-   my $p = PMD::Project->new($jobdata);
+   my $project = PMD::Project->new($jobdata);
    my $jobtext="";
-   if (-e $p->getRptFile()) {
-    my $reportURL=$p->getRptURL();
-    my $title = $p->getTitle();
-    $jobtext="<a href=\"${reportURL}\">$title</a>";
+   if (-e $project->getRptFile()) {
+    $jobtext="<a href=\"@{[$project->getRptURL]}\">@{[$project->getTitle()]}</a>";
    } else {
-    $jobtext=$p->getTitle();
+    $jobtext=$project->getTitle();
    }
-   my $lines = $p->getLines();
-   my $unixname = $p->getUnixName();
-   $result="${result}<tr><td>${jobtext}</td><td></td><td><a href=\"http://${unixname}.sf.net/\">http://${unixname}.sf.net/</a></td><td>${lines}</td>";
+   $result="${result}<tr><td>${jobtext}</td><td></td><td><a href=\"http://@{[$project->getUnixName()]}.sf.net/\">http://@{[$project->getUnixName()]}.sf.net/</a></td><td>@{[$project->getLines()]}</td>";
   }
  }
  $result = "${result}</table>";
@@ -92,9 +95,7 @@ sub loadProjectList() {
 
 sub addProject() {
  my ($project) = @_;
- my $data = $project->getString();
- my $jobsfile = $project->getJobsFile();
- my $cmd = "echo \"$data\" > $jobsfile";
+ my $cmd = "echo \"@{[$project->getString()]}\" > @{[$project->getJobsFile()]}";
  `${cmd}`;
 }