*/
-/* *****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.
*/
*/
/* Forward referenced subroutines */
-static int db_create_file_record(B_DB *mdb, ATTR_DBR *ar);
-static int db_create_filename_record(B_DB *mdb, ATTR_DBR *ar);
-static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar);
+static int db_create_file_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar);
+static int db_create_filename_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar);
+static int db_create_path_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar);
/* Imported subroutines */
extern void print_dashes(B_DB *mdb);
extern void print_result(B_DB *mdb);
-extern int QueryDB(char *file, int line, B_DB *db, char *select_cmd);
-extern int InsertDB(char *file, int line, B_DB *db, char *select_cmd);
-extern void split_path_and_filename(B_DB *mdb, char *fname);
+extern int QueryDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
+extern int InsertDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
+extern void split_path_and_filename(JCR *jcr, B_DB *mdb, char *fname);
/* Create a new record for the Job
* 1 on success
*/
int
-db_create_job_record(B_DB *mdb, JOB_DBR *jr)
+db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
{
char dt[MAX_TIME_LENGTH];
time_t stime;
utime_t JobTDate;
char ed1[30];
+ db_lock(mdb);
+
stime = jr->SchedTime;
+ ASSERT(stime != 0);
localtime_r(&stime, &tm);
strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
JobTDate = (utime_t)stime;
- db_lock(mdb);
- if (!db_next_index(mdb, "Job", JobId)) {
+ if (!db_next_index(jcr, mdb, "Job", JobId)) {
jr->JobId = 0;
db_unlock(mdb);
return 0;
JobId, jr->Job, jr->Name, (char)(jr->Type), (char)(jr->Level),
(char)(jr->JobStatus), dt, edit_uint64(JobTDate, ed1));
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB Job record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
jr->JobId = 0;
* 1 on success
*/
int
-db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
+db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
{
int stat;
+ int count;
db_lock(mdb);
+#ifdef not_used_in_new_code
Mmsg(&mdb->cmd, "SELECT JobId, MediaId FROM JobMedia WHERE \
JobId=%d AND MediaId=%d", jm->JobId, jm->MediaId);
Dmsg0(30, mdb->cmd);
- if (QUERY_DB(mdb, mdb->cmd)) {
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
if (mdb->num_rows > 0) {
Mmsg0(&mdb->errmsg, _("Create JobMedia failed. Record already exists.\n"));
}
sql_free_result(mdb);
}
+#endif
+
+ /* Now get count for VolIndex */
+ Mmsg(&mdb->cmd, "SELECT count(*) from JobMedia");
+ count = get_sql_record_max(jcr, mdb);
+ if (count < 0) {
+ count = 0;
+ }
+ count++;
/* Must create it */
Mmsg(&mdb->cmd,
"INSERT INTO JobMedia (JobId,MediaId,FirstIndex,LastIndex,\
-StartFile,EndFile,StartBlock,EndBlock) \
-VALUES (%u,%u,%u,%u,%u,%u,%u,%u)",
+StartFile,EndFile,StartBlock,EndBlock,VolIndex) \
+VALUES (%u,%u,%u,%u,%u,%u,%u,%u,%u)",
jm->JobId, jm->MediaId, jm->FirstIndex, jm->LastIndex,
- jm->StartFile, jm->EndFile, jm->StartBlock, jm->EndBlock);
+ jm->StartFile, jm->EndFile, jm->StartBlock, jm->EndBlock,count);
Dmsg0(30, mdb->cmd);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db JobMedia record %s failed. ERR=%s\n"), mdb->cmd,
sql_strerror(mdb));
stat = 0;
* 1 on success
*/
int
-db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
+db_create_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
{
int stat;
char ed1[30], ed2[30], ed3[50];
Mmsg(&mdb->cmd, "SELECT PoolId,Name FROM Pool WHERE Name='%s'", pr->Name);
Dmsg1(200, "selectpool: %s\n", mdb->cmd);
- if (QUERY_DB(mdb, mdb->cmd)) {
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
edit_uint64(pr->MaxVolBytes, ed3),
pr->PoolType, pr->LabelFormat);
Dmsg1(200, "Create Pool: %s\n", mdb->cmd);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db Pool record %s failed: ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
pr->PoolId = 0;
* 1 on success
*/
int
-db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
+db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
{
int stat;
char ed1[30], ed2[30], ed3[30], ed4[30];
+ char dt[MAX_TIME_LENGTH];
+ struct tm tm;
db_lock(mdb);
Mmsg(&mdb->cmd, "SELECT MediaId FROM Media WHERE VolumeName='%s'",
mr->VolumeName);
Dmsg1(110, "selectpool: %s\n", mdb->cmd);
- if (QUERY_DB(mdb, mdb->cmd)) {
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
if (mdb->num_rows > 0) {
- Mmsg1(&mdb->errmsg, _("Media record %s already exists\n"), mr->VolumeName);
+ Mmsg1(&mdb->errmsg, _("Volume \"%s\" already exists\n."), mr->VolumeName);
sql_free_result(mdb);
db_unlock(mdb);
return 0;
}
/* Must create it */
+ if (mr->LabelDate) {
+ localtime_r(&mr->LabelDate, &tm);
+ strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
+ } else {
+ strcpy(dt, "0000-00-00 00:00:00");
+ }
Mmsg(&mdb->cmd,
"INSERT INTO Media (VolumeName,MediaType,PoolId,MaxVolBytes,VolCapacityBytes,"
-"Recycle,VolRetention,VolUseDuration,VolStatus,Slot) "
-"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,'%s',%d)",
+"Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,"
+"VolStatus,LabelDate,Slot) "
+"VALUES ('%s','%s',%u,%s,%s,%d,%s,%s,%u,%u,'%s','%s',%d)",
mr->VolumeName,
mr->MediaType, mr->PoolId,
edit_uint64(mr->MaxVolBytes,ed1),
mr->Recycle,
edit_uint64(mr->VolRetention, ed3),
edit_uint64(mr->VolUseDuration, ed4),
- mr->VolStatus,
+ mr->MaxVolJobs,
+ mr->MaxVolFiles,
+ mr->VolStatus, dt,
mr->Slot);
Dmsg1(500, "Create Volume: %s\n", mdb->cmd);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB Media record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
stat = 0;
* Returns: 0 on failure
* 1 on success with id in cr->ClientId
*/
-int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
+int db_create_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
{
SQL_ROW row;
int stat;
Mmsg(&mdb->cmd, "SELECT ClientId,Uname FROM Client WHERE Name='%s'", cr->Name);
cr->ClientId = 0;
- if (QUERY_DB(mdb, mdb->cmd)) {
+ 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 Client!: %d\n"), (int)(mdb->num_rows));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ 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 Client row: %s\n"), sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
db_unlock(mdb);
return 0;
}
cr->ClientId = atoi(row[0]);
if (row[1]) {
- strncpy(cr->Uname, row[1], sizeof(cr->Uname)-2);
- cr->Uname[sizeof(cr->Uname)-1] = 0;
+ bstrncpy(cr->Uname, row[1], sizeof(cr->Uname));
} else {
cr->Uname[0] = 0; /* no name */
}
edit_uint64(cr->FileRetention, ed1),
edit_uint64(cr->JobRetention, ed2));
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB Client record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
cr->ClientId = 0;
stat = 0;
} else {
}
+/*
+ * Create a Unique record for the counter -- no duplicates
+ * Returns: 0 on failure
+ * 1 on success with counter filled in
+ */
+int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+{
+ COUNTER_DBR mcr;
+ int stat;
+
+ db_lock(mdb);
+ memset(&mcr, 0, sizeof(mcr));
+ bstrncpy(mcr.Counter, cr->Counter, sizeof(mcr.Counter));
+ if (db_get_counter_record(jcr, mdb, &mcr)) {
+ memcpy(cr, &mcr, sizeof(COUNTER_DBR));
+ db_unlock(mdb);
+ return 1;
+ }
+
+ /* Must create it */
+ Mmsg(&mdb->cmd, "INSERT INTO Counters (Counter,MinValue,MaxValue,CurrentValue,"
+ "WrapCounter) VALUES ('%s','%d','%d','%d','%s')",
+ cr->Counter, cr->MinValue, cr->MaxValue, cr->CurrentValue,
+ cr->WrapCounter);
+
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
+ Mmsg2(&mdb->errmsg, _("Create DB Counters record %s failed. ERR=%s\n"),
+ mdb->cmd, sql_strerror(mdb));
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ stat = 0;
+ } else {
+ stat = 1;
+ }
+ db_unlock(mdb);
+ return stat;
+}
+
+
/*
* Create a FileSet record. This record is unique in the
* name and the MD5 signature of the include/exclude sets.
* Returns: 0 on failure
* 1 on success with FileSetId in record
*/
-int db_create_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
+int db_create_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
{
SQL_ROW row;
int stat;
+ struct tm tm;
db_lock(mdb);
- Mmsg(&mdb->cmd, "SELECT FileSetId FROM FileSet WHERE \
-FileSet='%s' and MD5='%s'", fsr->FileSet, fsr->MD5);
+ fsr->created = false;
+ Mmsg(&mdb->cmd, "SELECT FileSetId,CreateTime FROM FileSet WHERE "
+"FileSet='%s' AND MD5='%s'", fsr->FileSet, fsr->MD5);
fsr->FileSetId = 0;
- 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) {
Mmsg1(&mdb->errmsg, _("More than one FileSet!: %d\n"), (int)(mdb->num_rows));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ 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 FileSet row: ERR=%s\n"), sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
db_unlock(mdb);
return 0;
}
fsr->FileSetId = atoi(row[0]);
+ if (row[1] == NULL) {
+ fsr->cCreateTime[0] = 0;
+ } else {
+ bstrncpy(fsr->cCreateTime, row[1], sizeof(fsr->cCreateTime));
+ }
sql_free_result(mdb);
db_unlock(mdb);
return 1;
sql_free_result(mdb);
}
+ if (fsr->CreateTime == 0 && fsr->cCreateTime[0] == 0) {
+ fsr->CreateTime = time(NULL);
+ }
+ localtime_r(&fsr->CreateTime, &tm);
+ strftime(fsr->cCreateTime, sizeof(fsr->cCreateTime), "%Y-%m-%d %T", &tm);
+
/* Must create it */
- Mmsg(&mdb->cmd, "INSERT INTO FileSet (FileSet, MD5) VALUES \
-('%s', '%s')", fsr->FileSet, fsr->MD5);
+ Mmsg(&mdb->cmd, "INSERT INTO FileSet (FileSet,MD5,CreateTime) "
+"VALUES ('%s','%s','%s')", fsr->FileSet, fsr->MD5, fsr->cCreateTime);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create DB FileSet record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
fsr->FileSetId = 0;
stat = 0;
} else {
fsr->FileSetId = sql_insert_id(mdb);
+ fsr->created = true;
stat = 1;
}
* how many times it occurs. This is this subroutine, we separate
* the file and the path and create three database records.
*/
-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)
{
Dmsg1(100, "Fname=%s\n", ar->fname);
/*
* Make sure we have an acceptable attributes record.
*/
- if (!(ar->Stream == STREAM_UNIX_ATTRIBUTES || ar->Stream == STREAM_WIN32_ATTRIBUTES)) {
+ if (!(ar->Stream == STREAM_UNIX_ATTRIBUTES ||
+ ar->Stream == STREAM_UNIX_ATTRIBUTES_EX)) {
Mmsg0(&mdb->errmsg, _("Attempt to put non-attributes into catalog\n"));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
return 0;
}
db_lock(mdb);
- split_path_and_filename(mdb, ar->fname);
+ split_path_and_filename(jcr, mdb, ar->fname);
- if (!db_create_filename_record(mdb, ar)) {
+ if (!db_create_filename_record(jcr, mdb, ar)) {
db_unlock(mdb);
return 0;
}
- Dmsg1(100, "db_create_filename_record: %s\n", mdb->esc_name);
+ Dmsg1(500, "db_create_filename_record: %s\n", mdb->esc_name);
- if (!db_create_path_record(mdb, ar)) {
+ if (!db_create_path_record(jcr, mdb, ar)) {
db_unlock(mdb);
return 0;
}
- Dmsg1(100, "db_create_path_record\n", mdb->esc_name);
+ Dmsg1(500, "db_create_path_record: %s\n", mdb->esc_name);
/* Now create master File record */
- if (!db_create_file_record(mdb, ar)) {
+ if (!db_create_file_record(jcr, mdb, ar)) {
db_unlock(mdb);
return 0;
}
- Dmsg0(50, "db_create_file_record\n");
+ Dmsg0(500, "db_create_file_record OK\n");
- Dmsg3(100, "Path=%s File=%s FilenameId=%d\n", mdb->path, mdb->fname, ar->FilenameId);
+ Dmsg3(100, "CreateAttributes Path=%s File=%s FilenameId=%d\n", mdb->path, mdb->fname, ar->FilenameId);
db_unlock(mdb);
return 1;
}
* This is the master File entry containing the attributes.
* The filename and path records have already been created.
*/
-static int db_create_file_record(B_DB *mdb, ATTR_DBR *ar)
+static int db_create_file_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
{
int stat;
/* Must create it */
Mmsg(&mdb->cmd,
-"INSERT INTO File (FileIndex, JobId, PathId, FilenameId, \
-LStat, MD5) VALUES (%u, %u, %u, %u, '%s', '0')",
+"INSERT INTO File (FileIndex,JobId,PathId,FilenameId,"
+"LStat,MD5) VALUES (%u,%u,%u,%u,'%s','0')",
ar->FileIndex, ar->JobId, ar->PathId, ar->FilenameId,
ar->attr);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db File record %s failed. ERR=%s"),
mdb->cmd, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FileId = 0;
stat = 0;
} else {
}
/* Create a Unique record for the Path -- no duplicates */
-static int db_create_path_record(B_DB *mdb, ATTR_DBR *ar)
+static int db_create_path_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
{
SQL_ROW row;
int stat;
- mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->pnl+1);
+ 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 (mdb->cached_path_id != 0 && mdb->cached_path_len == mdb->pnl &&
strcmp(mdb->cached_path, mdb->path) == 0) {
ar->PathId = mdb->cached_path_id;
- ASSERT(ar->PathId);
return 1;
}
- Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path='%s'", mdb->path);
-
- if (QUERY_DB(mdb, mdb->cmd)) {
+ Mmsg(&mdb->cmd, "SELECT PathId FROM Path WHERE Path='%s'", mdb->esc_name);
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
-
if (mdb->num_rows > 1) {
char ed1[30];
- Mmsg2(&mdb->errmsg, _("More than one Path!: %s for Path=%s\n"),
+ Mmsg2(&mdb->errmsg, _("More than one Path!: %s for path: %s\n"),
edit_uint64(mdb->num_rows, ed1), mdb->path);
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ 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));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
sql_free_result(mdb);
ar->PathId = 0;
ASSERT(ar->PathId);
sql_free_result(mdb);
}
- Mmsg(&mdb->cmd, "INSERT INTO Path (Path) VALUES ('%s')", mdb->path);
+ Mmsg(&mdb->cmd, "INSERT INTO Path (Path) VALUES ('%s')", mdb->esc_name);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db Path record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->PathId = 0;
stat = 0;
} else {
}
/* Cache path */
- if (ar->PathId != mdb->cached_path_id) {
+ if (stat && ar->PathId != mdb->cached_path_id) {
mdb->cached_path_id = ar->PathId;
mdb->cached_path_len = mdb->pnl;
pm_strcpy(&mdb->cached_path, mdb->path);
}
- ASSERT(ar->PathId);
return stat;
}
/* Create a Unique record for the filename -- no duplicates */
-static int db_create_filename_record(B_DB *mdb, ATTR_DBR *ar)
+static int db_create_filename_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
{
SQL_ROW row;
-
- mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl+1);
+ 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(mdb, mdb->cmd)) {
+ if (QUERY_DB(jcr, mdb, mdb->cmd)) {
mdb->num_rows = sql_num_rows(mdb);
if (mdb->num_rows > 1) {
- Mmsg2(&mdb->errmsg, _("More than one Filename!: %d File=%s\n"),
- (int)(mdb->num_rows), mdb->esc_name);
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ char ed1[30];
+ 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) {
- Mmsg2(&mdb->errmsg, _("error fetching row for file=%s: ERR=%s\n"),
+ Mmsg2(&mdb->errmsg, _("Error fetching row for file=%s: ERR=%s\n"),
mdb->fname, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FilenameId = 0;
} else {
ar->FilenameId = atoi(row[0]);
sql_free_result(mdb);
}
- Mmsg(&mdb->cmd, "INSERT INTO Filename (Name) \
-VALUES ('%s')", mdb->fname);
+ Mmsg(&mdb->cmd, "INSERT INTO Filename (Name) VALUES ('%s')", mdb->esc_name);
- if (!INSERT_DB(mdb, mdb->cmd)) {
+ if (!INSERT_DB(jcr, mdb, mdb->cmd)) {
Mmsg2(&mdb->errmsg, _("Create db Filename record %s failed. ERR=%s\n"),
mdb->cmd, sql_strerror(mdb));
- Jmsg(mdb->jcr, M_ERROR, 0, "%s", mdb->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", mdb->errmsg);
ar->FilenameId = 0;
} else {
ar->FilenameId = sql_insert_id(mdb);
}
-
return ar->FilenameId > 0;
}
projects / bacula / bacula / blobdiff