X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fnewvol.c;h=2475f00502ec75c4463d98dd68002be9e1f3420b;hb=66696d1cadedbb362c392dadce9a8ce275dd5d80;hp=e3982203d9e57363d9a06d2735cedc4fdc821674;hpb=288ea8ab889d58c06cc1b95aeca0485082a63bb9;p=bacula%2Fbacula

diff --git a/bacula/src/dird/newvol.c b/bacula/src/dird/newvol.c
index e3982203d9..2475f00502 100644
--- a/bacula/src/dird/newvol.c
+++ b/bacula/src/dird/newvol.c
@@ -10,9 +10,10 @@
  *  Basic tasks done here:
  *	If possible create a new Media entry
  *
+ *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -34,41 +35,109 @@
 #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
+ * Automatic Volume name creation using the LabelFormat
  */
-int newVolume(JCR *jcr)
+bool newVolume(JCR *jcr, MEDIA_DBR *mr)
 {
-   MEDIA_DBR mr; 
    POOL_DBR pr;
-   char name[MAXSTRING];
 
-   memset(&mr, 0, sizeof(mr));
    memset(&pr, 0, sizeof(pr));
 
    /* See if we can create a new Volume */
+   db_lock(jcr->db);
    pr.PoolId = jcr->PoolId;
-   if (db_get_pool_record(jcr->db, &pr) && pr.LabelFormat[0] &&
+   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(mr));
-	 mr.PoolId = jcr->PoolId;
-	 strcpy(mr.MediaType, jcr->store->media_type);
-	 strcpy(name, pr.LabelFormat);	 
-         strcat(name, "%04d");
-	 sprintf(mr.VolumeName, name, ++pr.NumVols);
-         strcpy(mr.VolStatus, "Append");
-	 mr.Recycle = pr.Recycle;
-	 mr.VolRetention = pr.VolumeRetention;
-	 if (db_create_media_record(jcr->db, &mr) &&
-	    db_update_pool_record(jcr->db, &pr) == 1) {
-            Dmsg1(90, "Created new Volume=%s\n", mr.VolumeName);
-	    return 1;
+	 memset(mr, 0, sizeof(MEDIA_DBR));
+	 set_pool_dbr_defaults_in_media_dbr(mr, &pr);
+	 jcr->VolumeName[0] = 0;
+	 bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType));
+	 if (generate_event(jcr, "NewVolume") == 1 && jcr->VolumeName[0]) {
+	    bstrncpy(mr->VolumeName, jcr->VolumeName, sizeof(mr->VolumeName));
+	 /* Check for special characters */
+	 } else 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;
+	    }
+	 }
+	 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 true;
 	 } else {
-            Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+	    Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
 	 }
       }
    }
-   return 0;   
+bail_out:
+   db_unlock(jcr->db);
+   return false;
+}
+
+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;
 }