cats: Tweak layout.

bareos · Jul 28, 2016 · 494948e · 494948e
1 parent c8f8b10
commit 494948e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 31 deletions.
diff --git a/src/cats/sql_cmds.c b/src/cats/sql_cmds.c
@@ -83,9 +83,7 @@ const char *list_pool = "SELECT * FROM Pool WHERE PoolId=%s";
  * JOIN with Media is required for filter to Media.Volumename.
  */
 const char *list_jobs =
-   "SELECT DISTINCT "
-   "Job.JobId,Job.Name, "
-   "Client.Name as Client, "
+   "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
    "Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
    "FROM Job "
    "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
@@ -97,9 +95,7 @@ const char *list_jobs =
    "ORDER BY StartTime%s";
 
 const char *list_jobs_last =
-   "SELECT DISTINCT "
-   "Job.JobId,Job.Name, "
-   "Client.Name as Client, "
+   "SELECT DISTINCT Job.JobId,Job.Name, Client.Name as Client, "
    "Job.StartTime,Job.Type,Job.Level,Job.JobFiles,Job.JobBytes,Job.JobStatus "
    "FROM Job "
    "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
@@ -122,8 +118,7 @@ const char *list_jobs_last =
    "ORDER BY StartTime%s";
 
 const char *list_jobs_count =
-   "SELECT DISTINCT "
-   "COUNT(DISTINCT Job.JobId) as count "
+   "SELECT DISTINCT COUNT(DISTINCT Job.JobId) as count "
    "FROM Job "
    "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
    "LEFT JOIN JobMedia ON JobMedia.JobId=Job.JobId "
@@ -134,17 +129,11 @@ const char *list_jobs_count =
    "%s";
 
 const char *list_jobs_long =
-   "SELECT DISTINCT "
-   "Job.JobId, Job.Job, Job.Name, "
-   "Job.PurgedFiles, Job.Type, Job.Level, "
-   "Job.ClientId, Client.Name as Client, "
-   "Job.JobStatus,"
-   "Job.SchedTime, Job.StartTime, Job.EndTime, Job.RealEndTime, Job.JobTDate, "
-   "Job.VolSessionId, Job.VolSessionTime, "
-   "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, "
-   "Job.PoolId, Pool.Name as PoolName,"
-   "Job.PriorJobId, "
-   "Job.FileSetId, FileSet.FileSet "
+   "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
+   "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
+   "Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+   "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
+   "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
    "FROM Job "
    "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
    "LEFT JOIN Pool ON Pool.PoolId=Job.PoolId "
@@ -156,17 +145,11 @@ const char *list_jobs_long =
    "ORDER BY StartTime%s";
 
 const char *list_jobs_long_last =
-   "SELECT DISTINCT "
-   "Job.JobId, Job.Job, Job.Name, "
-   "Job.PurgedFiles, Job.Type, Job.Level, "
-   "Job.ClientId, Client.Name as Client, "
-   "Job.JobStatus,"
-   "Job.SchedTime, Job.StartTime, Job.EndTime, Job.RealEndTime, Job.JobTDate, "
-   "Job.VolSessionId, Job.VolSessionTime, "
-   "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, "
-   "Job.PoolId, Pool.Name as PoolName,"
-   "Job.PriorJobId, "
-   "Job.FileSetId, FileSet.FileSet "
+   "SELECT DISTINCT Job.JobId, Job.Job, Job.Name, Job.PurgedFiles, Job.Type, Job.Level, "
+   "Job.ClientId, Client.Name as Client, Job.JobStatus, Job.SchedTime, Job.StartTime, "
+   "Job.EndTime, Job.RealEndTime, Job.JobTDate, Job.VolSessionId, Job.VolSessionTime, "
+   "Job.JobFiles, Job.JobBytes, Job.JobErrors, Job.JobMissingFiles, Job.PoolId, "
+   "Pool.Name as PoolName, Job.PriorJobId, Job.FileSetId, FileSet.FileSet "
    "FROM Job "
    "LEFT JOIN Client ON Client.ClientId=Job.ClientId "
    "LEFT JOIN Pool ON Pool.PoolId=Job.PoolId "

diff --git a/src/cats/sql_list.c b/src/cats/sql_list.c
@@ -415,7 +415,6 @@ void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, const char *range,
    POOL_MEM temp(PM_MESSAGE),
             selection(PM_MESSAGE),
             criteria(PM_MESSAGE);
-   POOL_MEM selection_last(PM_MESSAGE);
    char dt[MAX_TIME_LENGTH];
 
    if (jr->JobId > 0) {