/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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.
}
}
-char *encode_time(time_t time, char *buf)
+char *encode_time(utime_t utime, char *buf)
{
struct tm tm;
int n = 0;
+ time_t time = utime;
#if defined(HAVE_WIN32)
/*
case JS_Error:
jobstat = _("Non-fatal error");
break;
+ case JS_Warnings:
+ jobstat = _("OK -- with warnings");
+ break;
case JS_Canceled:
jobstat = _("Canceled");
break;
case JS_Terminated:
cnv = _("Completed successfully");
break;
+ case JS_Warnings:
+ cnv = _("Completed with warnings");
+ break;
case JS_ErrorTerminated:
cnv = _("Terminated with errors");
break;
if (cnv) {
bstrncpy(msg, cnv, maxlen);
} else {
- jobstatus_to_ascii( JobStatus, msg, maxlen);
+ jobstatus_to_ascii(JobStatus, msg, maxlen);
}
}
case JS_Terminated:
str = _("OK");
break;
+ case JS_Warnings:
+ str = _("OK -- with warnings");
+ break;
case JS_ErrorTerminated:
case JS_Error:
str = _("Error");
*/
const char *job_type_to_str(int type)
{
- const char *str;
+ const char *str = NULL;
switch (type) {
case JT_BACKUP:
str = _("Backup");
break;
+ case JT_MIGRATED_JOB:
+ str = _("Migrated Job");
+ break;
case JT_VERIFY:
str = _("Verify");
break;
case JT_RESTORE:
str = _("Restore");
break;
+ case JT_CONSOLE:
+ str = _("Console");
+ break;
+ case JT_SYSTEM:
+ str = _("System or Console");
+ break;
case JT_ADMIN:
str = _("Admin");
break;
- case JT_MIGRATE:
- str = _("Migrate");
+ case JT_ARCHIVE:
+ str = _("Archive");
+ break;
+ case JT_JOB_COPY:
+ str = _("Job Copy");
break;
case JT_COPY:
str = _("Copy");
break;
- case JT_CONSOLE:
- str = _("Console");
- break;
- case JT_SYSTEM:
- str = _("System or Console");
+ case JT_MIGRATE:
+ str = _("Migrate");
break;
case JT_SCAN:
str = _("Scan");
break;
- default:
- str = _("Unknown Type");
- break;
}
+ if (!str) {
+ str = _("Unknown Type");
+ }
return str;
}
+/* Convert ActionOnPurge to string (Truncate, Erase, Destroy)
+ */
+char *aop_to_str(int aop, POOL_MEM &ret)
+{
+ if (aop & AOP_TRUNCATE) {
+ pm_strcpy(ret, _("Truncate"));
+ }
+ if (!aop) {
+ pm_strcpy(ret, _("None"));
+ }
+ return ret.c_str();
+}
+
/*
* Convert Job Level into a string
*/
break;
case 'l':
if (jcr) {
- str = job_level_to_str(jcr->get_JobLevel());
+ str = job_level_to_str(jcr->getJobLevel());
} else {
str = _("*none*");
}
break;
case 't':
if (jcr) {
- str = job_type_to_str(jcr->get_JobType());
+ str = job_type_to_str(jcr->getJobType());
} else {
str = _("*none*");
}