Implement first cut DCR in SD

[bacula/bacula] / bacula / src / cats / sql_get.c

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 4c47c1ebbd9033d5d45b08331ab26055b52abd43..6d9cad59fc4daa7ce861c139b80a80f8c627c7e8 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -296,7 +296,7 @@ int db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    jr->JobStatus = (int)*row[9];
    jr->Type = (int)*row[10];
    jr->Level = (int)*row[11];
-   jr->ClientId = str_to_uint64(row[12]);
+   jr->ClientId = str_to_uint64(row[12]!=NULL?row[12]:(char *)"");
    sql_free_result(mdb);
 
    db_unlock(mdb);
@@ -304,7 +304,7 @@ int db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 }
 
 /*
- * Find VolumeNames for a give JobId
+ * Find VolumeNames for a given JobId
  *  Returns: 0 on error or no Volumes found
  *          number of volumes on success
  *             Volumes are concatenated in VolumeNames
@@ -321,9 +321,9 @@ int db_get_job_volume_names(JCR *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **Volum
 
    db_lock(mdb);
    Mmsg(&mdb->cmd, 
-        "SELECT VolumeName,JobMedia.VolIndex FROM JobMedia,Media WHERE "
-        "JobMedia.JobId=%u AND JobMedia.MediaId=Media.MediaId "
-        "GROUP BY VolumeName ORDER BY JobMedia.VolIndex",  JobId);
+        "SELECT DISTINCT VolumeName FROM JobMedia,Media WHERE "
+        "JobMedia.JobId=%u AND JobMedia.MediaId=Media.MediaId",
+       JobId);
 
    Dmsg1(130, "VolNam=%s\n", mdb->cmd);
    *VolumeNames[0] = 0;