/*
Bacula® - The Network Backup Solution
- Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
+ 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.
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.
bash_spaces(pr->Name);
if (relabel) {
bash_spaces(omr->VolumeName);
- bnet_fsend(sd, "relabel %s OldName=%s NewName=%s PoolName=%s "
+ sd->fsend("relabel %s OldName=%s NewName=%s PoolName=%s "
"MediaType=%s Slot=%d drive=%d",
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 {
- bnet_fsend(sd, "label %s VolumeName=%s PoolName=%s MediaType=%s "
+ sd->fsend("label %s VolumeName=%s PoolName=%s MediaType=%s "
"Slot=%d drive=%d",
dev_name, mr->VolumeName, pr->Name, mr->MediaType,
mr->Slot, drive);
dev_name, mr->VolumeName, pr->Name, mr->MediaType, mr->Slot, drive);
}
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
int dvd;
ua->send_msg("%s", sd->msg);
if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu DVD=%d ", &VolBytes,
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, NT_("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
+ sd->fsend(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) {
+ while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
if (strncmp(sd->msg, NT_("3001 Volume="), 12) == 0) {
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, NT_("autochanger slots %s\n"), dev_name);
+ sd->fsend(NT_("autochanger slots %s\n"), dev_name);
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
break;
} else {
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, NT_("autochanger drives %s\n"), dev_name);
+ sd->fsend(NT_("autochanger drives %s\n"), dev_name);
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
if (sscanf(sd->msg, NT_("drives=%d\n"), &drives) == 1) {
break;
} else {
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 (!open_client_db(ua)) {
return;
goto bail_out;
}
if (!ua->api) {
- ua->info_msg(_(" Slot | Volume Name | Status | Type | Pool | Loaded |\n"));
- ua->info_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->Slot > max_slots) {
if (!vl->VolName) {
Dmsg1(100, "No VolName for Slot=%d.\n", vl->Slot);
- if (!ua->api) {
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, '*',
- "?", "?", "?", "?", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), vl->Slot);
- }
+ if (ua->api) {
+ ua->send_msg(slot_api_empty_format, vl->Slot);
+
+ } else {
+ 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->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
- i, "", "", "", "", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), i);
- }
- slot_list[i]=0;
- }
+ if (slot_list[i]) {
+ if (ua->api) {
+ ua->send_msg(slot_api_empty_format, i);
+
+ } else {
+ ua->send_msg(slot_hformat,
+ i, ' ', "", "", "", "");
+ }
+ slot_list[i]=0;
+ }
}
memset(&mr, 0, sizeof(mr));
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, "?");
- }
-
- if (!ua->api) {
- /* Print information */
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
- mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
- } else {
- ua->info_msg(_("%i|%i|%s|%s|%s|%s|%i|\n"),
- vl->Slot, mr.Slot, mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
- }
-
+ 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);
+ }
+
continue;
- } else { /* TODO: get information from catalog */
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, '*',
- mr.VolumeName, "?", "?", "?", 0);
+ } 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, "?", "?", "?");
+ }
}
db_unlock(ua->db);
}
*/
for (; i <= max_slots; i++) {
if (slot_list[i]) {
- if (!ua->api) {
- ua->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
- i, "", "", "", "", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), i);
- }
- slot_list[i]=0;
+ if (!ua->api) {
+ ua->send_msg(slot_api_empty_format, i);
+
+ } else {
+ ua->send_msg(slot_hformat,
+ i, ' ', "", "", "", "");
+ }
+ slot_list[i]=0;
}
}
projects / bacula / bacula / blobdiff