* Version $Id$
*/
/*
- Copyright (C) 2003-2005 Kern Sibbald
+ Copyright (C) 2003-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
/*
* Update Slots corresponding to Volumes in autochanger
*/
-int update_slots(UAContext *ua)
+void update_slots(UAContext *ua)
{
STORE *store;
vol_list_t *vl, *vol_list = NULL;
if (!open_db(ua)) {
- return 1;
+ return;
}
store = get_storage_resource(ua, true/*arg is storage*/);
if (!store) {
- return 1;
+ return;
}
+ set_wstorage(ua->jcr, store);
drive = get_storage_drive(ua, store);
- set_storage(ua->jcr, store);
- scan = find_arg(ua, N_("scan")) >= 0;
+ scan = find_arg(ua, NT_("scan")) >= 0;
max_slots = get_num_slots_from_SD(ua);
+ Dmsg1(100, "max_slots=%d\n", max_slots);
if (max_slots <= 0) {
bsendmsg(ua, _("No slots in changer to scan.\n"));
- return 1;
+ return;
}
slot_list = (char *)malloc(max_slots+1);
if (!get_user_slot_list(ua, slot_list, max_slots)) {
free(slot_list);
- return 1;
+ return;
}
vol_list = get_vol_list_from_SD(ua, scan);
goto bail_out;
}
+ /* First zap out any InChanger with StorageId=0 */
+ db_sql_query(ua->db, "UPDATE Media SET InChanger=0 WHERE StorageId=0", NULL, NULL);
+
/* Walk through the list updating the media records */
for (vl=vol_list; vl; vl=vl->next) {
if (vl->Slot > max_slots) {
db_unlock(ua->db);
if (!vl->VolName) {
Dmsg1(000, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
- bsendmsg(ua, _("No VolName for Slot=%d set InChanger to zero.\n"), vl->Slot);
+ bsendmsg(ua, _("No VolName for Slot=%d InChanger set to zero.\n"), vl->Slot);
continue;
}
memset(&mr, 0, sizeof(mr));
db_unlock(ua->db);
continue;
} else {
- bsendmsg(ua, _("Volume \"%s\" not found in catalog. Slot=%d set InChanger to zero.\n"),
+ bsendmsg(ua, _("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"),
mr.VolumeName, vl->Slot);
}
db_unlock(ua->db);
free(slot_list);
close_sd_bsock(ua);
- return 1;
+ return;
}
bool print_reminder = true;
bool label_barcodes = false;
int ok = FALSE;
- int i;
+ int i, j;
int drive;
bool media_record_exists = false;
static const char *barcode_keyword[] = {
return 1;
}
+ /* Look for one of the barcode keywords */
if (!relabel && (i=find_arg_keyword(ua, barcode_keyword)) >= 0) {
- *ua->argk[i] = 0; /* zap barcode keyword */
+ /* Now find the keyword in the list */
+ if ((j = find_arg(ua, barcode_keyword[i])) > 0) {
+ *ua->argk[j] = 0; /* zap barcode keyword */
+ }
label_barcodes = true;
}
if (!store) {
return 1;
}
+ set_wstorage(ua->jcr, store);
drive = get_storage_drive(ua, store);
- set_storage(ua->jcr, store);
if (label_barcodes) {
label_from_barcodes(ua, drive);
*/
static void label_from_barcodes(UAContext *ua, int drive)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
POOL_DBR pr;
MEDIA_DBR mr, omr;
vol_list_t *vl, *vol_list = NULL;
}
bsendmsg(ua, "%4d %s\n", vl->Slot, vl->VolName);
}
- if (!get_cmd(ua, _("Do you want to continue? (y/n): ")) ||
- (ua->cmd[0] != 'y' && ua->cmd[0] != 'Y')) {
+ if (!get_yesno(ua, _("Do you want to continue? (yes|no): ")) ||
+ (ua->pint32_val == 0)) {
goto bail_out;
}
/* Select a pool */
mr.VolBytes = 1;
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
+ mr.StorageId = store->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
}
} else { /* create the media record */
+ if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
+ bsendmsg(ua, _("Maximum pool Volumes=%d reached.\n"), pr.MaxVols);
+ goto bail_out;
+ }
set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
bool ok = false;
+ bool is_dvd = false;
if (!(sd=open_sd_bsock(ua))) {
return false;
}
- bstrncpy(dev_name, ua->jcr->store->dev_name(), sizeof(dev_name));
+ bstrncpy(dev_name, ua->jcr->wstore->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
bash_spaces(mr->VolumeName);
bash_spaces(mr->MediaType);
if (strncmp(sd->msg, "3000 OK label.", 14) == 0) {
ok = true;
}
+ if (strncmp(sd->msg, "3000 OK label. DVD=1 ", 21) == 0) {
+ is_dvd = true;
+ }
}
unbash_spaces(mr->VolumeName);
unbash_spaces(mr->MediaType);
unbash_spaces(pr->Name);
mr->LabelDate = time(NULL);
mr->set_label_date = true;
+ if (is_dvd) {
+ /* We know that a freshly labelled DVD has 1 VolParts */
+ /* This does not apply to auto-labelled DVDs. */
+ mr->VolParts = 1;
+ }
if (ok) {
if (media_record_exists) { /* we update it */
mr->VolBytes = 1;
mr->InChanger = 1;
+ mr->StorageId = ua->jcr->wstore->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
ok = false;
set_pool_dbr_defaults_in_media_dbr(mr, pr);
mr->VolBytes = 1; /* flag indicating Volume labeled */
mr->InChanger = 1;
+ mr->StorageId = ua->jcr->wstore->StorageId;
+ mr->Enabled = 1;
if (db_create_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, _("Catalog record for Volume \"%s\", Slot %d successfully created.\n"),
mr->VolumeName, mr->Slot);
static BSOCK *open_sd_bsock(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
if (!ua->jcr->store_bsock) {
bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->hdr.name, store->address, store->SDport);
+ store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
return NULL;
static char *get_volume_name_from_SD(UAContext *ua, int Slot, int drive)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
char *VolName = NULL;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, _("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
+ bnet_fsend(sd, NT_("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
Dmsg1(100, "Sent: %s", sd->msg);
/* Get Volume name in this Slot */
while (bnet_recv(sd) >= 0) {
bsendmsg(ua, "%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
- if (strncmp(sd->msg, "3001 Volume=", 12) == 0) {
+ if (strncmp(sd->msg, NT_("3001 Volume="), 12) == 0) {
VolName = (char *)malloc(sd->msglen);
- if (sscanf(sd->msg, "3001 Volume=%s Slot=%d", VolName, &rtn_slot) == 2) {
+ if (sscanf(sd->msg, NT_("3001 Volume=%s Slot=%d"), VolName, &rtn_slot) == 2) {
break;
}
free(VolName);
*/
static vol_list_t *get_vol_list_from_SD(UAContext *ua, bool scan)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
vol_list_t *vl;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, _("autochanger list %s \n"), dev_name);
+ bnet_fsend(sd, NT_("autochanger list %s \n"), dev_name);
/* Read and organize list of Volumes */
while (bnet_recv(sd) >= 0) {
*/
static int get_num_slots_from_SD(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
int slots = 0;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, _("autochanger slots %s\n"), dev_name);
+ bnet_fsend(sd, NT_("autochanger slots %s\n"), dev_name);
while (bnet_recv(sd) >= 0) {
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
*/
int get_num_drives_from_SD(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
int drives = 0;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, _("autochanger drives %s\n"), dev_name);
+ bnet_fsend(sd, NT_("autochanger drives %s\n"), dev_name);
while (bnet_recv(sd) >= 0) {
- if (sscanf(sd->msg, "drives=%d\n", &drives) == 1) {
+ if (sscanf(sd->msg, NT_("drives=%d\n"), &drives) == 1) {
break;
} else {
bsendmsg(ua, "%s", sd->msg);
/* Find Pool resource */
ua->jcr->pool = (POOL *)GetResWithName(R_POOL, pr->Name);
if (!ua->jcr->pool) {
- bsendmsg(ua, _("Pool \"%s\" resource not found!\n"), pr->Name);
- return true;
+ bsendmsg(ua, _("Pool \"%s\" resource not found for volume \"%s\"!\n"),
+ pr->Name, mr->VolumeName);
+ return false;
}
if (ua->jcr->pool->cleaning_prefix == NULL) {
return false;
projects / bacula / bacula / blobdiff