ua->error_msg("%s", db_strerror(ua->db));
} else {
ua->info_msg(_("New Recycle flag is: %s\n"),
- mr->Recycle==1?_("yes"):_("no"));
+ recycle==1?_("yes"):_("no"));
}
}
ua->error_msg("%s", db_strerror(ua->db));
} else {
ua->info_msg(_("New InChanger flag is: %s\n"),
- mr->InChanger==1?_("yes"):_("no"));
+ InChanger==1?_("yes"):_("no"));
}
}
void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr)
{
POOL_DBR pr;
- POOLMEM *query;
+ POOL_MEM query(PM_MESSAGE);
char ed1[50], ed2[50];
memset(&pr, 0, sizeof(pr));
mr->PoolId = pr.PoolId; /* set new PoolId */
/*
*/
- query = get_pool_memory(PM_MESSAGE);
db_lock(ua->db);
Mmsg(query, "UPDATE Media SET PoolId=%s WHERE MediaId=%s",
- edit_int64(mr->PoolId, ed1),
- edit_int64(mr->MediaId, ed2));
- if (!db_sql_query(ua->db, query, NULL, NULL)) {
+ edit_int64(mr->PoolId, ed1), edit_int64(mr->MediaId, ed2));
+ if (!db_sql_query(ua->db, query.c_str(), NULL, NULL)) {
ua->error_msg("%s", db_strerror(ua->db));
} else {
ua->info_msg(_("New Pool is: %s\n"), pr.Name);
}
}
db_unlock(ua->db);
- free_pool_memory(query);
}
/* Modify the RecyclePool of a Volume */
void update_vol_recyclepool(UAContext *ua, char *val, MEDIA_DBR *mr)
{
POOL_DBR pr;
- POOLMEM *query;
+ POOL_MEM query(PM_MESSAGE);
char ed1[50], ed2[50];
memset(&pr, 0, sizeof(pr));
/* pool = select_pool_resource(ua); */
mr->RecyclePoolId = pr.PoolId; /* get the PoolId */
- query = get_pool_memory(PM_MESSAGE);
db_lock(ua->db);
Mmsg(query, "UPDATE Media SET RecyclePoolId=%s WHERE MediaId=%s",
- edit_int64(mr->RecyclePoolId, ed1),
- edit_int64(mr->MediaId, ed2));
- if (!db_sql_query(ua->db, query, NULL, NULL)) {
+ edit_int64(mr->RecyclePoolId, ed1), edit_int64(mr->MediaId, ed2));
+ if (!db_sql_query(ua->db, query.c_str(), NULL, NULL)) {
ua->error_msg("%s", db_strerror(ua->db));
} else {
ua->info_msg(_("New RecyclePool is: %s\n"), pr.Name);
}
db_unlock(ua->db);
- free_pool_memory(query);
}
/*
POOL *pool;
POOL_DBR pr;
POOLMEM *query;
+ char buf[1000];
char ed1[130];
bool done = false;
int i;
case 8: /* InChanger */
ua->info_msg(_("Current InChanger flag is: %d\n"), mr.InChanger);
- if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) {
+ bsnprintf(buf, sizeof(buf), _("Set InChanger flag for Volume \"%s\": yes/no: "),
+ mr.VolumeName);
+ if (!get_yesno(ua, buf)) {
return 0;
}
mr.InChanger = ua->pint32_val;
VolFiles = ua->pint32_val;
if (VolFiles != (int)(mr.VolFiles + 1)) {
ua->warning_msg(_("Normally, you should only increase Volume Files by one!\n"));
- if (!get_yesno(ua, _("Continue? (yes/no): ")) || ua->pint32_val == 0) {
+ if (!get_yesno(ua, _("Increase Volume Files? (yes/no): ")) || ua->pint32_val == 0) {
break;
}
}