This commit was manufactured by cvs2svn to create tag

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

diff --git a/bacula/src/cats/sql_delete.c b/bacula/src/cats/sql_delete.c
index 244b0b3411cbefed5ffdb775805a934810199554..5a0790804eac4300af2942b081d00a9ee4a4e011 100644 (file)
--- a/bacula/src/cats/sql_delete.c
+++ b/bacula/src/cats/sql_delete.c
@@ -48,8 +48,8 @@
 /* Imported subroutines */
 extern void print_dashes(B_DB *mdb);
 extern void print_result(B_DB *mdb);
-extern int QueryDB(char *file, int line, void *jcr, B_DB *db, char *select_cmd);
-extern int DeleteDB(char *file, int line, void *jcr, B_DB *db, char *delete_cmd);
+extern int QueryDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
+extern int DeleteDB(char *file, int line, JCR *jcr, B_DB *db, char *delete_cmd);
        
 /*
  * Delete Pool record, must also delete all associated
@@ -61,7 +61,7 @@ extern int DeleteDB(char *file, int line, void *jcr, B_DB *db, char *delete_cmd)
  *          NumVols = number of Media records deleted
  */
 int
-db_delete_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+db_delete_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    SQL_ROW row;
 
@@ -153,7 +153,7 @@ static int delete_handler(void *ctx, int num_fields, char **row)
  */
 static int do_media_purge(B_DB *mdb, MEDIA_DBR *mr)
 {
-   char *query = (char *)get_pool_memory(PM_MESSAGE);
+   POOLMEM *query = get_pool_memory(PM_MESSAGE);
    struct s_del_ctx del;
    int i;
 
@@ -173,11 +173,11 @@ static int do_media_purge(B_DB *mdb, MEDIA_DBR *mr)
 
    for (i=0; i < del.num_ids; i++) {
       Dmsg1(400, "Delete JobId=%d\n", del.JobId[i]);
-      Mmsg(&query, "DELETE FROM Job WHERE JobId=%d", del.JobId[i]);
+      Mmsg(&query, "DELETE FROM Job WHERE JobId=%u", del.JobId[i]);
       db_sql_query(mdb, query, NULL, (void *)NULL);
-      Mmsg(&query, "DELETE FROM File WHERE JobId=%d", del.JobId[i]);
+      Mmsg(&query, "DELETE FROM File WHERE JobId=%u", del.JobId[i]);
       db_sql_query(mdb, query, NULL, (void *)NULL);
-      Mmsg(&query, "DELETE FROM JobMedia WHERE JobId=%d", del.JobId[i]);
+      Mmsg(&query, "DELETE FROM JobMedia WHERE JobId=%u", del.JobId[i]);
       db_sql_query(mdb, query, NULL, (void *)NULL);
    }
    free(del.JobId);
@@ -188,16 +188,22 @@ static int do_media_purge(B_DB *mdb, MEDIA_DBR *mr)
 /* Delete Media record and all records that
  * are associated with it.
  */
-int db_delete_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
+int db_delete_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
+   db_lock(mdb);
    if (mr->MediaId == 0 && !db_get_media_record(jcr, mdb, mr)) {
+      db_unlock(mdb);
       return 0;
    } 
-   /* Delete associated records */
-   do_media_purge(mdb, mr);
+   /* Do purge if not already purged */
+   if (strcmp(mr->VolStatus, "Purged") != 0) {
+      /* Delete associated records */
+      do_media_purge(mdb, mr);
+   }
 
    Mmsg(&mdb->cmd, "DELETE FROM Media WHERE MediaId=%d", mr->MediaId);
    db_sql_query(mdb, mdb->cmd, NULL, (void *)NULL);
+   db_unlock(mdb);
    return 1;
 }
 
@@ -207,20 +213,24 @@ int db_delete_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
  * media record itself. But the media status
  * is changed to "Purged".
  */
-int db_purge_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
+int db_purge_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
+   db_lock(mdb);
    if (mr->MediaId == 0 && !db_get_media_record(jcr, mdb, mr)) {
+      db_unlock(mdb);
       return 0;
    } 
    /* Delete associated records */
-   do_media_purge(mdb, mr);
+   do_media_purge(mdb, mr);          /* Note, always purge */
 
    /* Mark Volume as purged */
    strcpy(mr->VolStatus, "Purged");
    if (!db_update_media_record(jcr, mdb, mr)) {
+      db_unlock(mdb);
       return 0;
    }
 
+   db_unlock(mdb);
    return 1;
 }