From cad047bfd4b1f3cbd28feebfc7529e5e98773769 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Tue, 18 Oct 2005 18:32:46 +0000 Subject: [PATCH] Modify .backups command to get a fileset parameter (fix bug #444). git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2464 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/nb-1.37 | 2 ++ bacula/src/dird/sql_cmds.c | 6 ++++-- bacula/src/dird/ua_dotcmds.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bacula/nb-1.37 b/bacula/nb-1.37 index e879828837..8951596e42 100644 --- a/bacula/nb-1.37 +++ b/bacula/nb-1.37 @@ -4,6 +4,8 @@ General: Changes to 1.37.*: +18Oct05 + - Modify .backups command to get a fileset parameter (fix bug #444). 17Oct05 - Fix bug when recycling DVD devices (append flag was removed). - Add tests for dvd+rw-format in configure script. diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c index f5384140c3..db289413b9 100644 --- a/bacula/src/dird/sql_cmds.c +++ b/bacula/src/dird/sql_cmds.c @@ -30,12 +30,14 @@ const char *list_pool = "SELECT * FROM Pool WHERE PoolId=%s"; /* For ua_dotcmds.c */ const char *client_backups = "SELECT DISTINCT Job.JobId,Client.Name as Client,Level,StartTime," - "JobFiles,JobBytes,VolumeName,MediaType" - " FROM Client,Job,JobMedia,Media" + "JobFiles,JobBytes,VolumeName,MediaType,FileSet" + " FROM Client,Job,JobMedia,Media,FileSet" " WHERE Client.Name='%s'" + " AND FileSet='%s'" " AND Client.ClientId=Job.ClientId" " AND JobStatus='T'" " AND JobMedia.JobId=Job.JobId AND JobMedia.MediaId=Media.MediaId" + " AND Job.FileSetId=FileSet.FileSetId" " ORDER BY Job.StartTime"; diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c index db41f08611..16ad9210da 100644 --- a/bacula/src/dird/ua_dotcmds.c +++ b/bacula/src/dird/ua_dotcmds.c @@ -213,10 +213,10 @@ static int backupscmd(UAContext *ua, const char *cmd) if (!open_db(ua)) { return 1; } - if (ua->argc == 2 && strcmp(ua->argk[1], "client") != 0) { + if (ua->argc != 3 || strcmp(ua->argk[1], "client") != 0 || strcmp(ua->argk[2], "fileset") != 0) { return 1; } - Mmsg(ua->cmd, client_backups, ua->argv[1]); + Mmsg(ua->cmd, client_backups, ua->argv[1], ua->argv[2]); if (!db_sql_query(ua->db, ua->cmd, client_backups_handler, (void *)ua)) { bsendmsg(ua, _("Query failed: %s. ERR=%s\n"), ua->cmd, db_strerror(ua->db)); return 1; -- 2.39.5