* Version $Id$
*
*/
-
/*
- Copyright (C) 2005 Kern Sibbald
+ Copyright (C) 2005-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 as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
+
#include "bacula.h"
#include "stored.h"
};
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;
}
case 11:
return Py_BuildValue(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");
+ 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");
+ Dmsg0(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");
+ Dmsg0(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) {
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;
}