+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2005-2008 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.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula interface to Python for the Storage Daemon
*
*/
-/*
- Copyright (C) 2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
-
- */
#include "bacula.h"
#include "stored.h"
#undef _POSIX_C_SOURCE
#include <Python.h>
-extern JCR *get_jcr_from_PyObject(PyObject *self);
-extern PyObject *find_method(PyObject *eventsObject, PyObject *method,
- const char *name);
+#include <lib/pythonlib.h>
static PyObject *set_job_events(PyObject *self, PyObject *arg);
static PyObject *job_write(PyObject *self, PyObject *arg);
struct s_vars {
const char *name;
- char *fmt;
+ const char *fmt;
};
static struct s_vars getvars[] = {
- { N_("Job"), "s"}, /* 0 */
- { N_("SDName"), "s"}, /* 1 */
- { N_("Level"), "s"}, /* 2 */
- { N_("Type"), "s"}, /* 3 */
- { N_("JobId"), "i"}, /* 4 */
- { N_("Client"), "s"}, /* 5 */
- { N_("Pool"), "s"}, /* 6 */
- { N_("MediaType"), "s"}, /* 7 */
- { N_("JobName"), "s"}, /* 8 */
- { N_("JobStatus"), "s"}, /* 9 */
- { N_("VolumeName"), "s"}, /* 10 */
- { N_("Device"), "s"}, /* 11 */
+ { NT_("Job"), "s"}, /* 0 */
+ { NT_("SDName"), "s"}, /* 1 */
+ { NT_("Level"), "s"}, /* 2 */
+ { NT_("Type"), "s"}, /* 3 */
+ { NT_("JobId"), "i"}, /* 4 */
+ { NT_("Client"), "s"}, /* 5 */
+ { NT_("Pool"), "s"}, /* 6 */
+ { NT_("MediaType"), "s"}, /* 7 */
+ { NT_("JobName"), "s"}, /* 8 */
+ { NT_("JobStatus"), "s"}, /* 9 */
+ { NT_("VolumeName"), "s"}, /* 10 */
+ { NT_("Device"), "s"}, /* 11 */
{ NULL, NULL}
};
/* Writable variables */
static struct s_vars setvars[] = {
- { N_("JobReport"), "s"},
+ { NT_("JobReport"), "s"},
{ NULL, NULL}
};
Dmsg1(100, "In job_getattr=%s\n", attrname);
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;
}
}
switch (i) {
case 0: /* Job */
- return Py_BuildValue(getvars[i].fmt, jcr->job_name); /* Non-unique name */
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->job_name); /* Non-unique name */
case 1: /* SD's name */
- return Py_BuildValue(getvars[i].fmt, my_name);
+ return Py_BuildValue((char *)getvars[i].fmt, my_name);
case 2: /* level */
- return Py_BuildValue(getvars[i].fmt, job_level_to_str(jcr->JobLevel));
+ return Py_BuildValue((char *)getvars[i].fmt, job_level_to_str(jcr->getJobLevel()));
case 3: /* type */
- return Py_BuildValue(getvars[i].fmt, job_type_to_str(jcr->JobType));
+ return Py_BuildValue((char *)getvars[i].fmt, job_type_to_str(jcr->getJobType()));
case 4: /* JobId */
- return Py_BuildValue(getvars[i].fmt, jcr->JobId);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->JobId);
case 5: /* Client */
- return Py_BuildValue(getvars[i].fmt, jcr->client_name);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->client_name);
case 6: /* Pool */
- return Py_BuildValue(getvars[i].fmt, jcr->dcr->pool_name);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->dcr->pool_name);
case 7: /* MediaType */
- return Py_BuildValue(getvars[i].fmt, jcr->dcr->media_type);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->dcr->media_type);
case 8: /* JobName */
- return Py_BuildValue(getvars[i].fmt, jcr->Job);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->Job);
case 9: /* JobStatus */
buf[1] = 0;
buf[0] = jcr->JobStatus;
- return Py_BuildValue(getvars[i].fmt, buf);
+ return Py_BuildValue((char *)getvars[i].fmt, buf);
case 10:
- return Py_BuildValue(getvars[i].fmt, jcr->dcr->VolumeName);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->dcr->VolumeName);
case 11:
- return Py_BuildValue(getvars[i].fmt, jcr->dcr->dev_name);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->dcr->dev_name);
}
- 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;
Dmsg2(100, "In job_setattr=%s val=%p.\n", attrname, value);
if (value == NULL) { /* Cannot delete variables */
- bsnprintf(buf, sizeof(buf), "Cannot delete attribute %s", attrname);
+ bsnprintf(buf, sizeof(buf), _("Cannot delete attribute %s"), attrname);
errmsg = buf;
goto bail_out;
}
jcr = get_jcr_from_PyObject(self);
if (!jcr) {
- errmsg = "Job pointer not found.";
+ errmsg = _("Job pointer not found.");
goto bail_out;
}
}
/* Get argument value ***FIXME*** handle other formats */
if (setvars[i].fmt != NULL) {
- if (!PyArg_Parse(value, setvars[i].fmt, &strval)) {
- PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+ if (!PyArg_Parse(value, (char *)setvars[i].fmt, &strval)) {
+ PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
}
return 0;
}
not_found:
- bsnprintf(buf, sizeof(buf), "Cannot find attribute %s", attrname);
+ bsnprintf(buf, sizeof(buf), _("Cannot find attribute %s"), attrname);
errmsg = buf;
bail_out:
PyErr_SetString(PyExc_AttributeError, errmsg);
Dmsg0(100, "In set_job_events.\n");
if (!PyArg_ParseTuple(arg, "O:set_events", &eObject)) {
- Dmsg0(000, "Error in ParseTuple\n");
+ Pmsg0(000, _("Error in ParseTuple\n"));
return NULL;
}
jcr = get_jcr_from_PyObject(self);
char *text = NULL;
if (!PyArg_ParseTuple(args, "s:write", &text)) {
- Dmsg0(000, "Parse tuple error in job_write\n");
+ Pmsg0(000, _("Parse tuple error in job_write\n"));
return NULL;
}
if (text) {
return 0;
}
- PyEval_AcquireLock();
+ lock_python();
+// PyEval_AcquireLock();
method = find_method(events, method, event);
if (!method) {
}
bstrncpy(jcr->event, event, sizeof(jcr->event));
- result = PyObject_CallFunction(method, "O", Job);
+ result = PyObject_CallFunction(method, (char *)"O", Job);
jcr->event[0] = 0; /* no event in progress */
if (result == NULL) {
if (PyErr_Occurred()) {
PyErr_Print();
- Dmsg1(000, "Error in Python method %s\n", event);
+ Dmsg1(000, _("Error in Python method %s\n"), event);
}
} else {
stat = 1;
Py_XDECREF(result);
bail_out:
- PyEval_ReleaseLock();
+ unlock_python();
+// PyEval_ReleaseLock();
return stat;
}
projects / bacula / bacula / blobdiff