Add contest support and prevent some bugs

[gruntmaster-handlers.git] / lib / Gruntmaster / Handlers.pm

diff --git a/lib/Gruntmaster/Handlers.pm b/lib/Gruntmaster/Handlers.pm
index f0281f2826f939da53e258a279818821d7e934b0..7b6bddc6ca9b4bfe9dd613ddce204dfd7461fbf8 100644 (file)
--- a/lib/Gruntmaster/Handlers.pm
+++ b/lib/Gruntmaster/Handlers.pm
@@ -43,11 +43,18 @@ sub aputs{
 sub submit{
   my $r = shift;
   my $req = Apache2::Request->new($r);
-  my ($problem, $format, $contest, $private) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest', 'private';
-  my $prog;
-  $req->upload('prog')->slurp($prog);
+  my ($problem, $format, $contest, $private, $prog) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest', 'private', 'source_code';
+  my $upload = $req->upload('prog');
+  if (defined $upload) {
+         my $temp;
+         $upload->slurp($temp);
+         $prog = $temp if $temp
+  }
   die if defined $contest && $contest !~ /^\w+$/ ;
   die if defined $contest && (time < contest_start $contest || time > contest_end $contest);
+  return aputs 'A required parameter was not supplied' if grep { !defined } $problem, $format, $prog;
+
+  local $Gruntmaster::Data::contest = $contest;
 
   my $job = push_job (
          date => time,
@@ -69,7 +76,8 @@ sub submit{
          }
   };
 
-  PUBLISH 'jobs', $job;
+  $contest //= '';
+  PUBLISH 'jobs', "$contest.$job";
   $r->print("Job submitted");
   OK
 }