diff --git a/pmd-web/src/PMD/Project.pm b/pmd-web/src/PMD/Project.pm new file mode 100644 index 0000000000..361af94f2c --- /dev/null +++ b/pmd-web/src/PMD/Project.pm @@ -0,0 +1,49 @@ +package PMD::Project; + +use Exporter; + +@ISA = ('Exporter'); +@EXPORT = qw(&new &getTitle &getUnixName &getModuleDir &getSrcDir &getString &getJobsFile); + +sub new { + my $self = {}; + bless($self); + $self->{TITLE} = @_[1]; + $self->{UNIXNAME} = @_[2]; + $self->{MODULEDIR} = @_[3]; + $self->{SRCDIR} = @_[4]; + return $self; +} + +sub getTitle() { + my $self = shift; + return $self->{TITLE} +} + +sub getUnixName() { + my $self = shift; + return $self->{UNIXNAME} +} + +sub getModuleDir() { + my $self = shift; + return $self->{MODULEDIR} +} + +sub getSrcDir() { + my $self = shift; + return $self->{SRCDIR} +} + +sub getString() { + my $self = shift; + return "$self->{TITLE}:$self->{UNIXNAME}:$self->{MODULEDIR}:$self->{SRCDIR}"; +} + +sub getJobsFile() { + my $self = shift; + return "jobs/$self->{UNIXNAME}_$self->{MODULEDIR}.txt"; +} + + +1; diff --git a/pmd-web/src/copytolocal.bat b/pmd-web/src/copytolocal.bat index b62d7af8da..716eba21e4 100755 --- a/pmd-web/src/copytolocal.bat +++ b/pmd-web/src/copytolocal.bat @@ -1,3 +1,4 @@ pscp tomcopeland@pmd.sourceforge.net:/home/groups/p/pm/pmd/cgi-bin/webpmd.pl . pscp tomcopeland@pmd.sourceforge.net:/home/groups/p/pm/pmd/cgi-bin/pmd.rb . -pscp tomcopeland@pmd.sourceforge.net:/home/groups/p/pm/pmd/cgi-bin/processor.rb . \ No newline at end of file +pscp tomcopeland@pmd.sourceforge.net:/home/groups/p/pm/pmd/cgi-bin/processor.rb . +pscp tomcopeland@pmd.sourceforge.net:/home/groups/p/pm/pmd/cgi-bin/PMD/Project.pm ./PMD/ \ No newline at end of file diff --git a/pmd-web/src/pmd.rb b/pmd-web/src/pmd.rb index 9e1c3b4abe..81ed37533a 100644 --- a/pmd-web/src/pmd.rb +++ b/pmd-web/src/pmd.rb @@ -59,7 +59,6 @@ class Job def run_pmd cmd="java -jar pmd-1.0rc2.jar \"#{@sourceDirectory}\" html rulesets/unusedcode.xml > \"#{reportFile()}\"" - puts "running #{cmd}" `#{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 8bfff89f58..ebd82dd9c2 100644 --- a/pmd-web/src/webpmd.pl +++ b/pmd-web/src/webpmd.pl @@ -4,6 +4,7 @@ $| =1; use CGI qw(:standard escapeHTML); use CGI::Carp qw(fatalsToBrowser); use Time::localtime; +use PMD::Project; $query = new CGI(); print $query->header(); @@ -20,9 +21,10 @@ sub default() { print h3("
PMD-WEB
"); if (param("title")) { - addProject(param("title"),param("unixname"), param("moduledirectory"), param("srcdir")); + my $project = PMD::Project->new(param("title"),param("unixname"), param("moduledirectory"), param("srcdir")); + addProject($project); print p(); - my $title = param("title"); + my $title = $project->getTitle(); print b("Added ${title} to the schedule"); } @@ -119,8 +121,10 @@ sub getLines() { sub addProject() { - my ($title, $unixname,$moduleDirectory,$srcdir) = @_; - my $cmd="echo \"${title}:${unixname}:${moduleDirectory}:${srcdir}\" > jobs/${unixname}_${moduleDirectory}.txt"; + my ($project) = @_; + my $data = $project->getString(); + my $jobsfile = $project->getJobsFile(); + my $cmd = "echo \"$data\" > $jobsfile"; `${cmd}`; }