/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2003-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.
- This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation and included
- in the file LICENSE.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- 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.
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
*
*
* Kern Sibbald, April MMIII
*
- * Version $Id$
*/
#include "bacula.h"
static vol_list_t *get_vol_list_from_SD(UAContext *ua, bool scan);
static void free_vol_list(vol_list_t *vol_list);
static bool is_cleaning_tape(UAContext *ua, MEDIA_DBR *mr, POOL_DBR *pr);
-static BSOCK *open_sd_bsock(UAContext *ua);
-static void close_sd_bsock(UAContext *ua);
+BSOCK *open_sd_bsock(UAContext *ua);
+void close_sd_bsock(UAContext *ua);
static char *get_volume_name_from_SD(UAContext *ua, int Slot, int drive);
static int get_num_slots_from_SD(UAContext *ua);
slot_list[i] = 0;
}
i = find_arg_with_value(ua, "slots");
+ if (i == -1) { /* not found */
+ i = find_arg_with_value(ua, "slot");
+ }
if (i > 0) {
/* scan slot list in ua->argv[i] */
char *p, *e, *h;
slot_list[i] = 1;
}
}
- Dmsg0(100, "Slots turned on:\n");
- for (i=1; i <= num_slots; i++) {
- if (slot_list[i]) {
- Dmsg1(100, "%d\n", i);
+ if (debug_level >= 100) {
+ Dmsg0(100, "Slots turned on:\n");
+ for (i=1; i <= num_slots; i++) {
+ if (slot_list[i]) {
+ Dmsg1(100, "%d\n", i);
+ }
}
}
return true;
bail_out:
+ Dmsg1(100, "Problem with user selection ERR=%s\n", msg);
return false;
}
Dmsg2(100, "Got Vol=%s from SD for Slot=%d\n", vl->VolName, vl->Slot);
}
slot_list[vl->Slot] = 0; /* clear Slot */
- memset(&mr, 0, sizeof(mr));
mr.Slot = vl->Slot;
mr.InChanger = 1;
- mr.StorageId = store.store->StorageId;
- /* Set InChanger to zero for this Slot */
+ mr.MediaId = 0; /* Force using VolumeName */
+ if (vl->VolName) {
+ bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
+ } else {
+ mr.VolumeName[0] = 0;
+ }
+ set_storageid_in_mr(store.store, &mr);
+ Dmsg4(100, "Before make unique: Vol=%s slot=%d inchanger=%d sid=%d\n",
+ mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
db_lock(ua->db);
+ /* Set InChanger to zero for this Slot */
db_make_inchanger_unique(ua->jcr, ua->db, &mr);
db_unlock(ua->db);
+ Dmsg4(100, "After make unique: Vol=%s slot=%d inchanger=%d sid=%d\n",
+ mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
if (!vl->VolName) {
Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
ua->info_msg(_("No VolName for Slot=%d InChanger set to zero.\n"), vl->Slot);
continue;
}
- memset(&mr, 0, sizeof(mr));
- bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
db_lock(ua->db);
+ Dmsg4(100, "Before get MR: Vol=%s slot=%d inchanger=%d sid=%d\n",
+ mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
+ Dmsg4(100, "After get MR: Vol=%s slot=%d inchanger=%d sid=%d\n",
+ mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId);
+ /* If Slot, Inchanger, and StorageId have changed, update the Media record */
if (mr.Slot != vl->Slot || !mr.InChanger || mr.StorageId != store.store->StorageId) {
mr.Slot = vl->Slot;
mr.InChanger = 1;
- mr.StorageId = store.store->StorageId;
if (have_enabled) {
mr.Enabled = Enabled;
}
+ set_storageid_in_mr(store.store, &mr);
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
ua->error_msg("%s", db_strerror(ua->db));
} else {
}
db_unlock(ua->db);
}
- memset(&mr, 0, sizeof(mr));
+ mr.clear();
mr.InChanger = 1;
- mr.StorageId = store.store->StorageId;
+ set_storageid_in_mr(store.store, &mr);
db_lock(ua->db);
for (int i=1; i <= max_slots; i++) {
if (slot_list[i]) {
db_unlock(ua->db);
bail_out:
-
- free_vol_list(vol_list);
+ if (vol_list) {
+ free_vol_list(vol_list);
+ }
free(slot_list);
close_sd_bsock(ua);
/* Check for oldvolume=name */
i = find_arg_with_value(ua, "oldvolume");
if (i >= 0) {
- memset(&omr, 0, sizeof(omr));
bstrncpy(omr.VolumeName, ua->argv[i], sizeof(omr.VolumeName));
+ omr.MediaId = 0;
if (db_get_media_record(ua->jcr, ua->db, &omr)) {
goto checkVol;
}
continue;
}
- memset(&mr, 0, sizeof(mr));
bstrncpy(mr.VolumeName, ua->cmd, sizeof(mr.VolumeName));
+ mr.MediaId = 0;
/* If VolBytes are zero the Volume is not labeled */
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
if (mr.VolBytes != 0) {
}
mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
}
- mr.StorageId = store.store->StorageId;
+ set_storageid_in_mr(store.store, &mr);
bstrncpy(mr.MediaType, store.store->media_type, sizeof(mr.MediaType));
bstrncpy(dev_name, store.store->dev_name(), sizeof(dev_name));
ua->info_msg(_("Requesting to mount %s ...\n"), dev_name);
bash_spaces(dev_name);
- bnet_fsend(sd, "mount %s drive=%d", dev_name, drive);
+ sd->fsend("mount %s drive=%d slot=%d", dev_name, drive, mr.Slot);
unbash_spaces(dev_name);
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
/* Here we can get
* 3001 OK mount. Device=xxx or
char *slot_list;
int max_slots;
-
+
max_slots = get_num_slots_from_SD(ua);
if (max_slots <= 0) {
ua->warning_msg(_("No slots in changer to scan.\n"));
if (!select_pool_dbr(ua, &pr)) {
goto bail_out;
}
- memset(&omr, 0, sizeof(omr));
/* Fire off the label requests */
for (vl=vol_list; vl; vl=vl->next) {
if (!vl->VolName || !slot_list[vl->Slot]) {
continue;
}
- memset(&mr, 0, sizeof(mr));
+ mr.clear();
bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
media_record_exists = false;
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
vl->Slot, mr.VolumeName);
mr.Slot = vl->Slot;
mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
- mr.StorageId = store->StorageId;
+ set_storageid_in_mr(store, &mr);
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
ua->error_msg(_("Error setting InChanger: ERR=%s"), db_strerror(ua->db));
}
media_record_exists = true;
}
mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
- mr.StorageId = store->StorageId;
+ set_storageid_in_mr(store, &mr);
/*
* Deal with creating cleaning tape here. Normal tapes created in
* send_label_request() below
mr.VolBytes = 1; /* any bytes to indicate it exists */
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
- mr.StorageId = store->StorageId;
+ set_storageid_in_mr(store, &mr);
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
ua->error_msg("%s", db_strerror(ua->db));
}
set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
+ set_storageid_in_mr(store, &mr);
if (db_create_media_record(ua->jcr, ua->db, &mr)) {
ua->send_msg(_("Catalog record for cleaning tape \"%s\" successfully created.\n"),
mr.VolumeName);
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
bool ok = false;
- bool is_dvd = false;
uint64_t VolBytes = 0;
+ uint64_t VolABytes = 0;
+ uint32_t VolType = 0;
if (!(sd=open_sd_bsock(ua))) {
return false;
bash_spaces(omr->VolumeName);
sd->fsend("relabel %s OldName=%s NewName=%s PoolName=%s "
"MediaType=%s Slot=%d drive=%d",
- dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
+ dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
mr->MediaType, mr->Slot, drive);
ua->send_msg(_("Sending relabel command from \"%s\" to \"%s\" ...\n"),
omr->VolumeName, mr->VolumeName);
} else {
sd->fsend("label %s VolumeName=%s PoolName=%s MediaType=%s "
"Slot=%d drive=%d",
- dev_name, mr->VolumeName, pr->Name, mr->MediaType,
+ dev_name, mr->VolumeName, pr->Name, mr->MediaType,
mr->Slot, drive);
ua->send_msg(_("Sending label command for Volume \"%s\" Slot %d ...\n"),
mr->VolumeName, mr->Slot);
}
while (sd->recv() >= 0) {
- int dvd;
ua->send_msg("%s", sd->msg);
- if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu DVD=%d ", &VolBytes,
- &dvd) == 2) {
- is_dvd = dvd;
- ok = true;
+ if (strstr((const POOLMEM *) sd->msg, "3000 OK label")) {
+ ok = false;
+ if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu VolABytes=%lld VolType=%d ",
+ &VolBytes, &VolABytes, &VolType) == 3) {
+ ok = true;
+ }
+ }
+ if (!ok) {
+ ua->error_msg("Volume label failed: Storage Daemon and Director are incompatible versions.");
}
}
unbash_spaces(mr->VolumeName);
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 = VolBytes;
+ mr->VolABytes = VolABytes;
+ mr->VolType = VolType;
mr->InChanger = mr->Slot > 0; /* if slot give assume in changer */
- mr->StorageId = ua->jcr->wstore->StorageId;
+ set_storageid_in_mr(ua->jcr->wstore, mr);
if (!db_update_media_record(ua->jcr, ua->db, mr)) {
ua->error_msg("%s", db_strerror(ua->db));
ok = false;
} else { /* create the media record */
set_pool_dbr_defaults_in_media_dbr(mr, pr);
mr->VolBytes = VolBytes;
+ mr->VolABytes = VolABytes;
+ mr->VolType = VolType;
mr->InChanger = mr->Slot > 0; /* if slot give assume in changer */
- mr->StorageId = ua->jcr->wstore->StorageId;
mr->Enabled = 1;
+ set_storageid_in_mr(ua->jcr->wstore, mr);
if (db_create_media_record(ua->jcr, ua->db, mr)) {
ua->info_msg(_("Catalog record for Volume \"%s\", Slot %d successfully created.\n"),
mr->VolumeName, mr->Slot);
return ok;
}
-static BSOCK *open_sd_bsock(UAContext *ua)
-{
- STORE *store = ua->jcr->wstore;
-
- if (!ua->jcr->store_bsock) {
- ua->send_msg(_("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->name(), store->address, store->SDport);
- if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- ua->error_msg(_("Failed to connect to Storage daemon.\n"));
- return NULL;
- }
- }
- return ua->jcr->store_bsock;
-}
-
-static void close_sd_bsock(UAContext *ua)
-{
- if (ua->jcr->store_bsock) {
- bnet_sig(ua->jcr->store_bsock, BNET_TERMINATE);
- bnet_close(ua->jcr->store_bsock);
- ua->jcr->store_bsock = NULL;
- }
-}
-
static char *get_volume_name_from_SD(UAContext *ua, int Slot, int drive)
{
STORE *store = ua->jcr->wstore;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, NT_("autochanger list %s \n"), dev_name);
+ sd->fsend(NT_("autochanger list %s \n"), dev_name);
/* Read and organize list of Volumes */
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
char *p;
int Slot;
strip_trailing_junk(sd->msg);
if (!is_volume_name_legal(ua, p)) {
p--;
*p = ':';
- ua->error_msg(_("Invalid Volume name: %s\n"), sd->msg);
+ ua->error_msg(_("Invalid Volume name: %s. Volume skipped.\n"), sd->msg);
continue;
}
}
vl->next = vol_list;
vol_list = vl;
} else {
- /* Add new entry to end of list */
+ vol_list_t *prev=vol_list;
+ /* Add new entry to the right place in the list */
for (vol_list_t *tvl=vol_list; tvl; tvl=tvl->next) {
+ if (tvl->Slot > vl->Slot) {
+ /* no previous item, update vol_list directly */
+ if (prev == vol_list) {
+ vl->next = vol_list;
+ vol_list = vl;
+
+ } else { /* replace the previous pointer */
+ prev->next = vl;
+ vl->next = tvl;
+ }
+ break;
+ }
+ /* we are at the end */
if (!tvl->next) {
tvl->next = vl;
vl->next = NULL;
break;
}
+ prev = tvl;
}
}
}
return drives;
}
-
-
-
/*
* Check if this is a cleaning tape by comparing the Volume name
* with the Cleaning Prefix. If they match, this is a cleaning
strlen(ua->jcr->pool->cleaning_prefix)) == 0;
}
+static void content_send_info(UAContext *ua, char type, int Slot, char *vol_name)
+{
+ char ed1[50], ed2[50], ed3[50];
+ POOL_DBR pr;
+ MEDIA_DBR mr;
+ /* Type|Slot|RealSlot|Volume|Bytes|Status|MediaType|Pool|LastW|Expire */
+ const char *slot_api_full_format="%c|%i|%i|%s|%s|%s|%s|%s|%s|%s\n";
+ const char *slot_api_empty_format="%c|%i||||||||\n";
+
+ if (is_volume_name_legal(NULL, vol_name)) {
+ bstrncpy(mr.VolumeName, vol_name, sizeof(mr.VolumeName));
+ if (db_get_media_record(ua->jcr, ua->db, &mr)) {
+ memset(&pr, 0, sizeof(POOL_DBR));
+ pr.PoolId = mr.PoolId;
+ if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+ strcpy(pr.Name, "?");
+ }
+ ua->send_msg(slot_api_full_format, type,
+ Slot, mr.Slot, mr.VolumeName,
+ edit_uint64(mr.VolBytes, ed1),
+ mr.VolStatus, mr.MediaType, pr.Name,
+ edit_uint64(mr.LastWritten, ed2),
+ edit_uint64(mr.LastWritten+mr.VolRetention, ed3));
+
+ } else { /* Media unknown */
+ ua->send_msg(slot_api_full_format,
+ type, Slot, 0, mr.VolumeName, "?", "?", "?", "?",
+ "0", "0");
+
+ }
+ } else {
+ ua->send_msg(slot_api_empty_format, type, Slot);
+ }
+}
+
+/*
+ * Input (output of mxt-changer listall):
+ *
+ * Drive content: D:Drive num:F:Slot loaded:Volume Name
+ * D:0:F:2:vol2 or D:Drive num:E
+ * D:1:F:42:vol42
+ * D:3:E
+ *
+ * Slot content:
+ * S:1:F:vol1 S:Slot num:F:Volume Name
+ * S:2:E or S:Slot num:E
+ * S:3:F:vol4
+ *
+ * Import/Export tray slots:
+ * I:10:F:vol10 I:Slot num:F:Volume Name
+ * I:11:E or I:Slot num:E
+ * I:12:F:vol40
+ *
+ * If a drive is loaded, the slot *should* be empty
+ *
+ * Output:
+ *
+ * Drive list: D|Drive num|Slot loaded|Volume Name
+ * D|0|45|vol45
+ * D|1|42|vol42
+ * D|3||
+ *
+ * Slot list: Type|Slot|RealSlot|Volume|Bytes|Status|MediaType|Pool|LastW|Expire
+ *
+ * S|1|1|vol1|31417344|Full|LTO1-ANSI|Inc|1250858902|1282394902
+ * S|2||||||||
+ * S|3|3|vol4|15869952|Append|LTO1-ANSI|Inc|1250858907|1282394907
+ *
+ * TODO: need to merge with status_slots()
+ */
+void status_content(UAContext *ua, STORE *store)
+{
+ int Slot, Drive;
+ char type;
+ char dev_name[MAX_NAME_LENGTH];
+ char vol_name[MAX_NAME_LENGTH];
+ BSOCK *sd;
+ vol_list_t *vl=NULL, *vol_list = NULL;
+
+ if (!(sd=open_sd_bsock(ua))) {
+ return;
+ }
+
+ if (!open_client_db(ua)) {
+ return;
+ }
+
+ bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
+ bash_spaces(dev_name);
+ /* Ask for autochanger list of volumes */
+ sd->fsend(NT_("autochanger listall %s \n"), dev_name);
+
+ /* Read and organize list of Drive, Slots and I/O Slots */
+ while (sd->recv() >= 0) {
+ strip_trailing_junk(sd->msg);
+
+ /* Check for returned SD messages */
+ if (sd->msg[0] == '3' && B_ISDIGIT(sd->msg[1]) &&
+ B_ISDIGIT(sd->msg[2]) && B_ISDIGIT(sd->msg[3]) &&
+ sd->msg[4] == ' ') {
+ ua->send_msg("%s\n", sd->msg); /* pass them on to user */
+ continue;
+ }
+
+ Drive = Slot = -1;
+ *vol_name = 0;
+
+ if (sscanf(sd->msg, "D:%d:F:%d:%127s", &Drive, &Slot, vol_name) == 3) {
+ ua->send_msg("D|%d|%d|%s\n", Drive, Slot, vol_name);
+
+ /* we print information on the slot if we have a volume name */
+ if (*vol_name) {
+ /* Add Slot and VolumeName to list */
+ vl = (vol_list_t *)malloc(sizeof(vol_list_t));
+ vl->Slot = Slot;
+ vl->VolName = bstrdup(vol_name);
+ vl->next = vol_list;
+ vol_list = vl;
+ }
+
+ } else if (sscanf(sd->msg, "D:%d:E", &Drive) == 1) {
+ ua->send_msg("D|%d||\n", Drive);
+
+ } else if (sscanf(sd->msg, "%c:%d:F:%127s", &type, &Slot, vol_name)== 3) {
+ content_send_info(ua, type, Slot, vol_name);
+
+ } else if (sscanf(sd->msg, "%c:%d:E", &type, &Slot) == 2) {
+ /* type can be S (slot) or I (Import/Export slot) */
+ vol_list_t *prev=NULL;
+ for (vl = vol_list; vl; vl = vl->next) {
+ if (vl->Slot == Slot) {
+ bstrncpy(vol_name, vl->VolName, MAX_NAME_LENGTH);
+
+ /* remove the node */
+ if (prev) {
+ prev->next = vl->next;
+ } else {
+ vol_list = vl->next;
+ }
+ free(vl->VolName);
+ free(vl);
+ break;
+ }
+ prev = vl;
+ }
+ content_send_info(ua, type, Slot, vol_name);
+
+ } else {
+ Dmsg1(10, "Discarding msg=%s\n", sd->msg);
+ }
+ }
+ close_sd_bsock(ua);
+}
/*
* Print slots from AutoChanger
POOL_DBR pr;
vol_list_t *vl, *vol_list = NULL;
MEDIA_DBR mr;
- char ed1[50], ed2[50], ed3[50];
char *slot_list;
int max_slots;
- int drive;
int i=1;
- /* output format */
- const char *slot_api_empty_format="%i||||||||\n";
-
- /* Slot|RealSlot|Volume|Bytes|Status|MediaType|Pool|LastW|Expire */
- const char *slot_api_full_format="%i|%i|%s|%s|%s|%s|%s|%s|%s\n";
-
/* Slot | Volume | Status | MediaType | Pool */
const char *slot_hformat=" %4i%c| %16s | %9s | %20s | %18s |\n";
+ if (ua->api) {
+ status_content(ua, store_r);
+ return;
+ }
+
if (!open_client_db(ua)) {
return;
}
pm_strcpy(store.store_source, _("command line"));
set_wstorage(ua->jcr, &store);
- drive = get_storage_drive(ua, store.store);
+ get_storage_drive(ua, store.store);
max_slots = get_num_slots_from_SD(ua);
ua->warning_msg(_("No Volumes found, or no barcodes.\n"));
goto bail_out;
}
- if (!ua->api) {
- ua->send_msg(_(" Slot | Volume Name | Status | Media Type | Pool |\n"));
- ua->send_msg(_("------+------------------+-----------+----------------------+--------------------|\n"));
- }
+ ua->send_msg(_(" Slot | Volume Name | Status | Media Type | Pool |\n"));
+ ua->send_msg(_("------+------------------+-----------+----------------------+--------------------|\n"));
/* Walk through the list getting the media records */
for (vl=vol_list; vl; vl=vl->next) {
if (!vl->VolName) {
Dmsg1(100, "No VolName for Slot=%d.\n", vl->Slot);
- if (ua->api) {
- ua->send_msg(slot_api_empty_format, vl->Slot);
-
- } else {
- ua->send_msg(slot_hformat,
- vl->Slot, '*',
- "?", "?", "?", "?");
- }
+ ua->send_msg(slot_hformat,
+ vl->Slot, '*',
+ "?", "?", "?", "?");
continue;
}
/* Hope that slots are ordered */
for (; i < vl->Slot; i++) {
if (slot_list[i]) {
- if (ua->api) {
- ua->send_msg(slot_api_empty_format, i);
-
- } else {
- ua->send_msg(slot_hformat,
- i, ' ', "", "", "", "");
- }
+ ua->send_msg(slot_hformat,
+ i, ' ', "", "", "", "");
slot_list[i]=0;
}
}
- memset(&mr, 0, sizeof(mr));
+ memset(&mr, 0, sizeof(MEDIA_DBR));
bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
- db_lock(ua->db);
+
if (mr.VolumeName[0] && db_get_media_record(ua->jcr, ua->db, &mr)) {
memset(&pr, 0, sizeof(POOL_DBR));
pr.PoolId = mr.PoolId;
if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
strcpy(pr.Name, "?");
}
- db_unlock(ua->db);
- if (ua->api) {
- ua->send_msg(slot_api_full_format,
- vl->Slot, mr.Slot, mr.VolumeName,
- edit_uint64(mr.VolBytes, ed1),
- mr.VolStatus, mr.MediaType, pr.Name,
- edit_uint64(mr.LastWritten, ed2),
- edit_uint64(mr.LastWritten+mr.VolRetention, ed3));
- } else {
- /* Print information */
- ua->send_msg(slot_hformat,
- vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
- mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name);
- }
+ /* Print information */
+ ua->send_msg(slot_hformat,
+ vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
+ mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name);
- continue;
} else { /* TODO: get information from catalog */
- if (ua->api) {
- ua->send_msg(slot_api_empty_format, vl->Slot);
-
- } else {
- ua->send_msg(slot_hformat,
- vl->Slot, '*',
- mr.VolumeName, "?", "?", "?");
- }
+ ua->send_msg(slot_hformat,
+ vl->Slot, '*',
+ mr.VolumeName, "?", "?", "?");
}
- db_unlock(ua->db);
}
/* Display the rest of the autochanger
*/
for (; i <= max_slots; i++) {
if (slot_list[i]) {
- if (!ua->api) {
- ua->send_msg(slot_api_empty_format, i);
-
- } else {
- ua->send_msg(slot_hformat,
- i, ' ', "", "", "", "");
- }
+ ua->send_msg(slot_hformat,
+ i, ' ', "", "", "", "");
slot_list[i]=0;
}
}