- Tweak catalog make scripts.

[bacula/bacula] / bacula / src / dird / pythondir.c

diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c
index 5893be1d784425f1e7b7bdd31ebf02ed4ab8065a..d64bb23e3da7dd5780eba9c754eb6af3cca88c1c 100644 (file)
--- a/bacula/src/dird/pythondir.c
+++ b/bacula/src/dird/pythondir.c
@@ -8,7 +8,7 @@
  *
  */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   Copyright (C) 2004-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -30,6 +30,7 @@
 #include <Python.h>
 
 extern char *configfile;
+extern struct s_jl joblevels[];
 extern JCR *get_jcr_from_PyObject(PyObject *self);
 extern PyObject *find_method(PyObject *eventsObject, PyObject *method, 
          const char *name);
@@ -58,29 +59,31 @@ struct s_vars {
 
 /* Read-only variables */
 static struct s_vars getvars[] = {
-   { N_("Job"),        "s"},
-   { N_("Level"),      "s"},
-   { N_("Type"),       "s"},
-   { N_("JobId"),      "i"},
-   { N_("Client"),     "s"},
-   { N_("NumVols"),    "i"},
-   { N_("Pool"),       "s"},
-   { N_("Storage"),    "s"},
-   { N_("Catalog"),    "s"},
-   { N_("MediaType"),  "s"},
-   { N_("JobName"),    "s"},
-   { N_("JobStatus"),  "s"},
-   { N_("Priority"),   "i"},
-   { N_("CatalogRes"), "(sssssis)"},
+   { "Job",        "s"},
+   { "Level",      "s"},
+   { "Type",       "s"},
+   { "JobId",      "i"},
+   { "Client",     "s"},
+   { "NumVols",    "i"},
+   { "Pool",       "s"},
+   { "Storage",    "s"},
+   { "Catalog",    "s"},
+   { "MediaType",  "s"},
+   { "JobName",    "s"},
+   { "JobStatus",  "s"},
+   { "Priority",   "i"},
+   { "VolumeName", "s"},
+   { "CatalogRes", "(sssssis)"},
 
    { NULL,             NULL}
 };
 
 /* Writable variables */
 static struct s_vars setvars[] = {
-   { N_("JobReport"),   "s"},
-   { N_("VolumeName"),  "s"},
-   { N_("Priority"),    "i"},
+   { "JobReport",   "s"},
+   { "VolumeName",  "s"},
+   { "Priority",    "i"},
+   { "JobLevel",    "s"},
 
    { NULL,             NULL}
 };
@@ -137,13 +140,25 @@ PyObject *job_getattr(PyObject *self, char *attrname)
          goto bail_out;
       }
    case 6:                            /* Pool */
-      return Py_BuildValue(getvars[i].fmt, jcr->pool->hdr.name);
+      return Py_BuildValue(getvars[i].fmt, jcr->pool->name());
    case 7:                            /* Storage */
-      return Py_BuildValue(getvars[i].fmt, jcr->store->hdr.name);
+      if (jcr->wstore) {
+         return Py_BuildValue(getvars[i].fmt, jcr->wstore->name());
+      } else if (jcr->rstore) {
+         return Py_BuildValue(getvars[i].fmt, jcr->rstore->name());
+      } else {
+         goto bail_out;
+      }
    case 8:
-      return Py_BuildValue(getvars[i].fmt, jcr->catalog->hdr.name);
+      return Py_BuildValue(getvars[i].fmt, jcr->catalog->name());
    case  9:                           /* MediaType */
-      return Py_BuildValue(getvars[i].fmt, jcr->store->media_type);
+      if (jcr->wstore) {
+         return Py_BuildValue(getvars[i].fmt, jcr->wstore->media_type);
+      } else if (jcr->rstore) {
+         return Py_BuildValue(getvars[i].fmt, jcr->rstore->media_type);
+      } else {
+         goto bail_out;
+      }
    case 10:                           /* JobName */
       return Py_BuildValue(getvars[i].fmt, jcr->Job);
    case 11:                           /* JobStatus */
@@ -152,7 +167,9 @@ PyObject *job_getattr(PyObject *self, char *attrname)
       return Py_BuildValue(getvars[i].fmt, buf);
    case 12:                           /* Priority */
       return Py_BuildValue(getvars[i].fmt, jcr->JobPriority);
