From 46519ad96989fb1ebbd2da4297bab59fcc86adf7 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 21 Dec 2008 11:44:41 +0000 Subject: [PATCH] ebl revert "copies" changes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8215 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/sql_cmds.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c index 26b9744051..87c16b5044 100644 --- a/bacula/src/cats/sql_cmds.c +++ b/bacula/src/cats/sql_cmds.c @@ -286,7 +286,7 @@ const char *uar_last_full = "FROM Client,Job,JobMedia,Media,FileSet WHERE Client.ClientId=%s " "AND Job.ClientId=%s " "AND Job.StartTime<'%s' " - "AND Level='F' AND JobStatus='T' " + "AND Level='F' AND JobStatus='T' AND Type='B' " "AND JobMedia.JobId=Job.JobId " "AND Media.Enabled=1 " "AND JobMedia.MediaId=Media.MediaId " @@ -297,14 +297,13 @@ const char *uar_last_full = const char *uar_full = "INSERT INTO temp SELECT Job.JobId,Job.JobTDate," - "Job.ClientId,Job.Level,Job.JobFiles,Job.JobBytes," - "StartTime,VolumeName,JobMedia.StartFile,VolSessionId,VolSessionTime " - "FROM temp1,Job,JobMedia,Media " - "WHERE temp1.JobId=Job.JobId " - "AND Level='F' AND JobStatus='T' " - "AND Media.Enabled=1 " - "AND JobMedia.JobId=Job.JobId " - "AND JobMedia.MediaId=Media.MediaId"; + "Job.ClientId,Job.Level,Job.JobFiles,Job.JobBytes," + "StartTime,VolumeName,JobMedia.StartFile,VolSessionId,VolSessionTime " + "FROM temp1,Job,JobMedia,Media WHERE temp1.JobId=Job.JobId " + "AND Level='F' AND JobStatus='T' AND Type='B' " + "AND Media.Enabled=1 " + "AND JobMedia.JobId=Job.JobId " + "AND JobMedia.MediaId=Media.MediaId"; const char *uar_dif = "INSERT INTO temp SELECT Job.JobId,Job.JobTDate,Job.ClientId," @@ -317,7 +316,7 @@ const char *uar_dif = "AND JobMedia.JobId=Job.JobId " "AND Media.Enabled=1 " "AND JobMedia.MediaId=Media.MediaId " - "AND Job.Level='D' AND JobStatus='T' " + "AND Job.Level='D' AND JobStatus='T' AND Type='B' " "AND Job.FileSetId=FileSet.FileSetId " "AND FileSet.FileSet='%s' " "%s" @@ -334,7 +333,7 @@ const char *uar_inc = "AND Media.Enabled=1 " "AND JobMedia.JobId=Job.JobId " "AND JobMedia.MediaId=Media.MediaId " - "AND Job.Level='I' AND JobStatus='T' " + "AND Job.Level='I' AND JobStatus='T' AND Type='B' " "AND Job.FileSetId=FileSet.FileSetId " "AND FileSet.FileSet='%s' " "%s"; -- 2.39.5