X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FHandlers.pm;h=7b6bddc6ca9b4bfe9dd613ddce204dfd7461fbf8;hb=2fdef0a7047033bcd2954af1020ff3a99493cd82;hp=c88f3289e878353438c5f1a64ad6fa327e1059df;hpb=355044544e25018fb00c5f96187975459737fbab;p=gruntmaster-handlers.git

diff --git a/lib/Gruntmaster/Handlers.pm b/lib/Gruntmaster/Handlers.pm
index c88f328..7b6bddc 100644
--- a/lib/Gruntmaster/Handlers.pm
+++ b/lib/Gruntmaster/Handlers.pm
@@ -20,7 +20,17 @@ 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::Page::Log;
+
+use constant FORMAT_EXTENSION => {
+	C => 'c',
+	CPP => 'cpp',
+	MONO => 'cs',
+	JAVA => 'java',
+	PASCAL => 'pas',
+	PERL => 'pl',
+	PYTHON => 'py',
+	RUBY => 'rb',
+};
 
 sub aputs{
 	my ($r, $str) = @_;
@@ -33,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,
@@ -46,20 +63,21 @@ sub submit{
 	  defined $private ? (private => $private) : (),
 	  defined $contest ? (contest => $contest, private => 1) : (),
 	  filesize => length $prog,
-	  extension => Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+	  extension => FORMAT_EXTENSION->{$format},
   );
 
   set_job_inmeta $job, {
 	  files => {
 		  prog => {
 			  format => $format,
-			  name => 'prog.' . Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+			  name => 'prog.' . FORMAT_EXTENSION->{$format},
 			  content => $prog,
 		  }
 	  }
   };
 
-  PUBLISH 'jobs', $job;
+  $contest //= '';
+  PUBLISH 'jobs', "$contest.$job";
   $r->print("Job submitted");
   OK
 }