kes Fix Bacula->Documentation link on Win32 to point to index.html

     instead of bacula.html. Fixed bug #750.
kes  Return JobId in db_get_job_record() when JobId==0. This should
     fix bug #741.

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 61efe2ebc388d8917d25ab4ac73e576a3c7c581f..c3a3c6afeeb03b5bb54b28ca6ec7916343017c7c 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,18 +1,28 @@
               Technical notes on version 2.1
 
 General:
+              Technical notes on version 2.0
 
-
-
-
-
-
-
-
-
-
-
-
+General:
+12Jan07
+kes  Return JobId in db_get_job_record() when JobId==0. This should
+     fix bug #741.
+kes  Do not release source pointers when restarting a failed job.
+11Jan07
+kes  Add dynamic dll entry point for SHGetFolderPath to Win32 code.
+     This *should* fix bug #747.
+kes  Modify winbacula.nsi to substitute with g bin_dir_cmd. Should fix
+     bug #742.
+09Jan07
+kes  Modify USTORE constructor to set an empty store_source string, 
+     and don't copy the store_source string in a cancel.  Hopefully
+     this will fix Arno's seg fault, bug #744.
+kes  Add back code to disable conio in configure. Fixes bug #743.
+kes  Correct the Options scanner in the FD to correctly handle  
+     SHA1 option, which was eating the next option.  Reported by    
+     Sebastien Guilbaud.
+kes  Add code to indicate when the SD is spooling, spool wait, and 
+     despooling as requested by Alan Brown.
 
 
 

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 221fc137c4f86c859052b84e151e97baebd799fd..d87f73056e1cc23decade8f33f2d693412facb51 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -43,8 +43,8 @@ Document:
 Priority:
 - Add the OS version back to the Win32 client info.
 - Restarted jobs have a NULL in the from field.
-
-
+- Modify SD status command to indicate when the SD is writing
+  to a DVD (the device is not open -- see bug #732).
 - Look at the possibility of adding "SET NAMES UTF8" for MySQL,
   and possibly changing the blobs into varchar.
 - Check if gnome-console works with TLS.

diff --git a/bacula/projects b/bacula/projects
index b357a3be110f4758d8fa4a946c2fe81205fb975b..87b5af4f88ec8df8c09eba13484fe6abf7c87b64 100644 (file)
--- a/bacula/projects
+++ b/bacula/projects
@@ -1,7 +1,7 @@
                 
 Projects:
                      Bacula Projects Roadmap 
-                    Status updated 11 January 2007
+                    Status updated 12 January 2007
 
 Summary:
 Item  1:  Accurate restoration of renamed/deleted files
@@ -490,10 +490,11 @@ Item 19:  An option to operate on all pools with update vol parameters
 
 
 
-Item 20:  Include JobID in spool file name
+Item 20:  Include JobID in spool file name ****DONE****
   Origin: Mark Bergman <mark.bergman@uphs.upenn.edu>
   Date:   Tue Aug 22 17:13:39 EDT 2006
-  Status: Ok (patches/testing/project-include-jobid-in-spool-name.patch)
+  Status: Done. (patches/testing/project-include-jobid-in-spool-name.patch)
+          No need to vote for this item.
 
   What:   Change the name of the spool file to include the JobID
 

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index a3461c6cdb369fb714f2cb5f68bf8fbc0b398ae2..b2cc9734e52dff82897b9ad6428e250842bd20f7 100644 (file)
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -11,7 +11,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -275,12 +275,12 @@ bool db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    if (jr->JobId == 0) {
       Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime,"
 "PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus,"
-"Type,Level,ClientId,Name,PriorJobId,RealEndTime "
+"Type,Level,ClientId,Name,PriorJobId,RealEndTime,JobId "
 "FROM Job WHERE Job='%s'", jr->Job);
     } else {
       Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime,"
 "PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus,"
-"Type,Level,ClientId,Name,PriorJobId,RealEndTime "
+"Type,Level,ClientId,Name,PriorJobId,RealEndTime,JobId "
 "FROM Job WHERE JobId=%s", 
           edit_int64(jr->JobId, ed1));
     }
@@ -312,6 +312,9 @@ bool db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    bstrncpy(jr->Name, row[13]!=NULL?row[13]:"", sizeof(jr->Name));
    jr->PriorJobId = str_to_uint64(row[14]!=NULL?row[14]:(char *)"");
    bstrncpy(jr->cRealEndTime, row[15]!=NULL?row[15]:"", sizeof(jr->cRealEndTime));
+   if (jr->JobId == 0) {
+      jr->JobId = str_to_int64(row[16]);
+   }
    sql_free_result(mdb);
 
    db_unlock(mdb);

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 861e95884e2462ae34f93a1ad483fd4296fbdb2b..ccd82a06cb708de7faf605afdbae3ec2d8f21906 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -834,7 +834,7 @@ Section "Documentation (HTML Format)" SecDocHtml
   File "${SRC_DIR}\manual\bacula\*.html"
   File "${SRC_DIR}\manual\bacula\*.png"
   File "${SRC_DIR}\manual\bacula\*.css"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\bacula.html"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
 SectionEnd
 
 SectionGroupEnd

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 79f5f5232ea76603358417c0e70380b467575f70..65f245c4d9f11d9ecf15cc516c44977d83dc0e07 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -3,6 +3,10 @@
 General:
 Version 2.0.1
 12Jan07
+kes  Fix Bacula->Documentation link on Win32 to point to index.html
+     instead of bacula.html. Fixed bug #750.
+kes  Return JobId in db_get_job_record() when JobId==0. This should
+     fix bug #741.
 kes  Do not release source pointers when restarting a failed job.
 11Jan07
 kes  Add dynamic dll entry point for SHGetFolderPath to Win32 code.