From d5ad0de2fb140bc868a6f9bceb36d46c63986917 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 3 Jul 2009 09:29:57 +0000 Subject: [PATCH] ebl Should fix the first part #1323 about the restore option "List Jobs where a given File is saved" wich display deleted files git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8954 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/sql_cmds.c | 8 ++++---- bacula/technotes | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c index 83fd16e5b9..171162c436 100644 --- a/bacula/src/cats/sql_cmds.c +++ b/bacula/src/cats/sql_cmds.c @@ -482,7 +482,7 @@ const char *uar_file[4] = { "StartTime,Type as JobType,JobStatus,JobFiles,JobBytes " "FROM Client,Job,File,Filename,Path WHERE Client.Name='%s' " "AND Client.ClientId=Job.ClientId " - "AND Job.JobId=File.JobId " + "AND Job.JobId=File.JobId AND File.FileIndex > 0 " "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId " "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20", /* Postgresql */ @@ -491,7 +491,7 @@ const char *uar_file[4] = { "StartTime,Type as JobType,JobStatus,JobFiles,JobBytes " "FROM Client,Job,File,Filename,Path WHERE Client.Name='%s' " "AND Client.ClientId=Job.ClientId " - "AND Job.JobId=File.JobId " + "AND Job.JobId=File.JobId AND File.FileIndex > 0 " "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId " "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20", /* SQLite */ @@ -500,7 +500,7 @@ const char *uar_file[4] = { "StartTime,Type as JobType,JobStatus,JobFiles,JobBytes " "FROM Client,Job,File,Filename,Path WHERE Client.Name='%s' " "AND Client.ClientId=Job.ClientId " - "AND Job.JobId=File.JobId " + "AND Job.JobId=File.JobId AND File.FileIndex > 0 " "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId " "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20", /* SQLite3 */ @@ -509,7 +509,7 @@ const char *uar_file[4] = { "StartTime,Type as JobType,JobStatus,JobFiles,JobBytes " "FROM Client,Job,File,Filename,Path WHERE Client.Name='%s' " "AND Client.ClientId=Job.ClientId " - "AND Job.JobId=File.JobId " + "AND Job.JobId=File.JobId AND File.FileIndex > 0 " "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId " "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20"}; diff --git a/bacula/technotes b/bacula/technotes index 7588eff492..08670e550e 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -2,6 +2,9 @@ General: +03Jul09 +ebl Should fix the first part #1323 about the restore option + "List Jobs where a given File is saved" wich display deleted files 02Jul09 kes Another fix for bug #1311 to get the correct last_full_time ebl Make estimate command accurate compatible. Should fix #1318 -- 2.39.5