Change file naming conventions

diff --git a/lib/BEX.pm b/lib/BEX.pm
index 3e2bf9857810c53aabffde9613345ba44c3b8117..7d7f99c5bb5d4da949d12466419990ca23f90ce0 100644 (file)
--- a/lib/BEX.pm
+++ b/lib/BEX.pm
@@ -76,7 +76,7 @@ sub dump($) {
 sub save($;$) {
        my ($job, $fn) = @_;
        -d "tmp" or mkdir "tmp" or die "Cannot create directory tmp: $!";
-       $fn //= 'tmp/t-' . $job->{'ID'};
+       $fn //= 'tmp/' . $job->{'ID'};
        open T, '>', $fn or die "Cannot create $fn: $!";
        for my $k (sort grep { /^[A-Z]/ } keys %$job) {
                print T "$k: ", $job->{$k}, "\n";
@@ -110,22 +110,22 @@ sub host_dir($$) {
 
 sub queue_file($$) {
        my ($queue, $machine, $jid) = @_;
-       return $queue->host_dir($machine) . '/q-' . $jid;
+       return $queue->host_dir($machine) . '/' . $jid . '.job';
 }
 
 sub status_file($$) {
        my ($queue, $machine, $jid) = @_;
-       return $queue->host_dir($machine) . '/s-' . $jid;
+       return $queue->host_dir($machine) . '/' . $jid . '.stat';
 }
 
 sub temp_file($$) {
        my ($queue, $machine, $jid) = @_;
-       return $queue->host_dir($machine) . '/t-' . $jid;
+       return $queue->host_dir($machine) . '/' . $jid . '.tmp';
 }
 
 sub job_file($$) {
        my ($queue, $jid) = @_;
-       return $queue->{'Name'} . '/jobs/j-' . $jid;
+       return $queue->{'Name'} . '/jobs/' . $jid. '.job';
 }
 
 sub enqueue($$$) {
@@ -136,7 +136,7 @@ sub enqueue($$$) {
        -f $fn or $job->save($fn);
        my $dir = $queue->host_dir($machine);
        -d $dir or mkdir $dir or die "Cannot create directory $dir: $!";
-       symlink "../../jobs/j-" . $job->{'ID'}, $qf or die "Cannot create $qf: $!";
+       symlink '../../jobs/' . $job->{'ID'} . '.job', $qf or die "Cannot create $qf: $!";
        return 1;
 }
 
@@ -145,7 +145,8 @@ sub scan($$) {
        my @list = ();
        if (opendir D, $queue->host_dir($machine)) {
                while ($_ = readdir D) {
-                       s/^q-// or next;
+                       /^\./ and next;
+                       s{\.job}{} or next;
                        push @list, $_;
                }
                closedir D;