/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-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.
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.
ua->warning_msg(_("No files selected to be restored.\n"));
goto bail_out;
}
+ display_bsr_info(ua, rx); /* display vols needed, etc */
+
/* If no count of files, use bsr generated value (often wrong) */
if (rx.selected_files == 0) {
rx.selected_files = selected_files;
"add_suffix", /* 17 */
"regexwhere", /* 18 */
"restoreclient", /* 19 */
+ "copies", /* 20 */
NULL
};
Dmsg2(100, "split path=%s file=%s\n", rx->path, rx->fname);
}
+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 (get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) {
+ if (ua->pint32_val == 1)
+ return true;
+ while (get_cmd(ua, _("\nRegexp matching files to restore? (empty to abort): "))) {
+ if (ua->cmd[0] == '\0') {
+ break;
+ } else {
+ regex_t *fileregex_re = NULL;
+ int rc;
+ char errmsg[500] = "";
+
+ fileregex_re = (regex_t *)bmalloc(sizeof(regex_t));
+ rc = regcomp(fileregex_re, ua->cmd, REG_EXTENDED|REG_NOSUB);
+ if (rc != 0)
+ regerror(rc, fileregex_re, errmsg, sizeof(errmsg));
+ regfree(fileregex_re);
+ free(fileregex_re);
+ if (*errmsg) {
+ ua->send_msg(_("Regex compile error: %s\n"), errmsg);
+ } else {
+ rx->bsr->fileregex = bstrdup(ua->cmd);
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+}
+
static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx)
{
TREE_CTX tree;
ua->info_msg(_("\nBuilding directory tree for JobId(s) %s ... "),
rx->JobIds);
+#define new_get_file_list
+#ifdef new_get_file_list
if (!db_get_file_list(ua->jcr, ua->db, rx->JobIds, insert_tree_handler, (void *)&tree)) {
ua->error_msg("%s", db_strerror(ua->db));
}
+#else
+ for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+ char ed1[50];
+
+ if (JobId == last_JobId) {
+ continue; /* eliminate duplicate JobIds */
+ }
+ last_JobId = JobId;
+ /*
+ * Find files for this JobId and insert them in the tree
+ */
+ Mmsg(rx->query, uar_sel_files, edit_int64(JobId, ed1));
+ if (!db_sql_query(ua->db, rx->query, insert_tree_handler, (void *)&tree)) {
+ ua->error_msg("%s", db_strerror(ua->db));
+ }
+ }
+#endif
if (tree.FileCount == 0) {
- 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 (!get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) {
- OK = false;
- } else {
+ OK = ask_for_fileregex(ua, rx);
+ if (OK) {
last_JobId = 0;
for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
if (JobId == last_JobId) {
continue; /* eliminate duplicate JobIds */
}
add_findex_all(rx->bsr, JobId);
- }
- OK = true;
+ }
}
} else {
char ec1[50];
bool ok = false;
FILESET_DBR fsr;
CLIENT_DBR cr;
+ POOL_MEM other_filter(PM_MESSAGE);
+ POOL_MEM temp_filter(PM_MESSAGE);
char fileset_name[MAX_NAME_LENGTH];
char ed1[50], ed2[50];
- char pool_select[MAX_NAME_LENGTH];
int i;
/* Create temp tables */
}
/* If Pool specified, add PoolId specification */
- pool_select[0] = 0;
if (rx->pool) {
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, rx->pool->name(), sizeof(pr.Name));
if (db_get_pool_record(ua->jcr, ua->db, &pr)) {
- bsnprintf(pool_select, sizeof(pool_select), "AND Media.PoolId=%s ",
- edit_int64(pr.PoolId, ed1));
+ Mmsg(other_filter, " AND Media.PoolId=%s ",
+ edit_int64(pr.PoolId, ed1));
} else {
ua->warning_msg(_("Pool \"%s\" not found, using any pool.\n"), pr.Name);
}
}
+ /* include copies or not in job selection */
+ if (find_arg(ua, NT_("copies")) > 0) {
+ Mmsg(temp_filter, "%s AND Job.Type IN ('%c', '%c') ",
+ other_filter.c_str(), (char)JT_BACKUP, (char)JT_JOB_COPY);
+ } else {
+ Mmsg(temp_filter, "%s AND Job.Type = '%c' ", other_filter.c_str(),
+ (char)JT_BACKUP);
+ }
+ pm_strcpy(other_filter, temp_filter.c_str());
/* Find JobId of last Full backup for this client, fileset */
edit_int64(cr.ClientId, ed1);
Mmsg(rx->query, uar_last_full, ed1, ed1, date, fsr.FileSet,
- pool_select);
+ other_filter.c_str());
+ Dmsg1(0, "sql=%s\n", rx->query);
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
ua->error_msg("%s\n", db_strerror(ua->db));
goto bail_out;
/* Now find most recent Differental Job after Full save, if any */
Mmsg(rx->query, uar_dif, edit_uint64(rx->JobTDate, ed1), date,
- edit_int64(cr.ClientId, ed2), fsr.FileSet, pool_select);
+ edit_int64(cr.ClientId, ed2), fsr.FileSet, other_filter.c_str());
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 */
rx->JobTDate = 0;
+ Dmsg1(0, "sql=%s\n", rx->query);
if (!db_sql_query(ua->db, uar_sel_all_temp, last_full_handler, (void *)rx)) {
ua->warning_msg("%s\n", db_strerror(ua->db));
}
/* Now find all Incremental Jobs after Full/dif save */
Mmsg(rx->query, uar_inc, edit_uint64(rx->JobTDate, ed1), date,
- edit_int64(cr.ClientId, ed2), fsr.FileSet, pool_select);
+ edit_int64(cr.ClientId, ed2), fsr.FileSet, other_filter.c_str());
+ Dmsg1(0, "sql=%s\n", rx->query);
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
ua->warning_msg("%s\n", db_strerror(ua->db));
}
}
if (rx->JobIds[0] != 0) {
+ /* Display a list of all copies */
+ db_list_copies_records(ua->jcr, ua->db, 0, rx->JobIds, prtit, ua, HORZ_LIST);
/* Display a list of Jobs selected for this restore */
db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1, HORZ_LIST);
ok = true;
*/
int get_next_jobid_from_list(char **p, JobId_t *JobId)
{
- char jobid[30];
+ const int maxlen = 30;
+ char jobid[maxlen+1];
char *q = *p;
jobid[0] = 0;
- for (int i=0; i<(int)sizeof(jobid); i++) {
+ for (int i=0; i<maxlen; i++) {
if (*q == 0) {
break;
} else if (*q == ',') {
/* Take command line arg, or ask user if none */
rx.store = get_storage_resource(ua, false /* don't use default */);
- Dmsg1(200, "Set store=%s\n", rx.store->name());
+ if (rx.store) {
+ Dmsg1(200, "Set store=%s\n", rx.store->name());
+ }
}