*/
/*
- Copyright (C) 2002-2005 Kern Sibbald
+ Copyright (C) 2002-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
- version 2 as ammended with additional clauses defined in the
+ version 2 as amended with additional clauses defined in the
file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
static BSR *store_vol(LEX *lc, BSR *bsr);
static BSR *store_mediatype(LEX *lc, BSR *bsr);
+static BSR *store_device(LEX *lc, BSR *bsr);
static BSR *store_client(LEX *lc, BSR *bsr);
static BSR *store_job(LEX *lc, BSR *bsr);
static BSR *store_jobid(LEX *lc, BSR *bsr);
{"exclude", store_exclude},
{"volfile", store_volfile},
{"volblock", store_volblock},
- {"stream", store_stream},
- {"slot", store_slot},
+ {"stream", store_stream},
+ {"slot", store_slot},
+ {"device", store_device},
{NULL, NULL}
};
return bsr;
}
+/* Shove the Device name in each Volume in the current bsr */
+static BSR *store_device(LEX *lc, BSR *bsr)
+{
+ int token;
+
+ token = lex_get_token(lc, T_STRING);
+ if (token == T_ERROR) {
+ return NULL;
+ }
+ if (!bsr->volume) {
+ Emsg1(M_ERROR,0, _("Device \"%s\" in bsr at inappropriate place.\n"),
+ lc->str);
+ return bsr;
+ }
+ BSR_VOLUME *bv;
+ for (bv=bsr->volume; bv; bv=bv->next) {
+ bstrncpy(bv->device, lc->str, sizeof(bv->device));
+ }
+ return bsr;
+}
+
+
static BSR *store_client(LEX *lc, BSR *bsr)
{
static BSR *store_jobtype(LEX *lc, BSR *bsr)
{
/* *****FIXME****** */
- Pmsg0(-1, "JobType not yet implemented\n");
+ Pmsg0(-1, _("JobType not yet implemented\n"));
return bsr;
}
static BSR *store_joblevel(LEX *lc, BSR *bsr)
{
/* *****FIXME****** */
- Pmsg0(-1, "JobLevel not yet implemented\n");
+ Pmsg0(-1, _("JobLevel not yet implemented\n"));
return bsr;
}
if (token == T_ERROR) {
return NULL;
}
- bsr->Slot = lc->pint32_val;
+ if (!bsr->volume) {
+ Emsg1(M_ERROR,0, _("Slot %d in bsr at inappropriate place.\n"),
+ lc->pint32_val);
+ return bsr;
+ }
+ bsr->volume->Slot = lc->pint32_val;
scan_to_eol(lc);
return bsr;
}
void dump_volfile(BSR_VOLFILE *volfile)
{
if (volfile) {
- Pmsg2(-1, "VolFile : %u-%u\n", volfile->sfile, volfile->efile);
+ Pmsg2(-1, _("VolFile : %u-%u\n"), volfile->sfile, volfile->efile);
dump_volfile(volfile->next);
}
}
void dump_volblock(BSR_VOLBLOCK *volblock)
{
if (volblock) {
- Pmsg2(-1, "VolBlock : %u-%u\n", volblock->sblock, volblock->eblock);
+ Pmsg2(-1, _("VolBlock : %u-%u\n"), volblock->sblock, volblock->eblock);
dump_volblock(volblock->next);
}
}
{
if (FileIndex) {
if (FileIndex->findex == FileIndex->findex2) {
- Pmsg1(-1, "FileIndex : %u\n", FileIndex->findex);
+ Pmsg1(-1, _("FileIndex : %u\n"), FileIndex->findex);
} else {
- Pmsg2(-1, "FileIndex : %u-%u\n", FileIndex->findex, FileIndex->findex2);
+ Pmsg2(-1, _("FileIndex : %u-%u\n"), FileIndex->findex, FileIndex->findex2);
}
dump_findex(FileIndex->next);
}
{
if (jobid) {
if (jobid->JobId == jobid->JobId2) {
- Pmsg1(-1, "JobId : %u\n", jobid->JobId);
+ Pmsg1(-1, _("JobId : %u\n"), jobid->JobId);
} else {
- Pmsg2(-1, "JobId : %u-%u\n", jobid->JobId, jobid->JobId2);
+ Pmsg2(-1, _("JobId : %u-%u\n"), jobid->JobId, jobid->JobId2);
}
dump_jobid(jobid->next);
}
{
if (sessid) {
if (sessid->sessid == sessid->sessid2) {
- Pmsg1(-1, "SessId : %u\n", sessid->sessid);
+ Pmsg1(-1, _("SessId : %u\n"), sessid->sessid);
} else {
- Pmsg2(-1, "SessId : %u-%u\n", sessid->sessid, sessid->sessid2);
+ Pmsg2(-1, _("SessId : %u-%u\n"), sessid->sessid, sessid->sessid2);
}
dump_sessid(sessid->next);
}
void dump_volume(BSR_VOLUME *volume)
{
if (volume) {
- Pmsg1(-1, "VolumeName : %s\n", volume->VolumeName);
+ Pmsg1(-1, _("VolumeName : %s\n"), volume->VolumeName);
+ Pmsg1(-1, _(" MediaType : %s\n"), volume->MediaType);
+ Pmsg1(-1, _(" Device : %s\n"), volume->device);
+ Pmsg1(-1, _(" Slot : %d\n"), volume->Slot);
dump_volume(volume->next);
}
}
void dump_client(BSR_CLIENT *client)
{
if (client) {
- Pmsg1(-1, "Client : %s\n", client->ClientName);
+ Pmsg1(-1, _("Client : %s\n"), client->ClientName);
dump_client(client->next);
}
}
void dump_job(BSR_JOB *job)
{
if (job) {
- Pmsg1(-1, "Job : %s\n", job->Job);
+ Pmsg1(-1, _("Job : %s\n"), job->Job);
dump_job(job->next);
}
}
void dump_sesstime(BSR_SESSTIME *sesstime)
{
if (sesstime) {
- Pmsg1(-1, "SessTime : %u\n", sesstime->sesstime);
+ Pmsg1(-1, _("SessTime : %u\n"), sesstime->sesstime);
dump_sesstime(sesstime->next);
}
}
int save_debug = debug_level;
debug_level = 1;
if (!bsr) {
- Pmsg0(-1, "BSR is NULL\n");
+ Pmsg0(-1, _("BSR is NULL\n"));
debug_level = save_debug;
return;
}
- Pmsg1(-1, "Next : 0x%x\n", bsr->next);
- Pmsg1(-1, "Root bsr : 0x%x\n", bsr->root);
+ Pmsg1(-1, _("Next : 0x%x\n"), bsr->next);
+ Pmsg1(-1, _("Root bsr : 0x%x\n"), bsr->root);
dump_volume(bsr->volume);
dump_sessid(bsr->sessid);
dump_sesstime(bsr->sesstime);
dump_jobid(bsr->JobId);
dump_job(bsr->job);
dump_findex(bsr->FileIndex);
- if (bsr->Slot) {
- Pmsg1(-1, "Slot : %u\n", bsr->Slot);
- }
if (bsr->count) {
- Pmsg1(-1, "count : %u\n", bsr->count);
- Pmsg1(-1, "found : %u\n", bsr->found);
+ Pmsg1(-1, _("count : %u\n"), bsr->count);
+ Pmsg1(-1, _("found : %u\n"), bsr->found);
}
- Pmsg1(-1, "done : %s\n", bsr->done?"yes":"no");
- Pmsg1(-1, "positioning : %d\n", bsr->use_positioning);
- Pmsg1(-1, "fast_reject : %d\n", bsr->use_fast_rejection);
+ Pmsg1(-1, _("done : %s\n"), bsr->done?_("yes"):_("no"));
+ Pmsg1(-1, _("positioning : %d\n"), bsr->use_positioning);
+ Pmsg1(-1, _("fast_reject : %d\n"), bsr->use_fast_rejection);
if (recurse && bsr->next) {
Pmsg0(-1, "\n");
dump_bsr(bsr->next, true);
vol = new_restore_volume();
bstrncpy(vol->VolumeName, bsrvol->VolumeName, sizeof(vol->VolumeName));
bstrncpy(vol->MediaType, bsrvol->MediaType, sizeof(vol->MediaType));
+ bstrncpy(vol->device, bsrvol->device, sizeof(vol->device));
+ vol->Slot = bsrvol->Slot;
vol->start_file = sfile;
if (add_restore_volume(jcr, vol)) {
jcr->NumVolumes++;