/*
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)
+{
+ if (find_arg(ua, NT_("all")) >= 0) { /* if user enters all on command line */
+ return true; /* select everything */
+ }
+ 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;
* For display purposes, the same JobId, with different volumes may
* appear more than once, however, we only insert it once.
*/
- int items = 0;
p = rx->JobIds;
tree.FileEstimate = 0;
if (get_next_jobid_from_list(&p, &JobId) > 0) {
tree.DeltaCount = rx->JobId/50; /* print 50 ticks */
}
}
+
+ 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];
continue; /* eliminate duplicate JobIds */
}
last_JobId = JobId;
- ua->info_msg(_("\nBuilding directory tree for JobId %s ... "),
- edit_int64(JobId, ed1));
- items++;
/*
* Find files for this JobId and insert them in the 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];
- if (items==1) {
- if (tree.all) {
- ua->info_msg(_("\n1 Job, %s files inserted into the tree and marked for extraction.\n"),
- edit_uint64_with_commas(tree.FileCount, ec1));
- }
- else {
- ua->info_msg(_("\n1 Job, %s files inserted into the tree.\n"),
- edit_uint64_with_commas(tree.FileCount, ec1));
- }
- }
- else {
- if (tree.all) {
- ua->info_msg(_("\n%d Jobs, %s files inserted into the tree and marked for extraction.\n"),
- items, edit_uint64_with_commas(tree.FileCount, ec1));
- }
- else {
- ua->info_msg(_("\n%d Jobs, %s files inserted into the tree.\n"),
- items, edit_uint64_with_commas(tree.FileCount, ec1));
- }
+ if (tree.all) {
+ ua->info_msg(_("\n%s files inserted into the tree and marked for extraction.\n"),
+ edit_uint64_with_commas(tree.FileCount, ec1));
+ } else {
+ ua->info_msg(_("\n%s files inserted into the tree.\n"),
+ edit_uint64_with_commas(tree.FileCount, ec1));
}
if (find_arg(ua, NT_("done")) < 0) {
}
if (rx->JobIds[0] != 0) {
+ if (find_arg(ua, NT_("copies")) > 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());
+ }
}