X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fsql_get.c;h=acd1d886cfe726e0f1485d374cfe84bcabd83ec7;hb=b34b84f6913ee6d03d6c838e647c4aedf4bda3f2;hp=c0e27e54e6051ee5cceb27540c404467d32af7d8;hpb=9a0ee8018bcc482e9996ddc710519a07baaa13f0;p=bacula%2Fbacula diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c index c0e27e54e6..acd1d886cf 100644 --- a/bacula/src/cats/sql_get.c +++ b/bacula/src/cats/sql_get.c @@ -1,43 +1,39 @@ /* * Bacula Catalog Database Get record interface routines * Note, these routines generally get a record by id or - * by name. If more logic is involved, the routine - * should be in find.c + * by name. If more logic is involved, the routine + * should be in find.c * * Kern Sibbald, March 2000 + * + * Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald 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. + modify it under the terms of the GNU General Public License + version 2 as ammended with additional clauses defined in the + file LICENSE in the main source directory. 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ -/* *****FIXME**** fix fixed length of select_cmd[] and insert_cmd[] */ /* 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" -#if HAVE_MYSQL || HAVE_SQLITE +#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL /* ----------------------------------------------------------------------- * @@ -47,14 +43,16 @@ */ /* Forward referenced functions */ -static int db_get_file_record(B_DB *mdb, FILE_DBR *fdbr); -static int db_get_filename_record(B_DB *mdb, char *fname); -static int db_get_path_record(B_DB *mdb, char *path); +static int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr); +static int db_get_filename_record(JCR *jcr, B_DB *mdb); +static int db_get_path_record(JCR *jcr, B_DB *mdb); /* Imported subroutines */ extern void print_result(B_DB *mdb); -extern int QueryDB(char *file, int line, B_DB *db, char *select_cmd); +extern int QueryDB(const char *file, int line, JCR *jcr, B_DB *db, char *select_cmd); +extern void split_path_and_file(JCR *jcr, B_DB *mdb, const char *fname); + /* @@ -62,312 +60,390 @@ extern int QueryDB(char *file, int line, B_DB *db, char *select_cmd); * (with attributes) in the database. * * Returns: 0 on failure - * 1 on success with the File record in FILE_DBR + * 1 on success with the File record in FILE_DBR */ -int db_get_file_attributes_record(B_DB *mdb, char *fname, FILE_DBR *fdbr) +int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, JOB_DBR *jr, FILE_DBR *fdbr) { - int fnl, pnl; - char *l, *p; - uint64_t id; - char file[MAXSTRING]; - char spath[MAXSTRING]; - char buf[MAXSTRING]; - Dmsg0(20, "get_file_from_catalog\n"); - - /* Find path without the filename */ - for (p=l=fname; *p; p++) { - if (*p == '/') { - l = p; - } - } - if (*l == '/') { - l++; - } - - fnl = p - l; - strcpy(file, l); - - pnl = l - fname; - strncpy(spath, fname, pnl); - spath[l-fname] = 0; - - if (pnl == 0) { - return 0; - } + int stat; + Dmsg1(100, "db_get_file_att_record fname=%s \n", fname); - strip_trailing_junk(spath); - Dmsg1(50, "spath=%s\n", spath); + db_lock(mdb); + split_path_and_file(jcr, mdb, fname); - strip_trailing_junk(file); - Dmsg1(50, "file=%s\n", file); + fdbr->FilenameId = db_get_filename_record(jcr, mdb); - db_escape_string(buf, file, fnl); - fdbr->FilenameId = db_get_filename_record(mdb, buf); - Dmsg1(50, "db_get_filename_record FilenameId=%d\n", fdbr->FilenameId); + fdbr->PathId = db_get_path_record(jcr, mdb); - db_escape_string(buf, spath, pnl); - fdbr->PathId = db_get_path_record(mdb, buf); - Dmsg1(50, "db_get_path_record PathId=%d\n", fdbr->PathId); + stat = db_get_file_record(jcr, mdb, jr, fdbr); - id = db_get_file_record(mdb, fdbr); + db_unlock(mdb); - return id; + return stat; } - -/* Get a File record +/* + * Get a File record * Returns: 0 on failure - * 1 on success + * 1 on success + * + * DO NOT use Jmsg in this routine. + * + * Note in this routine, we do not use Jmsg because it may be + * called to get attributes of a non-existent file, which is + * "normal" if a new file is found during Verify. */ static -int db_get_file_record(B_DB *mdb, FILE_DBR *fdbr) +int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) { SQL_ROW row; + int stat = 0; + char ed1[50], ed2[50], ed3[50]; + + if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) { + Mmsg(mdb->cmd, +"SELECT FileId, LStat, MD5 FROM File,Job WHERE " +"File.JobId=Job.JobId AND File.PathId=%s AND " +"File.FilenameId=%s AND Job.Type='B' AND Job.JobSTATUS='T' AND " +"ClientId=%s ORDER BY StartTime DESC LIMIT 1", + edit_int64(fdbr->PathId, ed1), + edit_int64(fdbr->FilenameId, ed2), + edit_int64(jr->ClientId,ed3)); - P(mdb->mutex); - Mmsg(&mdb->cmd, -"SELECT FileId, LStat, MD5 from File where File.JobId=%d and File.PathId=%d and \ -File.FilenameId=%d", fdbr->JobId, fdbr->PathId, fdbr->FilenameId); + } else { + Mmsg(mdb->cmd, +"SELECT FileId, LStat, MD5 FROM File WHERE File.JobId=%s AND File.PathId=%s AND " +"File.FilenameId=%s", + edit_int64(fdbr->JobId, ed1), + edit_int64(fdbr->PathId, ed2), + edit_int64(fdbr->FilenameId,ed3)); + } + Dmsg3(050, "Get_file_record JobId=%u FilenameId=%u PathId=%u\n", + fdbr->JobId, fdbr->FilenameId, fdbr->PathId); - if (QUERY_DB(mdb, mdb->cmd)) { + Dmsg1(100, "Query=%s\n", mdb->cmd); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { mdb->num_rows = sql_num_rows(mdb); - - /* - * Note, we can find more than one File record with the same - * filename if the file is linked. ???????? - */ + Dmsg1(050, "get_file_record num_rows=%d\n", (int)mdb->num_rows); if (mdb->num_rows > 1) { - Emsg1(M_WARNING, 0, _("get_file_record want 1 got rows=%d\n"), mdb->num_rows); - Emsg1(M_WARNING, 0, "%s\n", mdb->cmd); + Mmsg1(mdb->errmsg, _("get_file_record want 1 got rows=%d\n"), + mdb->num_rows); } if (mdb->num_rows >= 1) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Emsg1(M_ERROR, 0, "Error fetching row: %s\n", sql_strerror(mdb)); - } else { - fdbr->FileId = (FileId_t)strtod(row[0], NULL); - strncpy(fdbr->LStat, row[1], sizeof(fdbr->LStat)); - fdbr->LStat[sizeof(fdbr->LStat)] = 0; - strncpy(fdbr->MD5, row[2], sizeof(fdbr->MD5)); - fdbr->MD5[sizeof(fdbr->MD5)] = 0; - sql_free_result(mdb); - V(mdb->mutex); - return 1; - } + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("Error fetching row: %s\n"), sql_strerror(mdb)); + } else { + fdbr->FileId = (FileId_t)str_to_int64(row[0]); + bstrncpy(fdbr->LStat, row[1], sizeof(fdbr->LStat)); + bstrncpy(fdbr->SIG, row[2], sizeof(fdbr->SIG)); + stat = 1; + } + } else { + Mmsg2(mdb->errmsg, _("File record for PathId=%s FilenameId=%s not found.\n"), + edit_int64(fdbr->PathId, ed1), + edit_int64(fdbr->FilenameId, ed2)); } - sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("File record not found in Catalog.\n")); } - V(mdb->mutex); - return 0; /* failed */ + return stat; } -/* Get Filename record +/* Get Filename record * Returns: 0 on failure - * FilenameId on success + * FilenameId on success + * + * DO NOT use Jmsg in this routine (see notes for get_file_record) */ -static int db_get_filename_record(B_DB *mdb, char *fname) +static int db_get_filename_record(JCR *jcr, B_DB *mdb) { SQL_ROW row; - int FilenameId; - - if (*fname == 0) { - Mmsg0(&mdb->errmsg, _("Null name given to db_get_filename_record\n")); - Emsg0(M_ABORT, 0, mdb->errmsg); - } + int FilenameId = 0; - P(mdb->mutex); - Mmsg(&mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name=\"%s\"", fname); - if (QUERY_DB(mdb, mdb->cmd)) { + mdb->esc_name = check_pool_memory_size(mdb->esc_name, 2*mdb->fnl+2); + db_escape_string(mdb->esc_name, mdb->fname, mdb->fnl); + Mmsg(mdb->cmd, "SELECT FilenameId FROM Filename WHERE Name='%s'", mdb->esc_name); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + char ed1[30]; mdb->num_rows = sql_num_rows(mdb); - if (mdb->num_rows > 1) { - Mmsg1(&mdb->errmsg, _("More than one Filename!: %d\n"), (int)(mdb->num_rows)); - Emsg0(M_FATAL, 0, mdb->errmsg); - } else if (mdb->num_rows == 1) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); - Emsg0(M_FATAL, 0, mdb->errmsg); - } - FilenameId = atoi(row[0]); - if (FilenameId <= 0) { - Mmsg2(&mdb->errmsg, _("Create db Filename record %s found bad record: %d\n"), - mdb->cmd, FilenameId); - Emsg0(M_ERROR, 0, mdb->errmsg); - } - sql_free_result(mdb); - V(mdb->mutex); - return FilenameId; - + Mmsg2(mdb->errmsg, _("More than one Filename!: %s for file: %s\n"), + edit_uint64(mdb->num_rows, ed1), mdb->fname); + Jmsg(jcr, M_WARNING, 0, "%s", mdb->errmsg); + } + if (mdb->num_rows >= 1) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); + } else { + FilenameId = str_to_int64(row[0]); + if (FilenameId <= 0) { + Mmsg2(mdb->errmsg, _("Get DB Filename record %s found bad record: %d\n"), + mdb->cmd, FilenameId); + FilenameId = 0; + } + } + } else { + Mmsg1(mdb->errmsg, _("Filename record: %s not found.\n"), mdb->fname); } sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("Filename record: %s not found in Catalog.\n"), mdb->fname); } - V(mdb->mutex); - return 0; /* failed */ + return FilenameId; } -/* Get path record +/* Get path record * Returns: 0 on failure - * PathId on success + * PathId on success + * + * DO NOT use Jmsg in this routine (see notes for get_file_record) */ -static int db_get_path_record(B_DB *mdb, char *path) +static int db_get_path_record(JCR *jcr, B_DB *mdb) { SQL_ROW row; - int PathId; - /*******FIXME***** move into mdb record and allocate */ - static int cached_id = 0; - static char cached_path[MAXSTRING]; + uint32_t PathId = 0; + + mdb->esc_name = check_pool_memory_size(mdb->esc_name, 2*mdb->pnl+2); + db_escape_string(mdb->esc_name, mdb->path, mdb->pnl); - if (*path == 0) { - Emsg0(M_ABORT, 0, _("Null path given to db_get_path_record\n")); + if (mdb->cached_path_id != 0 && mdb->cached_path_len == mdb->pnl && + strcmp(mdb->cached_path, mdb->path) == 0) { + return mdb->cached_path_id; } - if (cached_id != 0 && strcmp(cached_path, path) == 0) { - return cached_id; - } - P(mdb->mutex); - Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path=\"%s\"", path); + Mmsg(mdb->cmd, "SELECT PathId FROM Path WHERE Path='%s'", mdb->esc_name); - if (QUERY_DB(mdb, mdb->cmd)) { + if (QUERY_DB(jcr, mdb, mdb->cmd)) { char ed1[30]; mdb->num_rows = sql_num_rows(mdb); - if (mdb->num_rows > 1) { - Mmsg1(&mdb->errmsg, _("More than one Path!: %s\n"), - edit_uint64(mdb->num_rows, ed1)); - Emsg0(M_FATAL, 0, mdb->errmsg); - } else if (mdb->num_rows == 1) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); - Emsg0(M_FATAL, 0, mdb->errmsg); - } - PathId = atoi(row[0]); - if (PathId != cached_id) { - cached_id = PathId; - strcpy(cached_path, path); - } - sql_free_result(mdb); - V(mdb->mutex); - return PathId; + Mmsg2(mdb->errmsg, _("More than one Path!: %s for path: %s\n"), + edit_uint64(mdb->num_rows, ed1), mdb->path); + Jmsg(jcr, M_WARNING, 0, "%s", mdb->errmsg); + } + /* Even if there are multiple paths, take the first one */ + if (mdb->num_rows >= 1) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); + } else { + PathId = str_to_int64(row[0]); + if (PathId <= 0) { + Mmsg2(mdb->errmsg, _("Get DB path record %s found bad record: %s\n"), + mdb->cmd, edit_int64(PathId, ed1)); + PathId = 0; + } else { + /* Cache path */ + if (PathId != mdb->cached_path_id) { + mdb->cached_path_id = PathId; + mdb->cached_path_len = mdb->pnl; + pm_strcpy(mdb->cached_path, mdb->path); + } + } + } + } else { + Mmsg1(mdb->errmsg, _("Path record: %s not found.\n"), mdb->path); } - sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("Path record: %s not found in Catalog.\n"), mdb->path); } - V(mdb->mutex); - return 0; /* failed */ + return PathId; } -/* +/* * Get Job record for given JobId or Job name * Returns: 0 on failure - * 1 on success + * 1 on success */ -int db_get_job_record(B_DB *mdb, JOB_DBR *jr) +int db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) { SQL_ROW row; + char ed1[50]; - P(mdb->mutex); + db_lock(mdb); if (jr->JobId == 0) { - Mmsg(&mdb->cmd, "SELECT VolSessionId, VolSessionTime, \ -PoolId, StartTime, EndTime, JobFiles, JobBytes, Job \ -FROM Job WHERE Job=\"%s\"", jr->Job); + Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime," +"PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus," +"Type,Level,ClientId " +"FROM Job WHERE Job='%s'", jr->Job); } else { - Mmsg(&mdb->cmd, "SELECT VolSessionId, VolSessionTime, \ -PoolId, StartTime, EndTime, JobFiles, JobBytes, Job \ -FROM Job WHERE JobId=%d", jr->JobId); + Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime," +"PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus," +"Type,Level,ClientId " +"FROM Job WHERE JobId=%s", + edit_int64(jr->JobId, ed1)); } - if (!QUERY_DB(mdb, mdb->cmd)) { - V(mdb->mutex); - return 0; /* failed */ + if (!QUERY_DB(jcr, mdb, mdb->cmd)) { + db_unlock(mdb); + return 0; /* failed */ } if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg1(&mdb->errmsg, _("No Job found for JobId %d\n"), jr->JobId); + Mmsg1(mdb->errmsg, _("No Job found for JobId %s\n"), edit_int64(jr->JobId, ed1)); sql_free_result(mdb); - V(mdb->mutex); - return 0; /* failed */ + db_unlock(mdb); + return 0; /* failed */ } - jr->VolSessionId = atol(row[0]); - jr->VolSessionTime = atol(row[1]); - jr->PoolId = atoi(row[2]); - strcpy(jr->cStartTime, row[3]); - strcpy(jr->cEndTime, row[4]); - jr->JobFiles = atol(row[5]); - jr->JobBytes = (uint64_t)strtod(row[6], NULL); - strcpy(jr->Job, row[7]); + jr->VolSessionId = str_to_uint64(row[0]); + jr->VolSessionTime = str_to_uint64(row[1]); + jr->PoolId = str_to_int64(row[2]); + bstrncpy(jr->cStartTime, row[3]!=NULL?row[3]:"", sizeof(jr->cStartTime)); + bstrncpy(jr->cEndTime, row[4]!=NULL?row[4]:"", sizeof(jr->cEndTime)); + jr->JobFiles = str_to_int64(row[5]); + jr->JobBytes = str_to_int64(row[6]); + jr->JobTDate = str_to_int64(row[7]); + bstrncpy(jr->Job, row[8]!=NULL?row[8]:"", sizeof(jr->Job)); + jr->JobStatus = (int)*row[9]; + jr->JobType = (int)*row[10]; + jr->JobLevel = (int)*row[11]; + jr->ClientId = str_to_uint64(row[12]!=NULL?row[12]:(char *)""); sql_free_result(mdb); - V(mdb->mutex); + db_unlock(mdb); return 1; } /* - * Find VolumeNames for a give JobId + * Find VolumeNames for a given JobId * Returns: 0 on error or no Volumes found - * number of volumes on success - * Volumes are concatenated in VolumeNames - * separated by a vertical bar (|). + * number of volumes on success + * Volumes are concatenated in VolumeNames + * separated by a vertical bar (|) in the order + * that they were written. + * + * Returns: number of volumes on success */ -int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, char *VolumeNames) +int db_get_job_volume_names(JCR *jcr, B_DB *mdb, JobId_t JobId, POOLMEM **VolumeNames) { SQL_ROW row; + char ed1[50]; int stat = 0; int i; - P(mdb->mutex); - Mmsg(&mdb->cmd, -"SELECT VolumeName FROM JobMedia,Media WHERE JobMedia.JobId=%d \ -AND JobMedia.MediaId=Media.MediaId", JobId); + db_lock(mdb); + /* Get one entry per VolumeName, but "sort" by VolIndex */ + Mmsg(mdb->cmd, + "SELECT VolumeName,MAX(VolIndex) FROM JobMedia,Media WHERE " + "JobMedia.JobId=%s AND JobMedia.MediaId=Media.MediaId " + "GROUP BY VolumeName " + "ORDER BY 2 ASC", edit_int64(JobId,ed1)); Dmsg1(130, "VolNam=%s\n", mdb->cmd); - VolumeNames[0] = 0; - if (QUERY_DB(mdb, mdb->cmd)) { + *VolumeNames[0] = 0; + if (QUERY_DB(jcr, mdb, mdb->cmd)) { mdb->num_rows = sql_num_rows(mdb); Dmsg1(130, "Num rows=%d\n", mdb->num_rows); if (mdb->num_rows <= 0) { - Mmsg1(&mdb->errmsg, _("No volumes found for JobId=%d"), JobId); - stat = 0; + Mmsg1(mdb->errmsg, _("No volumes found for JobId=%d\n"), JobId); + stat = 0; } else { - stat = mdb->num_rows; - for (i=0; i < stat; i++) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg2(&mdb->errmsg, _("Error fetching row %d: ERR=%s\n"), i, sql_strerror(mdb)); - stat = 0; - break; - } else { - if (VolumeNames[0] != 0) { - strcat(VolumeNames, "|"); - } - strcat(VolumeNames, row[0]); - } - } + stat = mdb->num_rows; + for (i=0; i < stat; i++) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg2(mdb->errmsg, _("Error fetching row %d: ERR=%s\n"), i, sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + stat = 0; + break; + } else { + if (*VolumeNames[0] != 0) { + pm_strcat(VolumeNames, "|"); + } + pm_strcat(VolumeNames, row[0]); + } + } } sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("No Volume for JobId %d found in Catalog.\n"), JobId); } - V(mdb->mutex); + db_unlock(mdb); return stat; } +/* + * Find Volume parameters for a give JobId + * Returns: 0 on error or no Volumes found + * number of volumes on success + * List of Volumes and start/end file/blocks (malloced structure!) + * + * Returns: number of volumes on success + */ +int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, JobId_t JobId, VOL_PARAMS **VolParams) +{ + SQL_ROW row; + char ed1[50]; + int stat = 0; + int i; + VOL_PARAMS *Vols = NULL; + + db_lock(mdb); + Mmsg(mdb->cmd, +"SELECT VolumeName,MediaType,FirstIndex,LastIndex,StartFile," +"JobMedia.EndFile,StartBlock,JobMedia.EndBlock,Copy,Stripe" +" FROM JobMedia,Media WHERE JobMedia.JobId=%s" +" AND JobMedia.MediaId=Media.MediaId ORDER BY VolIndex,JobMediaId", + edit_int64(JobId, ed1)); -/* + Dmsg1(130, "VolNam=%s\n", mdb->cmd); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + mdb->num_rows = sql_num_rows(mdb); + Dmsg1(130, "Num rows=%d\n", mdb->num_rows); + if (mdb->num_rows <= 0) { + Mmsg1(mdb->errmsg, _("No volumes found for JobId=%d\n"), JobId); + stat = 0; + } else { + stat = mdb->num_rows; + if (stat > 0) { + *VolParams = Vols = (VOL_PARAMS *)malloc(stat * sizeof(VOL_PARAMS)); + } + for (i=0; i < stat; i++) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg2(mdb->errmsg, _("Error fetching row %d: ERR=%s\n"), i, sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + stat = 0; + break; + } else { + bstrncpy(Vols[i].VolumeName, row[0], MAX_NAME_LENGTH); + bstrncpy(Vols[i].MediaType, row[1], MAX_NAME_LENGTH); + Vols[i].FirstIndex = str_to_uint64(row[2]); + Vols[i].LastIndex = str_to_uint64(row[3]); + Vols[i].StartFile = str_to_uint64(row[4]); + Vols[i].EndFile = str_to_uint64(row[5]); + Vols[i].StartBlock = str_to_uint64(row[6]); + Vols[i].EndBlock = str_to_uint64(row[7]); +// Vols[i].Copy = str_to_uint64(row[8]); +// Vols[i].Stripe = str_to_uint64(row[9]); + } + } + } + sql_free_result(mdb); + } + db_unlock(mdb); + return stat; +} + + + +/* * Get the number of pool records * * Returns: -1 on failure - * number on success + * number on success */ -int db_get_num_pool_records(B_DB *mdb) +int db_get_num_pool_records(JCR *jcr, B_DB *mdb) { int stat = 0; - P(mdb->mutex); - Mmsg(&mdb->cmd, "SELECT count(*) from Pool"); - stat = get_sql_record_max(mdb); - V(mdb->mutex); + db_lock(mdb); + Mmsg(mdb->cmd, "SELECT count(*) from Pool"); + stat = get_sql_record_max(jcr, mdb); + db_unlock(mdb); return stat; } @@ -376,217 +452,475 @@ int db_get_num_pool_records(B_DB *mdb) * The caller must free ids if non-NULL. * * Returns 0: on failure - * 1: on success + * 1: on success + */ +int db_get_pool_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[]) +{ + SQL_ROW row; + int stat = 0; + int i = 0; + uint32_t *id; + + db_lock(mdb); + *ids = NULL; + Mmsg(mdb->cmd, "SELECT PoolId FROM Pool"); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + *num_ids = sql_num_rows(mdb); + if (*num_ids > 0) { + id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t)); + while ((row = sql_fetch_row(mdb)) != NULL) { + id[i++] = str_to_uint64(row[0]); + } + *ids = id; + } + sql_free_result(mdb); + stat = 1; + } else { + Mmsg(mdb->errmsg, _("Pool id select failed: ERR=%s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + stat = 0; + } + db_unlock(mdb); + return stat; +} + +/* + * This function returns a list of all the Client record ids. + * The caller must free ids if non-NULL. + * + * Returns 0: on failure + * 1: on success */ -int db_get_pool_ids(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[]) { SQL_ROW row; int stat = 0; int i = 0; uint32_t *id; - P(mdb->mutex); + db_lock(mdb); *ids = NULL; - Mmsg(&mdb->cmd, "SELECT PoolId FROM Pool"); - if (QUERY_DB(mdb, mdb->cmd)) { + Mmsg(mdb->cmd, "SELECT ClientId FROM Client"); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { *num_ids = sql_num_rows(mdb); if (*num_ids > 0) { - id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t)); - while ((row = sql_fetch_row(mdb)) != NULL) { - id[i++] = (uint32_t)atoi(row[0]); - } - *ids = id; + id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t)); + while ((row = sql_fetch_row(mdb)) != NULL) { + id[i++] = str_to_uint64(row[0]); + } + *ids = id; } sql_free_result(mdb); stat = 1; } else { - Mmsg(&mdb->errmsg, _("Pool id select failed: ERR=%s\n"), sql_strerror(mdb)); + Mmsg(mdb->errmsg, _("Client id select failed: ERR=%s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); stat = 0; } - V(mdb->mutex); + db_unlock(mdb); return stat; } -/* Get Pool Record + +/* Get Pool Record * If the PoolId is non-zero, we get its record, * otherwise, we search on the PoolName * + * Returns: false on failure + * true on success + */ +bool db_get_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pdbr) +{ + SQL_ROW row; + bool ok = false; + char ed1[50]; + + db_lock(mdb); + if (pdbr->PoolId != 0) { /* find by id */ + Mmsg(mdb->cmd, +"SELECT PoolId,Name,NumVols,MaxVols,UseOnce,UseCatalog,AcceptAnyVolume," +"AutoPrune,Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles," +"MaxVolBytes,PoolType,LabelType,LabelFormat FROM Pool WHERE Pool.PoolId=%s", + edit_int64(pdbr->PoolId, ed1)); + } else { /* find by name */ + Mmsg(mdb->cmd, +"SELECT PoolId,Name,NumVols,MaxVols,UseOnce,UseCatalog,AcceptAnyVolume," +"AutoPrune,Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles," +"MaxVolBytes,PoolType,LabelType,LabelFormat FROM Pool WHERE Pool.Name='%s'", + pdbr->Name); + } + + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + mdb->num_rows = sql_num_rows(mdb); + if (mdb->num_rows > 1) { + char ed1[30]; + Mmsg1(mdb->errmsg, _("More than one Pool!: %s\n"), + edit_uint64(mdb->num_rows, ed1)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + } else if (mdb->num_rows == 1) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + } else { + pdbr->PoolId = str_to_int64(row[0]); + bstrncpy(pdbr->Name, row[1]!=NULL?row[1]:"", sizeof(pdbr->Name)); + pdbr->NumVols = str_to_int64(row[2]); + pdbr->MaxVols = str_to_int64(row[3]); + pdbr->UseOnce = str_to_int64(row[4]); + pdbr->UseCatalog = str_to_int64(row[5]); + pdbr->AcceptAnyVolume = str_to_int64(row[6]); + pdbr->AutoPrune = str_to_int64(row[7]); + pdbr->Recycle = str_to_int64(row[8]); + pdbr->VolRetention = str_to_int64(row[9]); + pdbr->VolUseDuration = str_to_int64(row[10]); + pdbr->MaxVolJobs = str_to_int64(row[11]); + pdbr->MaxVolFiles = str_to_int64(row[12]); + pdbr->MaxVolBytes = str_to_uint64(row[13]); + bstrncpy(pdbr->PoolType, row[14]!=NULL?row[14]:"", sizeof(pdbr->PoolType)); + pdbr->LabelType = str_to_int64(row[15]); + bstrncpy(pdbr->LabelFormat, row[16]!=NULL?row[16]:"", sizeof(pdbr->LabelFormat)); + ok = true; + } + } + sql_free_result(mdb); + } + if (ok) { + uint32_t NumVols; + Mmsg(mdb->cmd, "SELECT count(*) from Media WHERE PoolId=%s", + edit_int64(pdbr->PoolId, ed1)); + NumVols = get_sql_record_max(jcr, mdb); + Dmsg2(400, "Actual NumVols=%d Pool NumVols=%d\n", NumVols, pdbr->NumVols); + if (NumVols != pdbr->NumVols) { + pdbr->NumVols = NumVols; + db_update_pool_record(jcr, mdb, pdbr); + } + } else { + Mmsg(mdb->errmsg, _("Pool record not found in Catalog.\n")); + } + db_unlock(mdb); + return ok; +} + +/* Get Client Record + * If the ClientId is non-zero, we get its record, + * otherwise, we search on the Client Name + * * Returns: 0 on failure - * id on success + * 1 on success */ -int db_get_pool_record(B_DB *mdb, POOL_DBR *pdbr) +int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cdbr) { SQL_ROW row; int stat = 0; + char ed1[50]; + + db_lock(mdb); + if (cdbr->ClientId != 0) { /* find by id */ + Mmsg(mdb->cmd, +"SELECT ClientId,Name,Uname,AutoPrune,FileRetention,JobRetention " +"FROM Client WHERE Client.ClientId=%s", + edit_int64(cdbr->ClientId, ed1)); + } else { /* find by name */ + Mmsg(mdb->cmd, +"SELECT ClientId,Name,Uname,AutoPrune,FileRetention,JobRetention " +"FROM Client WHERE Client.Name='%s'", cdbr->Name); + } - P(mdb->mutex); - if (pdbr->PoolId != 0) { /* find by id */ - Mmsg(&mdb->cmd, -"SELECT PoolId, Name, NumVols, MaxVols, UseOnce, UseCatalog, AcceptAnyVolume, \ -PoolType, LabelFormat FROM Pool WHERE Pool.PoolId=%d", pdbr->PoolId); - } else { /* find by name */ - Mmsg(&mdb->cmd, -"SELECT PoolId, Name, NumVols, MaxVols, UseOnce, UseCatalog, AcceptAnyVolume, \ -PoolType, LabelFormat FROM Pool WHERE Pool.Name=\"%s\"", pdbr->Name); - } - - if (QUERY_DB(mdb, mdb->cmd)) { + if (QUERY_DB(jcr, mdb, mdb->cmd)) { mdb->num_rows = sql_num_rows(mdb); if (mdb->num_rows > 1) { - char ed1[30]; - Mmsg1(&mdb->errmsg, _("More than one Pool!: %s\n"), - edit_uint64(mdb->num_rows, ed1)); - Emsg0(M_ERROR, 0, mdb->errmsg); + Mmsg1(mdb->errmsg, _("More than one Client!: %s\n"), + edit_uint64(mdb->num_rows, ed1)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); } else if (mdb->num_rows == 1) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); - Emsg0(M_ERROR, 0, mdb->errmsg); - } else { - pdbr->PoolId = atoi(row[0]); - strcpy(pdbr->Name, row[1]); - pdbr->NumVols = atoi(row[2]); - pdbr->MaxVols = atoi(row[3]); - pdbr->UseOnce = atoi(row[4]); - pdbr->UseCatalog = atoi(row[5]); - pdbr->AcceptAnyVolume = atoi(row[6]); - strcpy(pdbr->PoolType, row[7]); - if (row[8]) { - strcpy(pdbr->LabelFormat, row[8]); - } else { - pdbr->LabelFormat[0] = 0; - } - stat = pdbr->PoolId; - } + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + } else { + cdbr->ClientId = str_to_int64(row[0]); + bstrncpy(cdbr->Name, row[1]!=NULL?row[1]:"", sizeof(cdbr->Name)); + bstrncpy(cdbr->Uname, row[2]!=NULL?row[2]:"", sizeof(cdbr->Uname)); + cdbr->AutoPrune = str_to_int64(row[3]); + cdbr->FileRetention = str_to_int64(row[4]); + cdbr->JobRetention = str_to_int64(row[5]); + stat = 1; + } + } else { + Mmsg(mdb->errmsg, _("Client record not found in Catalog.\n")); + } + sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("Client record not found in Catalog.\n")); + } + db_unlock(mdb); + return stat; +} + +/* + * Get Counter Record + * + * Returns: 0 on failure + * 1 on success + */ +int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr) +{ + SQL_ROW row; + + db_lock(mdb); + Mmsg(mdb->cmd, "SELECT MinValue,MaxValue,CurrentValue,WrapCounter " + "FROM Counters WHERE Counter='%s'", cr->Counter); + + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + mdb->num_rows = sql_num_rows(mdb); + + /* If more than one, report error, but return first row */ + if (mdb->num_rows > 1) { + Mmsg1(mdb->errmsg, _("More than one Counter!: %d\n"), (int)(mdb->num_rows)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + } + if (mdb->num_rows >= 1) { + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching Counter row: %s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + sql_free_result(mdb); + db_unlock(mdb); + return 0; + } + cr->MinValue = str_to_int64(row[0]); + cr->MaxValue = str_to_int64(row[1]); + cr->CurrentValue = str_to_int64(row[2]); + if (row[3]) { + bstrncpy(cr->WrapCounter, row[3], sizeof(cr->WrapCounter)); + } else { + cr->WrapCounter[0] = 0; + } + sql_free_result(mdb); + db_unlock(mdb); + return 1; } sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("Counter record: %s not found in Catalog.\n"), cr->Counter); } - V(mdb->mutex); + db_unlock(mdb); + return 0; +} + + +/* Get FileSet Record + * If the FileSetId is non-zero, we get its record, + * otherwise, we search on the name + * + * Returns: 0 on failure + * id on success + */ +int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr) +{ + SQL_ROW row; + int stat = 0; + char ed1[50]; + + db_lock(mdb); + if (fsr->FileSetId != 0) { /* find by id */ + Mmsg(mdb->cmd, + "SELECT FileSetId,FileSet,MD5,CreateTime FROM FileSet " + "WHERE FileSetId=%s", + edit_int64(fsr->FileSetId, ed1)); + } else { /* find by name */ + Mmsg(mdb->cmd, + "SELECT FileSetId,FileSet,MD5,CreateTime FROM FileSet " + "WHERE FileSet='%s' ORDER BY CreateTime DESC LIMIT 1", fsr->FileSet); + } + + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + mdb->num_rows = sql_num_rows(mdb); + if (mdb->num_rows > 1) { + char ed1[30]; + Mmsg1(mdb->errmsg, _("Error got %s FileSets but expected only one!\n"), + edit_uint64(mdb->num_rows, ed1)); + sql_data_seek(mdb, mdb->num_rows-1); + } + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("FileSet record \"%s\" not found.\n"), fsr->FileSet); + } else { + fsr->FileSetId = str_to_int64(row[0]); + bstrncpy(fsr->FileSet, row[1]!=NULL?row[1]:"", sizeof(fsr->FileSet)); + bstrncpy(fsr->MD5, row[2]!=NULL?row[2]:"", sizeof(fsr->MD5)); + bstrncpy(fsr->cCreateTime, row[3]!=NULL?row[3]:"", sizeof(fsr->cCreateTime)); + stat = fsr->FileSetId; + } + sql_free_result(mdb); + } else { + Mmsg(mdb->errmsg, _("FileSet record not found in Catalog.\n")); + } + db_unlock(mdb); return stat; } -/* +/* * Get the number of Media records * * Returns: -1 on failure - * number on success + * number on success */ -int db_get_num_media_records(B_DB *mdb) +int db_get_num_media_records(JCR *jcr, B_DB *mdb) { int stat = 0; - P(mdb->mutex); - Mmsg(&mdb->cmd, "SELECT count(*) from Media"); - stat = get_sql_record_max(mdb); - V(mdb->mutex); + db_lock(mdb); + Mmsg(mdb->cmd, "SELECT count(*) from Media"); + stat = get_sql_record_max(jcr, mdb); + db_unlock(mdb); return stat; } /* - * This function returns a list of all the Media record ids. + * This function returns a list of all the Media record ids for + * the current Pool. * The caller must free ids if non-NULL. * * Returns 0: on failure - * 1: on success + * 1: on success */ -int db_get_media_ids(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[]) { SQL_ROW row; int stat = 0; int i = 0; uint32_t *id; + char ed1[50]; - P(mdb->mutex); + db_lock(mdb); *ids = NULL; - Mmsg(&mdb->cmd, "SELECT MediaId FROM Media"); - if (QUERY_DB(mdb, mdb->cmd)) { + Mmsg(mdb->cmd, "SELECT MediaId FROM Media WHERE PoolId=%s", + edit_int64(PoolId, ed1)); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { *num_ids = sql_num_rows(mdb); if (*num_ids > 0) { - id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t)); - while ((row = sql_fetch_row(mdb)) != NULL) { - id[i++] = (uint32_t)atoi(row[0]); - } - *ids = id; + id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t)); + while ((row = sql_fetch_row(mdb)) != NULL) { + id[i++] = str_to_uint64(row[0]); + } + *ids = id; } sql_free_result(mdb); stat = 1; } else { - Mmsg(&mdb->errmsg, _("Media id select failed: ERR=%s\n"), sql_strerror(mdb)); + Mmsg(mdb->errmsg, _("Media id select failed: ERR=%s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); stat = 0; } - V(mdb->mutex); + db_unlock(mdb); return stat; } -/* Get Media Record +/* Get Media Record * * Returns: 0 on failure - * id on success + * id on success */ -int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr) +int db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) { SQL_ROW row; int stat = 0; + char ed1[50]; - P(mdb->mutex); + db_lock(mdb); if (mr->MediaId == 0 && mr->VolumeName[0] == 0) { - Mmsg(&mdb->cmd, "SELECT count(*) from Media"); - mr->MediaId = get_sql_record_max(mdb); - V(mdb->mutex); + Mmsg(mdb->cmd, "SELECT count(*) from Media"); + mr->MediaId = get_sql_record_max(jcr, mdb); + db_unlock(mdb); return 1; } - if (mr->MediaId != 0) { /* find by id */ - Mmsg(&mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks,\ -VolBytes,VolMounts,VolErrors,VolWrites,VolMaxBytes,VolCapacityBytes,\ -MediaType,VolStatus,PoolId \ -FROM Media WHERE MediaId=%d", mr->MediaId); - } else { /* find by name */ - Mmsg(&mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks,\ -VolBytes,VolMounts,VolErrors,VolWrites,VolMaxBytes,VolCapacityBytes,\ -MediaType,VolStatus,PoolId \ -FROM Media WHERE VolumeName=\"%s\"", mr->VolumeName); - } - - if (QUERY_DB(mdb, mdb->cmd)) { + if (mr->MediaId != 0) { /* find by id */ + Mmsg(mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks," + "VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes," + "MediaType,VolStatus,PoolId,VolRetention,VolUseDuration,MaxVolJobs," + "MaxVolFiles,Recycle,Slot,FirstWritten,LastWritten,InChanger," + "EndFile,EndBlock,VolParts,LabelType,LabelDate,StorageId " + "FROM Media WHERE MediaId=%s", + edit_int64(mr->MediaId, ed1)); + } else { /* find by name */ + Mmsg(mdb->cmd, "SELECT MediaId,VolumeName,VolJobs,VolFiles,VolBlocks," + "VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes," + "MediaType,VolStatus,PoolId,VolRetention,VolUseDuration,MaxVolJobs," + "MaxVolFiles,Recycle,Slot,FirstWritten,LastWritten,InChanger," + "EndFile,EndBlock,VolParts,LabelType,LabelDate,StorageId " + "FROM Media WHERE VolumeName='%s'", mr->VolumeName); + } + + if (QUERY_DB(jcr, mdb, mdb->cmd)) { + char ed1[50]; mdb->num_rows = sql_num_rows(mdb); if (mdb->num_rows > 1) { - char ed1[30]; - Mmsg1(&mdb->errmsg, _("More than one Volume!: %s\n"), - edit_uint64(mdb->num_rows, ed1)); - Emsg0(M_ERROR, 0, mdb->errmsg); + Mmsg1(mdb->errmsg, _("More than one Volume!: %s\n"), + edit_uint64(mdb->num_rows, ed1)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); } else if (mdb->num_rows == 1) { - if ((row = sql_fetch_row(mdb)) == NULL) { - Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); - Emsg0(M_ERROR, 0, mdb->errmsg); - } else { - /* return values */ - mr->MediaId = atoi(row[0]); - strcpy(mr->VolumeName, row[1]); - mr->VolJobs = atoi(row[2]); - mr->VolFiles = atoi(row[3]); - mr->VolBlocks = atoi(row[4]); - mr->VolBytes = (uint64_t)strtod(row[5], NULL); - mr->VolMounts = atoi(row[6]); - mr->VolErrors = atoi(row[7]); - mr->VolWrites = atoi(row[8]); - mr->VolMaxBytes = (uint64_t)strtod(row[9], NULL); - mr->VolCapacityBytes = (uint64_t)strtod(row[10], NULL); - strcpy(mr->MediaType, row[11]); - strcpy(mr->VolStatus, row[12]); - mr->PoolId = atoi(row[13]); - stat = mr->MediaId; - } + if ((row = sql_fetch_row(mdb)) == NULL) { + Mmsg1(mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb)); + Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg); + } else { + /* return values */ + mr->MediaId = str_to_int64(row[0]); + bstrncpy(mr->VolumeName, row[1]!=NULL?row[1]:"", sizeof(mr->VolumeName)); + mr->VolJobs = str_to_int64(row[2]); + mr->VolFiles = str_to_int64(row[3]); + mr->VolBlocks = str_to_int64(row[4]); + mr->VolBytes = str_to_uint64(row[5]); + mr->VolMounts = str_to_int64(row[6]); + mr->VolErrors = str_to_int64(row[7]); + mr->VolWrites = str_to_int64(row[8]); + mr->MaxVolBytes = str_to_uint64(row[9]); + mr->VolCapacityBytes = str_to_uint64(row[10]); + bstrncpy(mr->MediaType, row[11]!=NULL?row[11]:"", sizeof(mr->MediaType)); + bstrncpy(mr->VolStatus, row[12]!=NULL?row[12]:"", sizeof(mr->VolStatus)); + mr->PoolId = str_to_int64(row[13]); + mr->VolRetention = str_to_uint64(row[14]); + mr->VolUseDuration = str_to_uint64(row[15]); + mr->MaxVolJobs = str_to_int64(row[16]); + mr->MaxVolFiles = str_to_int64(row[17]); + mr->Recycle = str_to_int64(row[18]); + mr->Slot = str_to_int64(row[19]); + bstrncpy(mr->cFirstWritten, row[20]!=NULL?row[20]:"", sizeof(mr->cFirstWritten)); + mr->FirstWritten = (time_t)str_to_utime(mr->cFirstWritten); + bstrncpy(mr->cLastWritten, row[21]!=NULL?row[21]:"", sizeof(mr->cLastWritten)); + mr->LastWritten = (time_t)str_to_utime(mr->cLastWritten); + mr->InChanger = str_to_uint64(row[22]); + mr->EndFile = str_to_uint64(row[23]); + mr->EndBlock = str_to_uint64(row[24]); + mr->VolParts = str_to_int64(row[25]); + mr->LabelType = str_to_int64(row[26]); + bstrncpy(mr->cLabelDate, row[27]!=NULL?row[27]:"", sizeof(mr->cLabelDate)); + mr->LabelDate = (time_t)str_to_utime(mr->cLabelDate); + mr->StorageId = str_to_int64(row[28]); + stat = mr->MediaId; + } } else { - Mmsg0(&mdb->errmsg, _("Media record not found.\n")); + if (mr->MediaId != 0) { + Mmsg1(mdb->errmsg, _("Media record MediaId=%s not found.\n"), + edit_int64(mr->MediaId, ed1)); + } else { + Mmsg1(mdb->errmsg, _("Media record for Volume \"%s\" not found.\n"), + mr->VolumeName); + } } sql_free_result(mdb); - } - V(mdb->mutex); + } else { + if (mr->MediaId != 0) { + Mmsg(mdb->errmsg, _("Media record for MediaId=%u not found in Catalog.\n"), + mr->MediaId); + } else { + Mmsg(mdb->errmsg, _("Media record for Vol=%s not found in Catalog.\n"), + mr->VolumeName); + } } + db_unlock(mdb); return stat; } -#endif /* HAVE_MYSQL || HAVE_SQLITE */ +#endif /* HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL*/