X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fpythondir.c;h=5893be1d784425f1e7b7bdd31ebf02ed4ab8065a;hb=fce6a648a27ee86f6941a5085ec7909f6d43e725;hp=25dcac8bd62aeb78d835f160b99c4460e1395a19;hpb=4f97db494e3f35d5458781c229d470b26aef75ec;p=bacula%2Fbacula

diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c
index 25dcac8bd6..5893be1d78 100644
--- a/bacula/src/dird/pythondir.c
+++ b/bacula/src/dird/pythondir.c
@@ -59,7 +59,6 @@ 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"},
@@ -72,9 +71,6 @@ static struct s_vars getvars[] = {
    { N_("JobName"),    "s"},
    { N_("JobStatus"),  "s"},
    { N_("Priority"),   "i"},
-   { N_("Version"),    "(ss)"},
-   { N_("ConfigFile"), "s"},
-   { N_("WorkingDir"), "s"},
    { N_("CatalogRes"), "(sssssis)"},
 
    { NULL,             NULL}
@@ -105,7 +101,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 +117,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 +133,26 @@ 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:                           /* 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 +160,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 +203,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;