Order Pool by poolid and Jobs by JobId in list

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@198 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 560c181abd225e3bef72ec5f189d8671d4a5cfda..48fa727697739244f1189328d71723bfd3fb056c 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -77,8 +77,8 @@ int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx
 void
 db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx) 
 {
-   Mmsg(&mdb->cmd, "SELECT PoolId,Name,NumVols,MaxVols,PoolType,LabelFormat \
-FROM Pool");
+   Mmsg(&mdb->cmd, "SELECT PoolId,Name,NumVols,MaxVols,PoolType,LabelFormat "
+"FROM Pool ORDER BY PoolId");
 
    db_lock(mdb);
    if (!QUERY_DB(mdb, mdb->cmd)) {
@@ -95,7 +95,6 @@ FROM Pool");
 void
 db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit, void *ctx)
 {
-
    Mmsg(&mdb->cmd, "SELECT MediaId,VolumeName,MediaType,VolStatus,\
 VolBytes,LastWritten,VolRetention,Recycle,Slot \
 FROM Media WHERE Media.PoolId=%u ORDER BY MediaId", mdbr->PoolId);
@@ -146,10 +145,10 @@ FROM JobMedia, Media WHERE Media.MediaId=JobMedia.MediaId");
 void
 db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
 {
-
    if (jr->JobId == 0 && jr->Job[0] == 0) {
-      Mmsg(&mdb->cmd, "SELECT JobId,Name,StartTime,Type,Level,\
-JobFiles,JobBytes,JobStatus FROM Job");
+      Mmsg(&mdb->cmd, 
+"SELECT JobId,Name,StartTime,Type,Level,JobFiles,JobBytes,JobStatus "
+"FROM Job ORDER BY JobId");
    } else {                          /* single record */
       Mmsg(&mdb->cmd, "SELECT JobId,Name,StartTime,Type,Level,\
 JobFiles,JobBytes,JobStatus FROM Job WHERE Job.JobId=%u", jr->JobId);
@@ -174,8 +173,6 @@ JobFiles,JobBytes,JobStatus FROM Job WHERE Job.JobId=%u", jr->JobId);
 void
 db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
 {
-
-
    db_lock(mdb);
 
    /* List by Job */
@@ -212,8 +209,8 @@ db_list_files_for_job(B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *
 {
 
    Mmsg(&mdb->cmd, "SELECT Path.Path,Filename.Name FROM File,\
-Filename,Path WHERE File.JobId=%u and Filename.FilenameId=File.FilenameId \
-and Path.PathId=File.PathId",
+Filename,Path WHERE File.JobId=%u AND Filename.FilenameId=File.FilenameId \
+AND Path.PathId=File.PathId",
       jobid);
 
    db_lock(mdb);

diff --git a/bacula/src/dird/query.sql b/bacula/src/dird/query.sql
index 1bb698c00d02a4e5385605b1a7c92183eed8b265..59c5b822d5fd3a6f7c6b360804d646d544e52a4a 100644 (file)
--- a/bacula/src/dird/query.sql
+++ b/bacula/src/dird/query.sql
@@ -126,4 +126,4 @@ SELECT Job.JobId as JobId, Client.Name as Client,
  FROM Client,Job,File,Filename,Path WHERE Client.ClientId=Job.ClientId
  AND JobStatus='T' AND Job.JobId=File.JobId
  AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId
- AND Filename.Name='%1' LIMIT 20;
+ AND Filename.Name='%1' ORDER BY Job.JobId LIMIT 20;