The userlist is also MO-P stuff.

[moe.git] / public / submit

diff --git a/public/submit b/public/submit
old mode 100644 (file)
new mode 100755 (executable)
index bdd475f..f597ee4
--- a/public/submit
+++ b/public/submit
@@ -1,51 +1,105 @@
+#!/bin/bash
 # The Evaluator -- Public Submit Script
-# (c) 2001 Martin Mares <mj@ucw.cz>
+# (c) 2001--2007 Martin Mares <mj@ucw.cz>
 
 set -e
-[ -n "$MO_PUBLIC" -a -d "$MO_PUBLIC" ] || { echo >&2 "MO_PUBLIC not set, giving up." ; exit 1 ; }
-. $MO_PUBLIC/bin/lib
-. $MO_PUBLIC/config
+[ -n "$MO_ROOT" -a -d "$MO_ROOT" ] || { echo >&2 "MO_ROOT not set, giving up." ; exit 1 ; }
+. $MO_ROOT/bin/lib
+. $MO_ROOT/config
+
+function usage
+{
+       die "Usage: submit [--force] [-s <source-file>] <problem> [<test-number>]"
+}
 
 FORCE=0
 if [ "$1" = --force ] ; then
        FORCE=1
        shift
 fi
-[ -n "$1" -o "$1" = "--help" ] || die "Usage: submit [--force] <problem> [<test>]"
+[ -n "$1" -a "$1" != "--help" ] || usage
+SRCFILE=
+while getopts "s:" opt ; do
+       case $opt in
+               s)      SRCFILE="$OPTARG"
+                       ;;
+               *)      usage
+                       ;;
+       esac
+done
+shift $(($OPTIND-1))
+[ -n "$1" ] || usage
 PROBLEM=$1
+PART=
+shift
+if [ -n "$1" ] ; then
+       PART="$1"
+       shift
+fi
+[ -z "$1" ] || usage
 public-setup
 . $PDIR/config
-PTSFILE=$TDIR/points
+
+function test-verdict
+{
+       pend "$2"
+       [ $1 == 0 ] && exit 1 || exit 0
+}
+
 FAILED=0
-if [ -n "$OPEN_DATA_PROBLEM" ] ; then
-       [ -n "$2" ] || die "You need to specify test number for open data problems."
-       TEST=$2
-       open-locate
-       syntax-check || FAILED=1
+if [ $TASK_TYPE == open-data ] ; then
+       [ -n "$PART" ] || die "You need to specify test number for open data problems."
+       TEST=$PART
+       pstart "Test case $TEST: "
+       open-locate "$SRCFILE"
+       (
+               [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
+               try-ln "$SDIR/$SRCN" $TDIR/$TEST.out
+               syntax-check
+               test-result $POINTS_PER_TEST OK
+       ) || FAILED=1
 else
-       [ -z "$2" ] || die "No test number should be specified for normal problems."
-       locate-source
+       [ -z "$PART" ] || die "Test number should be given only for open data problems."
+       locate-source "$SRCFILE"
        compile
        for TEST in $SAMPLE_TESTS ; do
+               (
                pstart "Checking on sample input $TEST: "
-               if test-run && syntax-check && output-check ; then
-                       pend "OK"
-               else
-                       FAILED=$(($FAILED+1))
-               fi
+               [ -f $PDIR/$TEST.config ] && . $PDIR/$TEST.config
+               test-run
+               syntax-check
+               output-check
+               die "How could I get there? It's a buuuuug!"
+               ) || FAILED=$(($FAILED+1))
        done
 fi
-pstart "Submitting... "
+
 if [ $FAILED != 0 ] ; then
        if [ $FORCE != 0 ] ; then
-               pcont "(tests failed, but --force given) "
+               echo "Submit forced."
+               pend "TESTS FAILED, but --force given, so submitting anyway."
        else
-               pend "TESTS FAILED  Use submit --force if you really want to submit a wrong solution."
+               pend "TESTS FAILED. Nothing has been submitted!"
+               pend "Use submit --force if you really want to submit an obviously WRONG solution."
                exit 1
        fi
 fi
+
+if [ -n "$REMOTE_SUBMIT" ] ; then
+       pstart "Submitting to the server... "
+       $MO_ROOT/bin/remote-submit $PROBLEM $PART "$SDIR/$SRCN"
+       pend "OK"
+       exit 0
+fi
+
+pstart "Submitting... "
 mkdir -p ~/.submit
-[ -z "$OPEN_DATA_PROBLEM" ] && rm -rf ~/.submit/$PROBLEM
-mkdir -p ~/.submit/$PROBLEM
-cp $SRCN ~/.submit/$PROBLEM/
+if [ $TASK_TYPE == open-data ] ; then
+       mkdir -p ~/.submit/$PROBLEM
+       cp "$SDIR/$SRCN" ~/.submit/$PROBLEM/$PART.out
+else
+       rm -rf ~/.submit/$PROBLEM
+       mkdir -p ~/.submit/$PROBLEM
+       cp "$SDIR/$SRCN" ~/.submit/$PROBLEM/
+fi
 pend "OK"