_("Find the JobIds of the most recent backup for a client"),
_("Find the JobIds for a backup for a client before a specified time"),
_("Enter a list of directories to restore for found JobIds"),
+ _("Select full restore to a specified JobId"),
_("Cancel"),
NULL };
}
return 2;
- case 11: /* Cancel or quit */
+ case 11: /* Choose a jobid and select jobs */
+ if (!get_cmd(ua, _("Enter JobId to restore: ")) ||
+ !is_an_integer(ua->cmd))
+ {
+ return 0;
+ }
+
+ memset(&jr, 0, sizeof(JOB_DBR));
+ jr.JobId = str_to_int64(ua->cmd);
+ if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
+ ua->error_msg(_("Unable to get Job record for JobId=%s: ERR=%s\n"),
+ ua->cmd, db_strerror(ua->db));
+ return 0;
+ }
+ jr.JobLevel = L_INCREMENTAL; /* Take Full+Diff+Incr */
+ if (!db_accurate_get_jobids(ua->jcr, ua->db, &jr, rx->JobIds)) {
+ return 0;
+ }
+ Dmsg1(30, "Item 12: jobids = %s\n", rx->JobIds);
+ break;
+ case 12: /* Cancel or quit */
return 0;
}
}
+ memset(&jr, 0, sizeof(JOB_DBR));
POOLMEM *JobIds = get_pool_memory(PM_FNAME);
*JobIds = 0;
rx->TotalFiles = 0;
static bool ask_for_fileregex(UAContext *ua, RESTORE_CTX *rx)
{
- ua->send_msg(_("\nThere were no files inserted into the tree, so file selection\n"
- "is not possible.Most likely your retention policy pruned the files\n"));
+ if (find_arg(ua, NT_("all")) >= 0) { /* if user enters all on command line */
+ return true; /* select everything */
+ }
+ ua->send_msg(_("\n\nFor one or more of the JobIds selected, no files were found,\n"
+ "so file selection is not possible.\n"
+ "Most likely your retention policy pruned the files.\n"));
if (get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) {
if (ua->pint32_val == 1)
return true;
fileregex_re = (regex_t *)bmalloc(sizeof(regex_t));
rc = regcomp(fileregex_re, ua->cmd, REG_EXTENDED|REG_NOSUB);
- if (rc != 0)
+ if (rc != 0) {
regerror(rc, fileregex_re, errmsg, sizeof(errmsg));
+ }
regfree(fileregex_re);
free(fileregex_re);
if (*errmsg) {
}
}
#endif
+ /*
+ * Look at the first JobId on the list (presumably the oldest) and
+ * if it is marked purged, don't do the manual selection because
+ * the Job was pruned, so the tree is incomplete.
+ */
+ if (tree.FileCount != 0) {
+ /* Find out if any Job is purged */
+ Mmsg(rx->query, "SELECT SUM(PurgedFiles) FROM Job WHERE JobId IN (%s)", rx->JobIds);
+ if (!db_sql_query(ua->db, rx->query, restore_count_handler, (void *)rx)) {
+ ua->error_msg("%s\n", db_strerror(ua->db));
+ }
+ /* rx->JobId is the PurgedFiles flag */
+ if (rx->found && rx->JobId > 0) {
+ tree.FileCount = 0; /* set count to zero, no tree selection */
+ }
+ }
if (tree.FileCount == 0) {
OK = ask_for_fileregex(ua, rx);
if (OK) {
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
ua->warning_msg("%s\n", db_strerror(ua->db));
}
- /* Now update JobTDate to lock onto Differental, if any */
+ /* Now update JobTDate to look into Differental, if any */
rx->JobTDate = 0;
if (!db_sql_query(ua->db, uar_sel_all_temp, last_full_handler, (void *)rx)) {
ua->warning_msg("%s\n", db_strerror(ua->db));
return ok;
}
-
-/*
- * Return next JobId from comma separated list
- *
- * Returns:
- * 1 if next JobId returned
- * 0 if no more JobIds are in list
- * -1 there is an error
- */
-int get_next_jobid_from_list(char **p, JobId_t *JobId)
-{
- const int maxlen = 30;
- char jobid[maxlen+1];
- char *q = *p;
-
- jobid[0] = 0;
- for (int i=0; i<maxlen; i++) {
- if (*q == 0) {
- break;
- } else if (*q == ',') {
- q++;
- break;
- }
- jobid[i] = *q++;
- jobid[i+1] = 0;
- }
- if (jobid[0] == 0) {
- return 0;
- } else if (!is_a_number(jobid)) {
- return -1; /* error */
- }
- *p = q;
- *JobId = str_to_int64(jobid);
- return 1;
-}
-
static int restore_count_handler(void *ctx, int num_fields, char **row)
{
RESTORE_CTX *rx = (RESTORE_CTX *)ctx;