This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / cats / protos.h

diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h
index 66f2c72989741919fd3ddd812238494eb163f9a2..ab233e474a7f4f8556af7ba2f65c71374635a086 100644 (file)
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -30,67 +30,80 @@
 /* Database prototypes */
 
 /* sql.c */
-B_DB *db_init_database(char *db_name, char *db_user, char *db_password);
-int db_open_database(B_DB *db);
-void db_close_database(B_DB *db);
+B_DB *db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password, 
+                       char *db_address, int db_port, char *db_socket);
+int db_open_database(JCR *jcr, B_DB *db);
+void db_close_database(JCR *jcr, B_DB *db);
 void db_escape_string(char *snew, char *old, int len);
 char *db_strerror(B_DB *mdb);
-int get_sql_record_max(B_DB *mdb);
-int db_next_index(B_DB *mdb, char *table, char *index);
+int get_sql_record_max(JCR *jcr, B_DB *mdb);
+int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index);
 int db_sql_query(B_DB *mdb, char *cmd, DB_RESULT_HANDLER *result_handler, void *ctx);
-int check_tables_version(B_DB *mdb);
+int check_tables_version(JCR *jcr, B_DB *mdb);
 void _db_unlock(char *file, int line, B_DB *mdb);
 void _db_lock(char *file, int line, B_DB *mdb);
-void db_start_transaction(B_DB *mdb);
-void db_end_transaction(B_DB *mdb);
+void db_start_transaction(JCR *jcr, B_DB *mdb);
+void db_end_transaction(JCR *jcr, B_DB *mdb);
 
 /* create.c */
-int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar);
-int db_create_job_record(B_DB *db, JOB_DBR *jr);
-int db_create_media_record(B_DB *db, MEDIA_DBR *media_dbr);
-int db_create_client_record(B_DB *db, CLIENT_DBR *cr);
-int db_create_fileset_record(B_DB *db, FILESET_DBR *fsr);
-int db_create_pool_record(B_DB *db, POOL_DBR *pool_dbr);
-int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jr);
+int db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar);
+int db_create_job_record(JCR *jcr, B_DB *db, JOB_DBR *jr);
+int db_create_media_record(JCR *jcr, B_DB *db, MEDIA_DBR *media_dbr);
+int db_create_client_record(JCR *jcr, B_DB *db, CLIENT_DBR *cr);
+int db_create_fileset_record(JCR *jcr, B_DB *db, FILESET_DBR *fsr);
+int db_create_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pool_dbr);          
+int db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jr);
+int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr);
 
 /* delete.c */
-int db_delete_pool_record(B_DB *db, POOL_DBR *pool_dbr);
-int db_delete_media_record(B_DB *mdb, MEDIA_DBR *mr);
+int db_delete_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pool_dbr);
+int db_delete_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr);
 
 /* find.c */
-int db_find_job_start_time(B_DB *mdb, JOB_DBR *jr, char *stime);
-int db_find_last_jobid(B_DB *mdb, JOB_DBR *jr);
-int db_find_next_volume(B_DB *mdb, int index, MEDIA_DBR *mr);
+int db_find_job_start_time(JCR *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime);
+int db_find_last_jobid(JCR *jcr, B_DB *mdb, char *Name, JOB_DBR *jr);
+int db_find_next_volume(JCR *jcr, B_DB *mdb, int index, MEDIA_DBR *mr);
 
 /* get.c */
-int db_get_pool_record(B_DB *db, POOL_DBR *pdbr);
-int db_get_client_record(B_DB *mdb, CLIENT_DBR *cr);
-int db_get_job_record(B_DB *mdb, JOB_DBR *jr);
-int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames);
-int db_get_file_attributes_record(B_DB *mdb, char *fname, FILE_DBR *fdbr);
-int db_get_fileset_record(B_DB *mdb, FILESET_DBR *fsr);
-int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr);
-int db_get_num_media_records(B_DB *mdb);
-int db_get_num_pool_records(B_DB *mdb);
-int db_get_pool_ids(B_DB *mdb, int *num_ids, uint32_t **ids);
-int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t **ids);
+int db_get_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pdbr);
+int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr);
+int db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr);
+int db_get_job_volume_names(JCR *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames);
+int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, JOB_DBR *jr, FILE_DBR *fdbr);
+int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr);
+int db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr);
+int db_get_num_media_records(JCR *jcr, B_DB *mdb);
+int db_get_num_pool_records(JCR *jcr, B_DB *mdb);
+int db_get_pool_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t **ids);
+int db_get_client_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t **ids);
+int db_get_media_ids(JCR *jcr, B_DB *mdb, uint32_t PoolId, int *num_ids, uint32_t **ids);
+int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams);
+int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cdbr);
+int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr);
 
 
 /* list.c */
-void db_list_pool_records(B_DB *db, DB_LIST_HANDLER sendit, void *ctx);
-void db_list_job_records(B_DB *db, JOB_DBR *jr, DB_LIST_HANDLER sendit, void *ctx);
-void db_list_job_totals(B_DB *db, JOB_DBR *jr, DB_LIST_HANDLER sendit, void *ctx);
-void db_list_files_for_job(B_DB *db, uint32_t jobid, DB_LIST_HANDLER sendit, void *ctx);
-void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit, void *ctx);
-void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit, void *ctx);
-int  db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx, int verbose);
+enum e_list_type {
+   HORZ_LIST,
+   VERT_LIST
+};
+void db_list_pool_records(JCR *jcr, B_DB *db, DB_LIST_HANDLER sendit, void *ctx, e_list_type type);
+void db_list_job_records(JCR *jcr, B_DB *db, JOB_DBR *jr, DB_LIST_HANDLER sendit, void *ctx, e_list_type type);
+void db_list_job_totals(JCR *jcr, B_DB *db, JOB_DBR *jr, DB_LIST_HANDLER sendit, void *ctx);
+void db_list_files_for_job(JCR *jcr, B_DB *db, uint32_t jobid, 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, 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);
+int  db_list_sql_query(JCR *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx, int verbose, e_list_type type);
+void db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type);
 
 /* update.c */
-int  db_update_job_start_record(B_DB *db, JOB_DBR *jr);
-int  db_update_job_end_record(B_DB *db, JOB_DBR *jr);
-int  db_update_pool_record(B_DB *db, POOL_DBR *pr);
-int  db_update_media_record(B_DB *db, MEDIA_DBR *mr);
-int  db_add_MD5_to_file_record(B_DB *mdb, FileId_t FileId, char *MD5); 
-int  db_mark_file_record(B_DB *mdb, FileId_t FileId, JobId_t JobId);
+int  db_update_job_start_record(JCR *jcr, B_DB *db, JOB_DBR *jr);
+int  db_update_job_end_record(JCR *jcr, B_DB *db, JOB_DBR *jr);
+int  db_update_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr);
+int  db_update_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pr);
+int  db_update_media_record(JCR *jcr, B_DB *db, MEDIA_DBR *mr);
+int  db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr);
+int  db_add_SIG_to_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, char *SIG, int type);  
+int  db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId);
 
 #endif /* __SQL_PROTOS_H */