From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 18 Jun 2009 12:54:45 +0000 (+0000)
Subject: Add all Job Types to job_type_to_str() for bat
X-Git-Tag: Release-3.0.2~156
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bb68aa79066ee0ff757215f9a2733132f7fc65ee;p=bacula%2Fbacula

Add all Job Types to job_type_to_str() for bat

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8910 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 5d3bffa30a..82f8ee3cbf 100644
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -349,43 +349,49 @@ const char *job_status_to_str(int stat)
  */
 const char *job_type_to_str(int type)
 {
-   const char *str;
+   const char *str = NULL;
 
    switch (type) {
    case JT_BACKUP:
       str = _("Backup");
       break;
+   case JT_MIGRATED_JOB:
+      str = _("Migrated Job");
+      break;
    case JT_VERIFY:
       str = _("Verify");
       break;
    case JT_RESTORE:
       str = _("Restore");
       break;
+   case JT_CONSOLE:
+      str = _("Console");
+      break;
+   case JT_SYSTEM:
+      str = _("System or Console");
+      break;
    case JT_ADMIN:
       str = _("Admin");
       break;
-   case JT_MIGRATE:
-      str = _("Migrate");
-      break;
-   case JT_COPY:
-      str = _("Copy");
+   case JT_ARCHIVE:
+      str = _("Archive");
       break;
    case JT_JOB_COPY:
       str = _("Job Copy");
       break;
-   case JT_CONSOLE:
-      str = _("Console");
+   case JT_COPY:
+      str = _("Copy");
       break;
-   case JT_SYSTEM:
-      str = _("System or Console");
+   case JT_MIGRATE:
+      str = _("Migrate");
       break;
    case JT_SCAN:
       str = _("Scan");
       break;
-   default:
-      str = _("Unknown Type");
-      break;
    }
+   if (!str) {
+      str = _("Unknown Type");
+   }   
    return str;
 }
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index ed36f1abaa..7a344ed3f1 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "3.0.2"
-#define BDATE   "17 June 2009"
-#define LSMDATE "17Jun09"
+#define BDATE   "18 June 2009"
+#define LSMDATE "18Jun09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes b/bacula/technotes
index 7ba9fa6472..94472d8d77 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,7 @@
 General:
 
 18Jun09
+kes  Add all Job Types to job_type_to_str() for bat.
 kes  Fix bug #1311 if MaxDiffInterval exceeded ensure job upgraded
 17Jun09
 kes  Fix bug #1305 make errors obtaining acl during backup non-fatal