/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 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.
*
* Kern Sibbald, May MM, major revision December MMIII
*
- * Version $Id$
*/
#include "bacula.h"
ASSERT(job);
set_jcr_defaults(jcr, job);
if (run->level) {
- jcr->set_JobLevel(run->level); /* override run level */
+ jcr->setJobLevel(run->level); /* override run level */
}
if (run->pool) {
jcr->pool = run->pool; /* override pool */
if (run->spool_data_set) {
jcr->spool_data = run->spool_data;
}
+ if (run->accurate_set) { /* overwrite accurate mode */
+ jcr->accurate = run->accurate;
+ }
if (run->write_part_after_job_set) {
jcr->write_part_after_job = run->write_part_after_job;
}
+ if (run->MaxRunSchedTime_set) {
+ jcr->MaxRunSchedTime = run->MaxRunSchedTime;
+ }
Dmsg0(dbglvl, "Leave wait_for_next_job()\n");
return jcr;
}
JOB *job;
SCHED *sched;
struct tm tm;
- int minute;
int hour, mday, wday, month, wom, woy;
/* Items corresponding to above at the next hour */
- int nh_hour, nh_mday, nh_wday, nh_month, nh_wom, nh_woy, nh_year;
+ int nh_hour, nh_mday, nh_wday, nh_month, nh_wom, nh_woy;
Dmsg0(dbglvl, "enter find_runs()\n");
-
/* compute values for time now */
now = time(NULL);
(void)localtime_r(&now, &tm);
hour = tm.tm_hour;
- minute = tm.tm_min;
mday = tm.tm_mday - 1;
wday = tm.tm_wday;
month = tm.tm_mon;
nh_mday = tm.tm_mday - 1;
nh_wday = tm.tm_wday;
nh_month = tm.tm_mon;
- nh_year = tm.tm_year;
nh_wom = nh_mday / 7;
- nh_woy = tm_woy(now); /* get week of year */
+ nh_woy = tm_woy(next_hour); /* get week of year */
Dmsg7(dbglvl, "nh = %x: h=%d m=%d md=%d wd=%d wom=%d woy=%d\n",
next_hour, nh_hour, nh_month, nh_mday, nh_wday, nh_wom, nh_woy);