Allow submits before contest_start

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

diff --git a/lib/Gruntmaster/Handlers.pm b/lib/Gruntmaster/Handlers.pm
index f0281f2826f939da53e258a279818821d7e934b0..fd4fd2d7be70fca1d9456890769edb4876f884d6 100644 (file)
--- a/lib/Gruntmaster/Handlers.pm
+++ b/lib/Gruntmaster/Handlers.pm
@@ -19,7 +19,7 @@ use Cwd qw/cwd/;
 use File::Basename qw/fileparse/;
 use File::Temp qw/tempdir/;
 use File::Copy qw/move/;
-use Gruntmaster::Data qw/contest_start contest_end push_job set_job_inmeta insert_user PUBLISH/;
+use Gruntmaster::Data;
 
 use constant FORMAT_EXTENSION => {
        C => 'c',
@@ -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);
+  die if defined $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
 }
@@ -106,6 +114,15 @@ sub passwd{
        aputs $r, 'Password changed successfully';
 }
 
+sub problem_mark_open{
+       my $r = shift;
+       $r->uri =~ m,/ct/([^/]*)/pb/([^.]*),;
+       $r->log_error("Marking open for contest $1 problem $2 and user " . $r->user);
+       local $Gruntmaster::Data::contest = $1;
+       my $problem = $2;
+       mark_open $problem, $r->user;
+}
+
 =begin comment
 
 sub private{