Reworked the installation machinery.

[eval.git] / submit / MO / Submit.pm

diff --git a/submit/MO/Submit.pm b/submit/MO/Submit.pm
index 0ae3f059d35c835c2be98e1e4e0f1e4e29a99b13..18441dc791cc360ecff490debb6e498a6ca4f8c9 100644 (file)
--- a/submit/MO/Submit.pm
+++ b/submit/MO/Submit.pm
@@ -9,6 +9,7 @@ use warnings;
 use IO::Socket::INET;
 use IO::Socket::SSL; # qw(debug3);
 use Sherlock::Object;
 use IO::Socket::INET;
 use IO::Socket::SSL; # qw(debug3);
 use Sherlock::Object;

+use POSIX;

 
 sub new($) {
        my $user = $ENV{"USER"} or die "Environment variable USER not set\n";
 
 sub new($) {
        my $user = $ENV{"USER"} or die "Environment variable USER not set\n";


@@ -16,11 +17,14 @@ sub new($) {
        my $mo = "$home/.mo";
        my $root = $ENV{"MO_ROOT"} or die "Environment variable MO_ROOT not set\n";
        my $self = {
        my $mo = "$home/.mo";
        my $root = $ENV{"MO_ROOT"} or die "Environment variable MO_ROOT not set\n";
        my $self = {

+               "Contest" => "CPSPC 2007",

                "Server" => "localhost:8888",
                "Server" => "localhost:8888",

-               "Key" => "$mo/key.pem",
+               "Key" => "$mo/key.pem",         # Keys and certificates

                "Cert" => "$mo/cert.pem",
                "CACert" => "$mo/ca-cert.pem",
                "Trace" => defined $ENV{"MO_SUBMIT_TRACE"},
                "Cert" => "$mo/cert.pem",
                "CACert" => "$mo/ca-cert.pem",
                "Trace" => defined $ENV{"MO_SUBMIT_TRACE"},

+               "History" => "$home/.history",  # Keep submission history in this directory
+               "RefreshTimer" => 5000,         # How often GUI sends STATUS commands [ms]

                "user" => $user,
                "sk" => undef,
                "error" => undef,
                "user" => $user,
                "sk" => undef,
                "error" => undef,


@@ -35,7 +39,7 @@ sub DESTROY($) {
 
 sub log($$) {
        my ($self, $msg) = @_;
 
 sub log($$) {
        my ($self, $msg) = @_;

-       print STDERR "LOG: $msg\n" if $self->{"Trace"};
+       print STDERR "SUBMIT: $msg\n" if $self->{"Trace"};

 }
 
 sub err($$) {
 }
 
 sub err($$) {


@@ -158,4 +162,11 @@ sub send_file($$$) {
        return $self->reply;
 }
 
        return $self->reply;
 }
 

+sub local_submit($$$$$) {
+       my ($self, $task, $part, $ext, $filename) = @_;
+       my $hist = $self->{"History"};
+       -d $hist or mkdir $hist or return "Unable to create $hist: $!";
+       ### FIXME: Unfinished
+}
+

 1;
 1;