X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fbdb_create.c;h=9876d1a05fb07136b8c5bdbf247500a473848a9f;hb=a2bbe5fe90fa7b488146142f1c56af3e4da56867;hp=b41546304869724dff58676f4827ebecc516e5b2;hpb=1ef84681d13d0c355d6ae78579d2afe1c8d8d0e2;p=bacula%2Fbacula

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index b415463048..9876d1a05f 100644
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -7,35 +7,44 @@
  *  The purpose of these routines is to ensure that Bacula
  *  can limp along if no real database is loaded on the
  *  system.
- *   
- *    Kern Sibbald, January MMI 
+ *
+ *    Kern Sibbald, January MMI
+ *
+ *    Version $Id$
  */
-
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
- */
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 
 /* The following is necessary so that we do not include
  * the dummy external definition of DB.
  */
-#define __SQL_C 		      /* indicate that this is sql.c */
+#define __SQL_C                       /* indicate that this is sql.c */
 
 #include "bacula.h"
 #include "cats.h"
@@ -44,7 +53,7 @@
 #ifdef HAVE_BACULA_DB
 
 /* Forward referenced functions */
-int db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
+bool db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
 
 /* -----------------------------------------------------------------------
  *
@@ -53,34 +62,34 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
  * -----------------------------------------------------------------------
  */
 
-int db_create_file_attributes_record(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(B_DB *mdb, ATTR_DBR *ar)
-{	     
+int db_create_file_item(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
+{
    /****FIXME***** not implemented */
    return 1;
 }
 
 
-/*  
- * Create a new record for the Job    
+/*
+ * Create a new record for the Job
  *   This record is created at the start of the Job,
  *   it is updated in bdb_update.c when the Job terminates.
  *
  * Returns: 0 on failure
- *	    1 on success
+ *          1 on success
  */
-int db_create_job_record(B_DB *mdb, JOB_DBR *jr)
+bool db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    int len;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobs_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    mdb->control.JobId++;
@@ -91,25 +100,25 @@ int db_create_job_record(B_DB *mdb, JOB_DBR *jr)
    fseek(mdb->jobfd, 0L, SEEK_END);
    if (fwrite(jr, len, 1, mdb->jobfd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB Jobs file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->jobfd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 }
 
-/* Create a JobMedia record for Volume used this job   
+/* Create a JobMedia record for Volume used this job
  * Returns: 0 on failure
- *	    record-id on success
+ *          record-id on success
  */
-int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
+bool db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
 {
    int len;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobmedia_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    mdb->control.JobMediaId++;
@@ -121,11 +130,11 @@ int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
    fseek(mdb->jobmediafd, 0L, SEEK_END);
    if (fwrite(jm, len, 1, mdb->jobmediafd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB JobMedia file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->jobmediafd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return jm->JobMediaId;
 }
 
@@ -133,23 +142,23 @@ int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
 /*
  *  Create a unique Pool record
  * Returns: 0 on failure
- *	    1 on success
+ *          1 on success
  */
-int db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
+bool db_create_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int len;
    POOL_DBR mpr;
 
    memset(&mpr, 0, sizeof(mpr));
    strcpy(mpr.Name, pr->Name);
-   if (db_get_pool_record(mdb, &mpr)) {
+   if (db_get_pool_record(jcr, mdb, &mpr)) {
       Mmsg1(&mdb->errmsg, "Pool record %s already exists\n", mpr.Name);
       return 0;
    }
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_pools_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
 
@@ -161,36 +170,46 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
    fseek(mdb->poolfd, 0L, SEEK_END);
    if (fwrite(pr, len, 1, mdb->poolfd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB Pools file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->poolfd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 }
 
+bool db_create_device_record(JCR *jcr, B_DB *mdb, DEVICE_DBR *dr)
+{ return false; }
 
-/* 
- * Create Unique Media record.	This record
+bool db_create_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *dr)
+{ return false; }
+
+bool db_create_mediatype_record(JCR *jcr, B_DB *mdb, MEDIATYPE_DBR *dr)
+{ return false; }
+
+
+/*
+ * Create Unique Media record.  This record
  *   contains all the data pertaining to a specific
  *   Volume.
  *
  * Returns: 0 on failure
- *	    1 on success
- */ 
-int db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
+ *          1 on success
+ */
+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(mdb, &mmr)) {
+   if (db_get_media_record(jcr, mdb, &mmr)) {
       Mmsg1(&mdb->errmsg, "Media record %s already exists\n", mmr.VolumeName);
+      db_unlock(mdb);
       return 0;
    }
 
-   P(mdb->mutex);
 
    mdb->control.MediaId++;
    mr->MediaId = mdb->control.MediaId;
@@ -200,11 +219,11 @@ int db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
    fseek(mdb->mediafd, 0L, SEEK_END);
    if (fwrite(mr, len, 1, mdb->mediafd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB Media file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->mediafd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 }
 
@@ -212,22 +231,23 @@ int db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
 /*
  *  Create a unique Client record or return existing record
  * Returns: 0 on failure
- *	    1 on success
+ *          1 on success
  */
-int db_create_client_record(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(mdb, cr)) {
+   if (db_get_client_record(jcr, mdb, cr)) {
       Mmsg1(&mdb->errmsg, "Client record %s already exists\n", cr->Name);
+      db_unlock(mdb);
       return 1;
    }
 
-   P(mdb->mutex);
    if (!bdb_open_client_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
 
@@ -239,36 +259,37 @@ int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
    len = sizeof(lcr);
    if (fwrite(cr, len, 1, mdb->clientfd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB Client file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->clientfd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 }
 
 /*
  *  Create a unique FileSet record or return existing record
  *
- *   Note, here we write the FILESET_DBR structure 
+ *   Note, here we write the FILESET_DBR structure
  *
  * Returns: 0 on failure
- *	    1 on success
+ *          1 on success
  */
-int db_create_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
+bool 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(mdb, fsr)) {
+   if (db_get_fileset_record(jcr, mdb, fsr)) {
       Mmsg1(&mdb->errmsg, "FileSet record %s already exists\n", fsr->FileSet);
+      db_unlock(mdb);
       return 1;
    }
 
-   P(mdb->mutex);
    if (!bdb_open_fileset_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
 
@@ -280,12 +301,16 @@ int db_create_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
    len = sizeof(lfsr);
    if (fwrite(fsr,  len, 1, mdb->filesetfd) != 1) {
       Mmsg1(&mdb->errmsg, "Error writing DB FileSet file. ERR=%s\n", strerror(errno));
-      V(mdb->mutex);
+      db_unlock(mdb);
       return 0;
    }
    fflush(mdb->filesetfd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return 1;
 }
 
+int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{ return 0; }
+
+
 #endif /* HAVE_BACULA_DB */