From 2b0e08beff2e8331e748fbf8a14f861f9224ada9 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 30 Sep 2022 08:11:35 +0200 Subject: [PATCH] bvfs: Add VolType to .bvfs_versions --- bacula/src/cats/bvfs.c | 4 ++-- bacula/src/cats/bvfs.h | 1 + bacula/src/dird/ua_dotcmds.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bacula/src/cats/bvfs.c b/bacula/src/cats/bvfs.c index d451d613e..4b074059b 100644 --- a/bacula/src/cats/bvfs.c +++ b/bacula/src/cats/bvfs.c @@ -916,8 +916,8 @@ void Bvfs::get_all_file_versions(DBId_t pathid, FileId_t fnid, alist *clients) "SELECT DISTINCT 'V', File.PathId, File.FileId, File.JobId, " // 4 5 6 "File.LStat, File.FileId, File.Md5, " -// 7 8 - "Media.VolumeName, Media.InChanger " +// 7 8 9 + "Media.VolumeName, Media.InChanger, Media.VolType " "FROM File, Job, Client, JobMedia, Media " "WHERE File.Filename = %s " "AND File.PathId = %s " diff --git a/bacula/src/cats/bvfs.h b/bacula/src/cats/bvfs.h index 35454df8b..ef8855ce3 100644 --- a/bacula/src/cats/bvfs.h +++ b/bacula/src/cats/bvfs.h @@ -60,6 +60,7 @@ typedef enum { BVFS_Md5 = 6, BVFS_VolName = 7, BVFS_VolInchanger = 8, + BVFS_VolType = 9, /* Only if Delta record */ BVFS_DeltaSeq = 6, diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c index a89d0dfe8..6cb83f055 100644 --- a/bacula/src/dird/ua_dotcmds.c +++ b/bacula/src/dird/ua_dotcmds.c @@ -494,10 +494,10 @@ static int bvfs_result_handler(void *ctx, int fields, char **row) jobid, lstat, path); } else if (bvfs_is_version(row)) { - ua->send_msg("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", row[BVFS_PathId], + ua->send_msg("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", row[BVFS_PathId], row[BVFS_FilenameId], fileid, jobid, lstat, row[BVFS_Md5], row[BVFS_VolName], - row[BVFS_VolInchanger]); + row[BVFS_VolInchanger], row[BVFS_VolType]); } else if (bvfs_is_file(row)) { ua->send_msg("%s\t%s\t%s\t%s\t%s\t%s\n", row[BVFS_PathId], @@ -505,8 +505,8 @@ static int bvfs_result_handler(void *ctx, int fields, char **row) lstat, row[BVFS_Name]); } else if (bvfs_is_volume_list(row)) { - ua->send_msg("%s\t%s\n", row[BVFS_VolName], - row[BVFS_VolInchanger]); + ua->send_msg("%s\t%s\t%s\n", row[BVFS_VolName], + row[BVFS_VolInchanger], row[BVFS_VolType]); } else if (bvfs_is_delta_list(row)) { ua->send_msg("%s\t%s\t%s\t%s\t%s\t%s\t%s\n", row[BVFS_PathId], -- 2.47.3