-   case 13:                           /* CatalogRes */
+   case 13:
+      return Py_BuildValue(getvars[i].fmt, jcr->VolumeName);
+   case 14:                           /* CatalogRes */
       return Py_BuildValue(getvars[i].fmt,
          jcr->catalog->db_name, jcr->catalog->db_address, 
          jcr->catalog->db_user, jcr->catalog->db_password,
@@ -232,14 +249,36 @@ int job_setattr(PyObject *self, char *attrname, PyObject *value)
       break;
    case 2:                            /* Priority */
       Dmsg1(000, "Set priority=%d\n", intval);
-      return 0;
+      if (intval >= 1 && intval <= 100) {
+         jcr->JobPriority = intval;
+      } else {
+         PyErr_SetString(PyExc_ValueError, _("Priority must be 1-100"));
+         return -1;
+      }
+   case 3:                            /* Job Level */
+      if (strcmp("JobInit", jcr->event) != 0) {
+         PyErr_SetString(PyExc_RuntimeError, _("Job Level can be set only during JobInit"));
+         return -1;
+      }
+      for (i=0; joblevels[i].level_name; i++) {
+         if (strcmp(strval, joblevels[i].level_name) == 0) {
+            if (joblevels[i].job_type == jcr->JobType) {
+               jcr->JobLevel = joblevels[i].level;
+               return 0;
+            }
+         }
+      }
+      PyErr_SetString(PyExc_ValueError, _("Bad JobLevel string"));
+      return -1;
    }
 bail_out:
    PyErr_SetString(PyExc_AttributeError, attrname);
    return -1;
 }
 
-
+/*
+ * Set pointer to instantiated events class
+ */
 static PyObject *set_job_events(PyObject *self, PyObject *arg)
 {
    PyObject *eObject;
@@ -258,7 +297,7 @@ static PyObject *set_job_events(PyObject *self, PyObject *arg)
    return Py_None;
 }
 
-/* Run a Bacula command */
+/* Run a Bacula job */
 static PyObject *job_run(PyObject *self, PyObject *arg)
 {
    JCR *jcr;
@@ -270,7 +309,7 @@ static PyObject *job_run(PyObject *self, PyObject *arg)
       return NULL;
    }
    /* Release lock due to recursion */
-   PyEval_ReleaseLock();
+// PyEval_ReleaseLock();
    jcr = get_jcr_from_PyObject(self);
    UAContext *ua = new_ua_context(jcr);
    ua->batch = true;
@@ -278,7 +317,7 @@ static PyObject *job_run(PyObject *self, PyObject *arg)
    parse_ua_args(ua);                 /* parse command */
    stat = run_cmd(ua, ua->cmd);
    free_ua_context(ua);
-   PyEval_AcquireLock();
+// PyEval_AcquireLock();
    return PyInt_FromLong((long)stat);
 }
 
@@ -332,7 +371,6 @@ static PyObject *job_cancel(PyObject *self, PyObject *args)
    }
    foreach_jcr(jcr) {
       if (jcr->JobId == 0) {
-         free_jcr(jcr);
          continue;
       }
       if (jcr->JobId == JobId) {
@@ -340,11 +378,13 @@ static PyObject *job_cancel(PyObject *self, PyObject *args)
          break;
       }
    }
+   /* endeach_jcr(jcr) not needed because freed below */
+
    if (!found) {
       /* ***FIXME*** raise exception */
       return NULL;
    }
-   PyEval_ReleaseLock();
+// PyEval_ReleaseLock();
    UAContext *ua = new_ua_context(jcr);
    ua->batch = true;
    if (!cancel_job(ua, jcr)) {
@@ -353,7 +393,7 @@ static PyObject *job_cancel(PyObject *self, PyObject *args)
    }
    free_ua_context(ua);
    free_jcr(jcr);
-   PyEval_AcquireLock();   
+// PyEval_AcquireLock();   
    Py_INCREF(Py_None);
    return Py_None;
 }
@@ -375,7 +415,8 @@ int generate_job_event(JCR *jcr, const char *event)
       return 0;
    }
 
-   PyEval_AcquireLock();
+   lock_python();
+// PyEval_AcquireLock();
 
    method = find_method(events, method, event);
    if (!method) {
@@ -396,7 +437,8 @@ int generate_job_event(JCR *jcr, const char *event)
    Py_XDECREF(result);
 
 bail_out:
-   PyEval_ReleaseLock();
+   unlock_python();
+// PyEval_ReleaseLock();
    return stat;
 }