From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 23 Jul 2009 12:24:13 +0000 (+0200)
Subject: Start adding Incomplete Job status
X-Git-Tag: Release-7.0.0~2650^2~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6389002a1b454e8be28ab32402719b6f025b164d;hp=6c90fbc506f0f89a27a5b5d19dd05f089dfae7bf;p=bacula%2Fbacula

Start adding Incomplete Job status
---

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 8c18ce7f89..5cfb0bbc70 100644
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-20098 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index e74b668cbb..7cc61482e6 100644
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -80,6 +80,7 @@
 #define JS_FatalError            'f'  /* Fatal error */
 #define JS_Differences           'D'  /* Verify differences */
 #define JS_Canceled              'A'  /* canceled by user */
+#define JS_Incomplete            'I'  /* Incomplete Job */
 #define JS_WaitFD                'F'  /* waiting on File daemon */
 #define JS_WaitSD                'S'  /* waiting on the Storage daemon */
 #define JS_WaitMedia             'm'  /* waiting for new media */
@@ -111,7 +112,9 @@ enum {
 #define job_canceled(jcr) \
   (jcr->JobStatus == JS_Canceled || \
    jcr->JobStatus == JS_ErrorTerminated || \
-   jcr->JobStatus == JS_FatalError)
+   jcr->JobStatus == JS_FatalError ||
+   jcr->JobStatus == JS_Incomplete \
+  )
 
 #define job_waiting(jcr) \
   (jcr->JobStatus == JS_WaitFD       || \
diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index f45683ef30..63460c3722 100644
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -367,9 +367,9 @@ JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr)
    /* Setup some dummy values */
    bstrncpy(jcr->Job, "*System*", sizeof(jcr->Job));
    jcr->JobId = 0;
-   jcr->set_JobType(JT_SYSTEM);          /* internal job until defined */
-   jcr->set_JobLevel(L_NONE);
-   set_jcr_job_status(jcr, JS_Created);       /* ready to run */
+   jcr->setJobType(JT_SYSTEM);           /* internal job until defined */
+   jcr->setJobLevel(L_NONE);
+   jcr->setJobStatus(JS_Created);        /* ready to run */
    set_jcr_in_tsd(jcr);
    sigtimer.sa_flags = 0;
    sigtimer.sa_handler = timeout_handler;
@@ -740,6 +740,7 @@ static int get_status_priority(int JobStatus)
    case JS_ErrorTerminated:
    case JS_FatalError:
    case JS_Canceled:
+   case JS_Incomplete:
       priority = 10;
       break;
    case JS_Error: