-/*
- *
- * Bacula interface to Python for the Director
- *
- * Kern Sibbald, November MMIV
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2004-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 two of the GNU General Public
+ 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.
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
+ 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 John Walker.
+ 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 Director
+ *
+ * Kern Sibbald, November MMIV
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
#include "dird.h"
#undef _POSIX_C_SOURCE
#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);
+#include <lib/pythonlib.h>
+extern struct s_jl joblevels[];
static PyObject *set_job_events(PyObject *self, PyObject *arg);
static PyObject *job_run(PyObject *self, PyObject *arg);
{NULL, NULL, 0, NULL} /* last item */
};
-
struct s_vars {
const char *name;
- char *fmt;
+ const char *fmt;
};
/* Read-only variables */
}
switch (i) {
case 0: /* Job */
- return Py_BuildValue(getvars[i].fmt, jcr->job->hdr.name);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->job->hdr.name);
case 1: /* 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 2: /* 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 3: /* JobId */
- return Py_BuildValue(getvars[i].fmt, jcr->JobId);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->JobId);
case 4: /* Client */
- return Py_BuildValue(getvars[i].fmt, jcr->client->hdr.name);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->client->hdr.name);
case 5: /* NumVols */
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
if (db_get_pool_record(jcr, jcr->db, &pr)) {
jcr->NumVols = pr.NumVols;
- return Py_BuildValue(getvars[i].fmt, jcr->NumVols);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->NumVols);
} else {
bsnprintf(errmsg, sizeof(errmsg), _("Pool record not found."));
goto bail_out;
}
case 6: /* Pool */
- return Py_BuildValue(getvars[i].fmt, jcr->pool->name());
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->pool->name());
case 7: /* Storage */
if (jcr->wstore) {
- return Py_BuildValue(getvars[i].fmt, jcr->wstore->name());
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->wstore->name());
} else if (jcr->rstore) {
- return Py_BuildValue(getvars[i].fmt, jcr->rstore->name());
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->rstore->name());
} else {
goto bail_out;
}
case 8:
- return Py_BuildValue(getvars[i].fmt, jcr->catalog->name());
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->catalog->name());
case 9: /* MediaType */
if (jcr->wstore) {
- return Py_BuildValue(getvars[i].fmt, jcr->wstore->media_type);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->wstore->media_type);
} else if (jcr->rstore) {
- return Py_BuildValue(getvars[i].fmt, jcr->rstore->media_type);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->rstore->media_type);
} else {
goto bail_out;
}
case 10: /* JobName */
- return Py_BuildValue(getvars[i].fmt, jcr->Job);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->Job);
case 11: /* JobStatus */
buf[1] = 0;
buf[0] = jcr->JobStatus;
- return Py_BuildValue(getvars[i].fmt, buf);
+ return Py_BuildValue((char *)getvars[i].fmt, buf);
case 12: /* Priority */
- return Py_BuildValue(getvars[i].fmt, jcr->JobPriority);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->JobPriority);
case 13:
- return Py_BuildValue(getvars[i].fmt, jcr->VolumeName);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->VolumeName);
case 14: /* CatalogRes */
- return Py_BuildValue(getvars[i].fmt,
+ return Py_BuildValue((char *)getvars[i].fmt,
jcr->catalog->db_name, jcr->catalog->db_address,
jcr->catalog->db_user, jcr->catalog->db_password,
jcr->catalog->db_socket, jcr->catalog->db_port,
db_get_type());
case 15: /* JobErrors */
- return Py_BuildValue(getvars[i].fmt, jcr->JobErrors);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->JobErrors);
case 16: /* JobFiles */
- return Py_BuildValue(getvars[i].fmt, jcr->JobFiles);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->JobFiles);
case 17: /* SDJobFiles */
- return Py_BuildValue(getvars[i].fmt, jcr->SDJobFiles);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->SDJobFiles);
case 18: /* SDErrors */
- return Py_BuildValue(getvars[i].fmt, jcr->SDErrors);
+ return Py_BuildValue((char *)getvars[i].fmt, jcr->SDErrors);
case 19: /* FDJobStatus */
buf[1] = 0;
buf[0] = jcr->FDJobStatus;
- return Py_BuildValue(getvars[i].fmt, buf);
- case 29: /* SDJobStatus */
+ return Py_BuildValue((char *)getvars[i].fmt, buf);
+ case 20: /* SDJobStatus */
buf[1] = 0;
buf[0] = jcr->SDJobStatus;
- return Py_BuildValue(getvars[i].fmt, buf);
+ return Py_BuildValue((char *)getvars[i].fmt, buf);
}
bsnprintf(errmsg, sizeof(errmsg), _("Attribute %s not found."), attrname);
bail_out:
if (setvars[i].fmt != NULL) {
switch (setvars[i].fmt[0]) {
case 's':
- if (!PyArg_Parse(value, setvars[i].fmt, &strval)) {
+ if (!PyArg_Parse(value, (char *)setvars[i].fmt, &strval)) {
PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
break;
case 'i':
- if (!PyArg_Parse(value, setvars[i].fmt, &intval)) {
+ if (!PyArg_Parse(value, (char *)setvars[i].fmt, &intval)) {
PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
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;
- jcr->jr.JobLevel = jcr->JobLevel;
- return 0;
+ if (strval != NULL) {
+ for (i=0; joblevels[i].level_name; i++) {
+ if (strcmp(strval, joblevels[i].level_name) == 0) {
+ if (joblevels[i].job_type == jcr->getJobType()) {
+ jcr->set_JobLevel(joblevels[i].level);
+ jcr->jr.JobLevel = jcr->getJobLevel();
+ return 0;
+ }
}
}
}
}
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()) {
projects / bacula / bacula / blobdiff