Implement repositioning code + misc

[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 a9aefa16c48fd915242ebc649f9edb4e16ceb142..7ff3a44fe6bc409b9a0995c257e3a4f60e77ea2d 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -278,7 +278,7 @@ FROM Job WHERE JobId=%u", jr->JobId);
 
    jr->VolSessionId = str_to_uint64(row[0]);
    jr->VolSessionTime = str_to_uint64(row[1]);
-   jr->PoolId = atoi(row[2]);
+   jr->PoolId = str_to_uint64(row[2]);
    bstrncpy(jr->cStartTime, row[3]!=NULL?row[3]:"", sizeof(jr->cStartTime));
    bstrncpy(jr->cEndTime, row[4]!=NULL?row[4]:"", sizeof(jr->cEndTime));
    jr->JobFiles = atol(row[5]);
@@ -311,8 +311,8 @@ int db_get_job_volume_names(JCR *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **Volum
 
    db_lock(mdb);
    Mmsg(&mdb->cmd, 
-"SELECT VolumeName FROM JobMedia,Media WHERE JobMedia.JobId=%u \
-AND JobMedia.MediaId=Media.MediaId", JobId);
+"SELECT VolumeName FROM JobMedia,Media WHERE JobMedia.JobId=%u "
+"AND JobMedia.MediaId=Media.MediaId GROUP BY VolumeName", JobId);
 
    Dmsg1(130, "VolNam=%s\n", mdb->cmd);
    *VolumeNames[0] = 0;
@@ -363,7 +363,7 @@ int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS
    Mmsg(&mdb->cmd, 
 "SELECT VolumeName,FirstIndex,LastIndex,StartFile,EndFile,StartBlock,EndBlock"
 " FROM JobMedia,Media WHERE JobMedia.JobId=%u"
-" AND JobMedia.MediaId=Media.MediaId", JobId);
+" AND JobMedia.MediaId=Media.MediaId ORDER BY VolIndex,JobMediaId", JobId);
 
    Dmsg1(130, "VolNam=%s\n", mdb->cmd);
    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
@@ -441,7 +441,7 @@ int db_get_pool_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
       if (*num_ids > 0) {
         id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t));
         while ((row = sql_fetch_row(mdb)) != NULL) {
-           id[i++] = (uint32_t)atoi(row[0]);
+           id[i++] = str_to_uint64(row[0]);
         }
         *ids = id;
       }
@@ -607,6 +607,55 @@ int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cdbr)
    return stat;
 }
 
+/*
+ * Get Counter Record
+ *
+ * Returns: 0 on failure
+ *         1 on success
+ */
+int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{
+   SQL_ROW row;
+
+   db_lock(mdb);
+   Mmsg(&mdb->cmd, "SELECT MinValue,MaxValue,CurrentValue,WrapCounter "
+      "FROM Counters WHERE Counter='%s'", cr->Counter);
+
+   if (QUERY_DB(jcr, mdb, mdb->cmd)) {
+
+      mdb->num_rows = sql_num_rows(mdb);
+      
+      /* If more than one, report error, but return first row */
+      if (mdb->num_rows > 1) {
+         Mmsg1(&mdb->errmsg, _("More than one Counter!: %d\n"), (int)(mdb->num_rows));
+         Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
+      }
+      if (mdb->num_rows >= 1) {
+        if ((row = sql_fetch_row(mdb)) == NULL) {
+            Mmsg1(&mdb->errmsg, _("error fetching Counter row: %s\n"), sql_strerror(mdb));
+            Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
+           sql_free_result(mdb);
+           db_unlock(mdb);
+           return 0;
+        }
+        cr->MinValue = atoi(row[0]);
+        cr->MaxValue = atoi(row[1]);
+        cr->CurrentValue = atoi(row[2]);
+        if (row[3]) {
+           bstrncpy(cr->WrapCounter, row[3], sizeof(cr->WrapCounter));
+        } else {
+           cr->WrapCounter[0] = 0;
+        }
+        sql_free_result(mdb);
+        db_unlock(mdb);
+        return 1;
+      }
+      sql_free_result(mdb);
+   }
+   db_unlock(mdb);
+   return 0;
+}
+
 
 /* Get FileSet Record  
  * If the FileSetId is non-zero, we get its record,
@@ -623,11 +672,11 @@ int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
    db_lock(mdb);
    if (fsr->FileSetId != 0) {              /* find by id */
       Mmsg(&mdb->cmd, 
-           "SELECT FileSetId, FileSet, MD5 FROM FileSet "
+           "SELECT FileSetId,FileSet,MD5,CreateTime FROM FileSet "
            "WHERE FileSetId=%u", fsr->FileSetId);
    } else {                          /* find by name */
       Mmsg(&mdb->cmd, 
-           "SELECT FileSetId, FileSet, MD5 FROM FileSet "
+           "SELECT FileSetId,FileSet,CreateTime,MD5 FROM FileSet "
            "WHERE FileSet='%s'", fsr->FileSet);
    }  
 
@@ -645,6 +694,7 @@ int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
         fsr->FileSetId = atoi(row[0]);
          bstrncpy(fsr->FileSet, row[1]!=NULL?row[1]:"", sizeof(fsr->FileSet));
          bstrncpy(fsr->MD5, row[2]!=NULL?row[2]:"", sizeof(fsr->MD5));
+         bstrncpy(fsr->cCreateTime, row[3]!=NULL?row[3]:"", sizeof(fsr->cCreateTime));
         stat = fsr->FileSetId;
       }
       sql_free_result(mdb);
@@ -673,13 +723,14 @@ int db_get_num_media_records(JCR *jcr, B_DB *mdb)
 
 
 /*
- * This function returns a list of all the Media record ids.
+ * This function returns a list of all the Media record ids for
+ *     the current Pool.
  *  The caller must free ids if non-NULL.
  *
  *  Returns 0: on failure
  *         1: on success
  */
-int db_get_media_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_media_ids(JCR *jcr, B_DB *mdb, uint32_t PoolId, int *num_ids, uint32_t *ids[])
 {
    SQL_ROW row;
    int stat = 0;
@@ -688,7 +739,7 @@ int db_get_media_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 
    db_lock(mdb);
    *ids = NULL;
-   Mmsg(&mdb->cmd, "SELECT MediaId FROM Media");
+   Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE PoolId=%u", PoolId);
    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
       *num_ids = sql_num_rows(mdb);
       if (*num_ids > 0) {