#include "bacula.h"
#include "dird.h"
+/* Forward referenced functions */
+static int create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr);
+static int perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr);
+
+
/*
- * Really crude automatic Volume name creation using
- * LabelFormat. We assume that if this routine is being
- * called the Volume will be labeled, so we set the LabelDate.
+ * Automatic Volume name creation using the LabelFormat
*/
int newVolume(JCR *jcr, MEDIA_DBR *mr)
{
POOL_DBR pr;
- char name[MAXSTRING];
- char num[20];
memset(&pr, 0, sizeof(pr));
if (db_get_pool_record(jcr, jcr->db, &pr) && pr.LabelFormat[0] &&
pr.LabelFormat[0] != '*') {
if (pr.MaxVols == 0 || pr.NumVols < pr.MaxVols) {
+ memset(mr, 0, sizeof(MEDIA_DBR));
set_pool_dbr_defaults_in_media_dbr(mr, &pr);
- mr->LabelDate = time(NULL);
bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType));
- bstrncpy(name, pr.LabelFormat, sizeof(name));
- if (strchr(name, (int)'%') != NULL) {
- db_unlock(jcr->db);
- Jmsg(jcr, M_ERROR, 0, _("Illegal character in Label Format\n"));
- return 0;
+ /* Check for special characters */
+ if (is_volume_name_legal(NULL, pr.LabelFormat)) {
+ /* No special characters, so apply simple algorithm */
+ if (!create_simple_name(jcr, mr, &pr)) {
+ goto bail_out;
+ }
+ } else { /* try full substitution */
+ /* Found special characters, so try substitution */
+ if (!perform_full_name_substitution(jcr, mr, &pr)) {
+ goto bail_out;
+ }
+ if (!is_volume_name_legal(NULL, mr->VolumeName)) {
+ Jmsg(jcr, M_ERROR, 0, _("Illegal character in Volume name \"%s\"\n"),
+ mr->VolumeName);
+ goto bail_out;
+ }
}
- sprintf(num, "%04d", ++pr.NumVols);
- bstrncpy(mr->VolumeName, name, sizeof(mr->VolumeName));
- bstrncat(mr->VolumeName, num, sizeof(mr->VolumeName));
+ pr.NumVols++;
if (db_create_media_record(jcr, jcr->db, mr) &&
db_update_pool_record(jcr, jcr->db, &pr)) {
db_unlock(jcr->db);
+ Jmsg(jcr, M_INFO, 0, _("Created new Volume \"%s\" in catalog.\n"), mr->VolumeName);
Dmsg1(90, "Created new Volume=%s\n", mr->VolumeName);
return 1;
} else {
}
}
}
+bail_out:
db_unlock(jcr->db);
return 0;
}
+
+static int create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)
+{
+ char name[MAXSTRING];
+ char num[20];
+
+ /* See if volume already exists */
+ mr->VolumeName[0] = 0;
+ bstrncpy(name, pr->LabelFormat, sizeof(name));
+ for (int i=pr->NumVols+1; i<(int)pr->NumVols+11; i++) {
+ MEDIA_DBR tmr;
+ memset(&tmr, 0, sizeof(tmr));
+ sprintf(num, "%04d", i);
+ bstrncpy(tmr.VolumeName, name, sizeof(tmr.VolumeName));
+ bstrncat(tmr.VolumeName, num, sizeof(tmr.VolumeName));
+ if (db_get_media_record(jcr, jcr->db, &tmr)) {
+ Jmsg(jcr, M_WARNING, 0,
+ _("Wanted to create Volume \"%s\", but it already exists. Trying again.\n"),
+ tmr.VolumeName);
+ continue;
+ }
+ bstrncpy(mr->VolumeName, name, sizeof(mr->VolumeName));
+ bstrncat(mr->VolumeName, num, sizeof(mr->VolumeName));
+ break; /* Got good name */
+ }
+ if (mr->VolumeName[0] == 0) {
+ Jmsg(jcr, M_ERROR, 0, _("Too many failures. Giving up creating Volume name.\n"));
+ return 0;
+ }
+ return 1;
+}
+
+/*
+ * Perform full substitution on Label
+ */
+static int perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)
+{
+ int stat = 0;
+ POOLMEM *label = get_pool_memory(PM_FNAME);
+ jcr->NumVols = pr->NumVols;
+ if (variable_expansion(jcr, pr->LabelFormat, &label)) {
+ bstrncpy(mr->VolumeName, label, sizeof(mr->VolumeName));
+ stat = 1;
+ }
+ free_pool_memory(label);
+ return stat;
+}