Misc -- see ChangeLog

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

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index e8edba50b6e78d1d762a4e96fe8f538f6b8fdf07..80ea509e2512f543b36f68fbc53308a495b2a9ba 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -117,6 +117,7 @@ db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
    int count;
 
    db_lock(mdb);
+#ifdef not_used_in_new_code
    Mmsg(&mdb->cmd, "SELECT JobId, MediaId FROM JobMedia WHERE \
 JobId=%d AND MediaId=%d", jm->JobId, jm->MediaId);
 
@@ -132,6 +133,7 @@ JobId=%d AND MediaId=%d", jm->JobId, jm->MediaId);
       }
       sql_free_result(mdb);
    }
+#endif
 
    /* Now get count for VolIndex */
    Mmsg(&mdb->cmd, "SELECT count(*) from JobMedia");
@@ -233,7 +235,7 @@ int
 db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    int stat;
-   char ed1[30], ed2[30], ed3[30], ed4[30];
+   char ed1[30], ed2[30], ed3[30], ed4[30], ed5[30];
    char dt[MAX_TIME_LENGTH];
    struct tm tm;
 
@@ -245,7 +247,7 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
       mdb->num_rows = sql_num_rows(mdb);
       if (mdb->num_rows > 0) {
-         Mmsg1(&mdb->errmsg, _("Volume \"%s\" already exists\n."), mr->VolumeName);
+         Mmsg1(&mdb->errmsg, _("Volume \"%s\" already exists.\n"), mr->VolumeName);
         sql_free_result(mdb);
         db_unlock(mdb);
         return 0;
@@ -258,13 +260,13 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
       localtime_r(&mr->LabelDate, &tm); 
       strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
    } else {
-      strcpy(dt, "0000-00-00 00:00:00");
+      bstrncpy(dt, "0000-00-00 00:00:00", sizeof(dt));
    }
    Mmsg(&mdb->cmd, 
 "INSERT INTO Media (VolumeName,MediaType,PoolId,MaxVolBytes,VolCapacityBytes," 
 "Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,"
-"VolStatus,LabelDate,Slot) "
-"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,%u,%u,'%s','%s',%d)", 
+"VolStatus,LabelDate,Slot,VolBytes) "
+"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,%u,%u,'%s','%s',%d,%s)", 
                  mr->VolumeName,
                  mr->MediaType, mr->PoolId, 
                  edit_uint64(mr->MaxVolBytes,ed1),
@@ -275,7 +277,8 @@ db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
                  mr->MaxVolJobs,
                  mr->MaxVolFiles,
                  mr->VolStatus, dt,
-                 mr->Slot);
+                 mr->Slot,
+                 edit_uint64(mr->VolBytes, ed5));
 
    Dmsg1(500, "Create Volume: %s\n", mdb->cmd);
    if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
@@ -359,6 +362,44 @@ FileRetention, JobRetention) VALUES \
 }
 
 
+/* 
+ * Create a Unique record for the counter -- no duplicates 
+ * Returns: 0 on failure
+ *         1 on success with counter filled in
+ */
+int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{
+   COUNTER_DBR mcr;
+   int stat;
+
+   db_lock(mdb);
+   memset(&mcr, 0, sizeof(mcr));
+   bstrncpy(mcr.Counter, cr->Counter, sizeof(mcr.Counter));
+   if (db_get_counter_record(jcr, mdb, &mcr)) {
+      memcpy(cr, &mcr, sizeof(COUNTER_DBR));
+      db_unlock(mdb);
+      return 1;
+   }
+
+   /* Must create it */
+   Mmsg(&mdb->cmd, "INSERT INTO Counters (Counter,MinValue,MaxValue,CurrentValue,"
+      "WrapCounter) VALUES ('%s','%d','%d','%d','%s')",
+      cr->Counter, cr->MinValue, cr->MaxValue, cr->CurrentValue,
+      cr->WrapCounter);
+
+   if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
+      Mmsg2(&mdb->errmsg, _("Create DB Counters record %s failed. ERR=%s\n"),
+           mdb->cmd, sql_strerror(mdb));
+      Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
+      stat = 0;
+   } else {
+      stat = 1;
+   }
+   db_unlock(mdb);
+   return stat;
+}
+
+
 /* 
  * Create a FileSet record. This record is unique in the
  *  name and the MD5 signature of the include/exclude sets.