Optimize tree.c a bit, take Scott's spec & patch

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

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 4bda78419de275623dca7b9c0c29aa2e6dbb39f9..4acb2b8f59f69ff2a147fc753b527020061204d2 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -45,7 +45,7 @@
 
 /* Imported subroutines */
 extern void print_result(B_DB *mdb);
-extern int UpdateDB(char *file, int line, void *jcr, B_DB *db, char *update_cmd);
+extern int UpdateDB(char *file, int line, JCR *jcr, B_DB *db, char *update_cmd);
 
 /* -----------------------------------------------------------------------
  *
@@ -55,7 +55,7 @@ extern int UpdateDB(char *file, int line, void *jcr, B_DB *db, char *update_cmd)
  */
 /* Update the attributes record by adding the MD5 signature */
 int
-db_add_SIG_to_file_record(void *jcr, B_DB *mdb, FileId_t FileId, char *SIG,
+db_add_SIG_to_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, char *SIG,
                          int type)
 {
    int stat;
@@ -70,7 +70,7 @@ db_add_SIG_to_file_record(void *jcr, B_DB *mdb, FileId_t FileId, char *SIG,
 /* Mark the file record as being visited during database
  * verify compare. Stuff JobId into MarkedId field
  */
-int db_mark_file_record(void *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId) 
+int db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId) 
 {
    int stat;
 
@@ -88,7 +88,7 @@ int db_mark_file_record(void *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId)
  *          1 on success
  */
 int
-db_update_job_start_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
+db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    char dt[MAX_TIME_LENGTH];
    time_t stime;
@@ -103,9 +103,10 @@ db_update_job_start_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
    JobTDate = (btime_t)stime;
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime='%s', \
-ClientId=%u, JobTDate=%s WHERE JobId=%u",
+   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime='%s',"
+"ClientId=%u, JobTDate=%s WHERE JobId=%u",
       (char)(jr->Level), dt, jr->ClientId, edit_uint64(JobTDate, ed1), jr->JobId);
+
    stat = UPDATE_DB(jcr, mdb, mdb->cmd);
    db_unlock(mdb);
    mdb->changes = 0;
@@ -121,7 +122,7 @@ ClientId=%u, JobTDate=%s WHERE JobId=%u",
  *          1 on success
  */
 int
-db_update_job_end_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
+db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    char dt[MAX_TIME_LENGTH];
    time_t ttime;
@@ -150,8 +151,13 @@ VolSessionTime=%u, PoolId=%u, FileSetId=%u, JobTDate=%s WHERE JobId=%u",
 }
 
 
+/*
+ * Update Client record 
+ *   Returns: 0 on failure
+ *           1 on success
+ */
 int
-db_update_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
+db_update_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    int stat;
    char ed1[50], ed2[50];
@@ -178,8 +184,29 @@ db_update_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
 }
 
 
+/*
+ * Update Counters record
+ *   Returns: 0 on failure
+ *           1 on success
+ */
+int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{
+   db_lock(mdb);
+
+   Mmsg(&mdb->cmd,
+"UPDATE Counters SET MinValue=%d,MaxValue=%d,CurrentValue=%d," 
+"WrapCounter='%s' WHERE Counter='%s'",
+      cr->MinValue, cr->MaxValue, cr->CurrentValue,
+      cr->WrapCounter, cr->Counter);
+
+   int stat = UPDATE_DB(jcr, mdb, mdb->cmd);
+   db_unlock(mdb);
+   return stat;
+}
+
+
 int
-db_update_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+db_update_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int stat;
    char ed1[50], ed2[50], ed3[50];
@@ -210,7 +237,7 @@ db_update_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
  *         numrows on success
  */
 int
-db_update_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr) 
+db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) 
 {
    char dt[MAX_TIME_LENGTH];
    time_t ttime;
@@ -232,6 +259,19 @@ db_update_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
       Dmsg1(400, "Firstwritten stat=%d\n", stat);
    }
 
+   /* Label just done? */
+   if (mr->VolBytes == 1) {
+      ttime = mr->LabelDate;
+      if (ttime == 0) {
+        ttime = time(NULL);
+      }
+      localtime_r(&ttime, &tm);
+      strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
+      Mmsg(&mdb->cmd, "UPDATE Media SET LabelDate='%s'\
+ WHERE VolumeName='%s'", dt, mr->VolumeName);
+      stat = UPDATE_DB(jcr, mdb, mdb->cmd);
+   }
+
    ttime = mr->LastWritten;
    localtime_r(&ttime, &tm);
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);