- Fix the block listing bug pointed out by Arno.

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

diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c
index 25dcac8bd62aeb78d835f160b99c4460e1395a19..17e2f58984062fad96eded91da308bc6d7576b2e 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
@@ -58,33 +58,30 @@ struct s_vars {
 
 /* Read-only variables */
 static struct s_vars getvars[] = {
-   { N_("Job"),        "s"},
-   { N_("DirName"),    "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_("Version"),    "(ss)"},
-   { N_("ConfigFile"), "s"},
-   { N_("WorkingDir"), "s"},
-   { 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"},
 
    { NULL,             NULL}
 };
@@ -105,7 +102,7 @@ PyObject *job_getattr(PyObject *self, char *attrname)
    Dmsg0(100, "In job_getattr.\n");
    jcr = get_jcr_from_PyObject(self);
    if (!jcr) {
-      bstrncpy(errmsg, "Job pointer not found.", sizeof(errmsg));
+      bstrncpy(errmsg, _("Job pointer not found."), sizeof(errmsg));
       goto bail_out;
    }
    for (i=0; getvars[i].name; i++) {
@@ -121,17 +118,15 @@ PyObject *job_getattr(PyObject *self, char *attrname)
    switch (i) {
    case 0:                            /* Job */
       return Py_BuildValue(getvars[i].fmt, jcr->job->hdr.name);
-   case 1:                            /* Director's name */
-      return Py_BuildValue(getvars[i].fmt, my_name);
-   case 2:                            /* level */
+   case 1:                            /* level */
       return Py_BuildValue(getvars[i].fmt, job_level_to_str(jcr->JobLevel));
-   case 3:                            /* type */
+   case 2:                            /* type */
       return Py_BuildValue(getvars[i].fmt, job_type_to_str(jcr->JobType));
-   case 4:                            /* JobId */
+   case 3:                            /* JobId */
       return Py_BuildValue(getvars[i].fmt, jcr->JobId);
-   case 5:                            /* Client */
+   case 4:                            /* Client */
       return Py_BuildValue(getvars[i].fmt, jcr->client->hdr.name);
-   case 6:                            /* NumVols */
+   case 5:                            /* NumVols */
       POOL_DBR pr;
       memset(&pr, 0, sizeof(pr));
       bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
@@ -139,32 +134,28 @@ PyObject *job_getattr(PyObject *self, char *attrname)
          jcr->NumVols = pr.NumVols;
          return Py_BuildValue(getvars[i].fmt, jcr->NumVols);
       } else {
-         bsnprintf(errmsg, sizeof(errmsg), "Pool record not found.");
+         bsnprintf(errmsg, sizeof(errmsg), _("Pool record not found."));
          goto bail_out;
       }
-   case 7:                            /* Pool */
+   case 6:                            /* Pool */
       return Py_BuildValue(getvars[i].fmt, jcr->pool->hdr.name);
-   case 8:                            /* Storage */
+   case 7:                            /* Storage */
       return Py_BuildValue(getvars[i].fmt, jcr->store->hdr.name);
-   case 9:
+   case 8:
       return Py_BuildValue(getvars[i].fmt, jcr->catalog->hdr.name);
-   case 10:                           /* MediaType */
+   case  9:                           /* MediaType */
       return Py_BuildValue(getvars[i].fmt, jcr->store->media_type);
-   case 11:                           /* JobName */
+   case 10:                           /* JobName */
       return Py_BuildValue(getvars[i].fmt, jcr->Job);
-   case 12:                           /* JobStatus */
+   case 11:                           /* JobStatus */
       buf[1] = 0;
       buf[0] = jcr->JobStatus;
       return Py_BuildValue(getvars[i].fmt, buf);
-   case 13:                           /* Priority */
+   case 12:                           /* Priority */
       return Py_BuildValue(getvars[i].fmt, jcr->JobPriority);
-   case 14:                           /* Version */
-      return Py_BuildValue(getvars[i].fmt, VERSION, BDATE);
-   case 15:                           /* Config Dir */
-      return Py_BuildValue(getvars[i].fmt, configfile);
-   case 16:                           /* Working Dir */
-      return Py_BuildValue(getvars[i].fmt, director->working_directory);
-   case 17:                           /* 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,
@@ -172,7 +163,7 @@ PyObject *job_getattr(PyObject *self, char *attrname)
          catalog_db);
 
    }
-   bsnprintf(errmsg, sizeof(errmsg), "Attribute %s not found.", attrname);
+   bsnprintf(errmsg, sizeof(errmsg), _("Attribute %s not found."), attrname);
 bail_out:
    PyErr_SetString(PyExc_AttributeError, errmsg);
    return NULL;
@@ -215,13 +206,13 @@ int job_setattr(PyObject *self, char *attrname, PyObject *value)
       switch (setvars[i].fmt[0]) {
       case 's':
          if (!PyArg_Parse(value, setvars[i].fmt, &strval)) {
-            PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+            PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
             return -1;
          }
          break;
       case 'i':
          if (!PyArg_Parse(value, setvars[i].fmt, &intval)) {
-            PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+            PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
             return -1;
          }
          break;
@@ -251,7 +242,9 @@ bail_out:
    return -1;
 }
 
-
+/*
+ * Set pointer to instantiated events class
+ */
 static PyObject *set_job_events(PyObject *self, PyObject *arg)
 {
    PyObject *eObject;
@@ -270,7 +263,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;
@@ -344,7 +337,6 @@ static PyObject *job_cancel(PyObject *self, PyObject *args)
    }
    foreach_jcr(jcr) {
       if (jcr->JobId == 0) {
-         free_jcr(jcr);
          continue;
       }
       if (jcr->JobId == JobId) {
@@ -352,6 +344,8 @@ static PyObject *job_cancel(PyObject *self, PyObject *args)
          break;
       }
    }
+   /* endeach_jcr(jcr) not needed because freed below */
+
    if (!found) {
       /* ***FIXME*** raise exception */
       return NULL;