Rtn oldest Lastwritten for find_next_vol+remove bad ASSERT+add more SD status if...

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

diff --git a/bacula/src/cats/bdb_list.c b/bacula/src/cats/bdb_list.c
index 36d22e73b92fe1b6ec8b7b5ee510bd762aca0081..837e1e1b8565f665c3cd5efb76d6c437874db28f 100644 (file)
--- a/bacula/src/cats/bdb_list.c
+++ b/bacula/src/cats/bdb_list.c
@@ -9,10 +9,12 @@
  *  system.
  *   
  *    Kern Sibbald, January MMI 
+ *
+ *    Version $Id$
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -55,7 +57,8 @@
 /* 
  * Submit general SQL query
  */
-int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx)
+int db_list_sql_query(JCR *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
+                     void *ctx, int verbose)
 {
    sendit(ctx, "SQL Queries not implemented with internal database.\n");
    return 0;
@@ -65,15 +68,15 @@ int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx
 /*
  * List all the pool records
  */
-void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_pool_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 {
    int len;
    POOL_DBR pr;
 
    Dmsg0(90, "Enter list_pool_records\n");
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_pools_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "  PoolId NumVols MaxVols  Type       PoolName\n");
@@ -86,7 +89,7 @@ void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
         sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "===================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    Dmsg0(90, "Leave list_pool_records\n");
    return;
 }
@@ -95,15 +98,16 @@ void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 /*
  * List Media records
  */
-void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_media_records(JCR *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
+                          DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc[30];
    int len;
    MEDIA_DBR mr;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_media_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "  Status           VolBytes  MediaType        VolumeName\n");
@@ -117,23 +121,24 @@ void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit,
         sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "====================================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
-void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_jobmedia_records(JCR *jcr, B_DB *mdb, uint32_t JobId, 
+                             DB_LIST_HANDLER *sendit, void *ctx)
 {
    JOBMEDIA_DBR jm;
    MEDIA_DBR mr;
    int jmlen, mrlen;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobmedia_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    if (!bdb_open_media_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "    JobId VolumeName    FirstIndex LastIndex\n");
@@ -171,7 +176,7 @@ void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit
    }
 
    sendit(ctx, "============================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
@@ -179,7 +184,8 @@ void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit
 /*
  * List Job records
  */
-void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, 
+                        DB_LIST_HANDLER *sendit, void *ctx)
 {
    int jrlen;
    JOB_DBR ojr;
@@ -188,9 +194,9 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
    char dt[MAX_TIME_LENGTH];
    struct tm tm;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobs_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    fseek(mdb->jobfd, 0L, SEEK_SET);   /* rewind file */
@@ -218,7 +224,7 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
       sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "============================================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
@@ -226,7 +232,8 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
 /*
  * List Job Totals
  */
-void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_job_totals(JCR *jcr, B_DB *mdb, JOB_DBR *jr, 
+                       DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc1[30], ewc2[30], ewc3[30];
    int jrlen;
@@ -235,9 +242,9 @@ void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *c
    uint64_t total_files = 0;
    uint32_t total_jobs = 0;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobs_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    fseek(mdb->jobfd, 0L, SEEK_SET);   /* rewind file */
@@ -258,12 +265,47 @@ void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *c
             edit_uint64_with_commas(total_bytes, ewc3));
    sendit(ctx, mdb->cmd);
    sendit(ctx, "=======================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
 
 
-void db_list_files_for_job(B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx) {}
+void db_list_files_for_job(JCR *jcr, B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx)
+{ }
+
+void db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+{ }
+
+int db_list_sql_query(JCR *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
+                     void *ctx, int verbose, e_list_type type)
+{
+   return 0;
+}
+
+void
+db_list_pool_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type) 
+{ }
+
+void
+db_list_media_records(JCR *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
+                     DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
+{ }
+
+void db_list_jobmedia_records(JCR *jcr, B_DB *mdb, uint32_t JobId, 
+                             DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
+{ }
+
+void
+db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, 
+                   void *ctx, e_list_type type)
+{ }
+
+void
+db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
+{ }
+
+
+
 
 #endif /* HAVE_BACULA_DB */