Implement repositioning code + misc

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

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index 1c4e319058466490462f0e5b060e040987f0e053..20468b33e4edb1d13a31a989b88445c16b436745 100644 (file)
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -55,13 +55,13 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
  * -----------------------------------------------------------------------
  */
 
-int db_create_file_attributes_record(void *jcr, B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
    /* *****FIXME***** implement this */
    return 1;
 }
 
-int db_create_file_item(void *jcr, B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_item(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {           
    /****FIXME***** not implemented */
    return 1;
@@ -76,7 +76,7 @@ int db_create_file_item(void *jcr, B_DB *mdb, ATTR_DBR *ar)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
+int db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    int len;
 
@@ -105,7 +105,7 @@ int db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
  * Returns: 0 on failure
  *         record-id on success
  */
-int db_create_jobmedia_record(void *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
+int db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
 {
    int len;
 
@@ -137,7 +137,7 @@ int db_create_jobmedia_record(void *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+int db_create_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int len;
    POOL_DBR mpr;
@@ -180,19 +180,20 @@ int db_create_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
  * Returns: 0 on failure
  *         1 on success
  */ 
-int db_create_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
+int db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    int len;
    MEDIA_DBR mmr;
 
+   db_lock(mdb);
    memset(&mmr, 0, sizeof(mmr));
    strcpy(mmr.VolumeName, mr->VolumeName);
    if (db_get_media_record(jcr, mdb, &mmr)) {
       Mmsg1(&mdb->errmsg, "Media record %s already exists\n", mmr.VolumeName);
+      db_unlock(mdb);
       return 0;
    }
 
-   db_lock(mdb);
 
    mdb->control.MediaId++;
    mr->MediaId = mdb->control.MediaId;
@@ -216,18 +217,19 @@ int db_create_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
+int db_create_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    int len;
    CLIENT_DBR lcr;
 
+   db_lock(mdb);
    cr->ClientId = 0;
    if (db_get_client_record(jcr, mdb, cr)) {
       Mmsg1(&mdb->errmsg, "Client record %s already exists\n", cr->Name);
+      db_unlock(mdb);
       return 1;
    }
 
-   db_lock(mdb);
    if (!bdb_open_client_file(mdb)) {
       db_unlock(mdb);
       return 0;
@@ -257,18 +259,19 @@ int db_create_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
+int db_create_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    int len;
    FILESET_DBR lfsr;
 
+   db_lock(mdb);
    fsr->FileSetId = 0;
    if (db_get_fileset_record(jcr, mdb, fsr)) {
       Mmsg1(&mdb->errmsg, "FileSet record %s already exists\n", fsr->FileSet);
+      db_unlock(mdb);
       return 1;
    }
 
-   db_lock(mdb);
    if (!bdb_open_fileset_file(mdb)) {
       db_unlock(mdb);
       return 0;
@@ -290,4 +293,8 @@ int db_create_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
    return 1;
 }
 
+int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{ return 0; }
+
+
 #endif /* HAVE_BACULA_DB */