From 2561119b9dcdb7850512be60897b60c4b1282da1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 13 Jan 2007 07:49:24 +0000 Subject: [PATCH] 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 --- bacula/ChangeLog | 32 ++++++++++++++++-------- bacula/kernstodo | 4 +-- bacula/projects | 7 +++--- bacula/src/cats/sql_get.c | 9 ++++--- bacula/src/win32/installer/winbacula.nsi | 2 +- bacula/technotes-2.1 | 4 +++ 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 61efe2ebc3..c3a3c6afee 100644 --- 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 221fc137c4..d87f73056e 100644 --- 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 b357a3be11..87b5af4f88 100644 --- 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 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 a3461c6cdb..b2cc9734e5 100644 --- 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 861e95884e..ccd82a06cb 100644 --- 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 79f5f5232e..65f245c4d9 100644 --- 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. -- 2.39.5