From d94c28184ef37f5b426f6207cb35cd6ec7656f68 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 25 Oct 2003 14:21:25 +0000
Subject: [PATCH] Windows tweaks + fix glade error

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@780 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/bdb_find.c |  4 +++-
 bacula/src/cats/bdb_get.c  |  2 +-
 bacula/src/cats/sql_find.c | 36 ++++++++++++++++++------------------
 bacula/src/cats/sql_get.c  |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/bacula/src/cats/bdb_find.c b/bacula/src/cats/bdb_find.c
index 8526946474..5b9a2581a0 100644
--- a/bacula/src/cats/bdb_find.c
+++ b/bacula/src/cats/bdb_find.c
@@ -176,7 +176,9 @@ int db_find_next_volume(JCR *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
    return stat; 		
 }
 
-int db_find_last_jobid(JCR *jcr, B_DB *mdb, JOB_DBR *jr) { return 0; }
+int
+db_find_last_jobid(JCR *jcr, B_DB *mdb, char *Name, JOB_DBR *jr)
+{ return 0; }
 
 
 #endif /* HAVE_BACULA_DB */
diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index e152c227ba..cbabc7a3aa 100644
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -492,7 +492,7 @@ int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
 
 
 
-int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, FILE_DBR *fdbr) 
+int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, JOB_DBR *jr, FILE_DBR *fdbr)
 { return 0; }
 
 int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
diff --git a/bacula/src/cats/sql_find.c b/bacula/src/cats/sql_find.c
index 948a984062..0939ce9e36 100644
--- a/bacula/src/cats/sql_find.c
+++ b/bacula/src/cats/sql_find.c
@@ -72,11 +72,11 @@ db_find_job_start_time(JCR *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
    /* If no Id given, we must find corresponding job */
    if (jr->JobId == 0) {
       /* Differential is since last Full backup */
-      Mmsg(&mdb->cmd, 
+	 Mmsg(&mdb->cmd, 
 "SELECT StartTime FROM Job WHERE JobStatus='T' AND Type='%c' AND "
 "Level='%c' AND Name='%s' AND ClientId=%u AND FileSetId=%u "
 "ORDER BY StartTime DESC LIMIT 1",
-	 jr->Type, L_FULL, jr->Name, jr->ClientId, jr->FileSetId);
+	   jr->Type, L_FULL, jr->Name, jr->ClientId, jr->FileSetId);
 
       if (jr->Level == L_DIFFERENTIAL) {
       /* Incremental is since last Full, Incremental, or Differential */
@@ -89,19 +89,19 @@ db_find_job_start_time(JCR *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
 	  *  then we do a second look to find the most recent
 	  *  backup
 	  */
-	 if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
-            Mmsg2(&mdb->errmsg, _("Query error for start time request: ERR=%s\nCMD=%s\n"), 
-	       sql_strerror(mdb), mdb->cmd);
-	    db_unlock(mdb);
-	    return 0;
-	 }
-	 if ((row = sql_fetch_row(mdb)) == NULL) {
-	    sql_free_result(mdb);
-            Mmsg(&mdb->errmsg, _("No prior Full backup Job record found.\n"));
-	    db_unlock(mdb);
-	    return 0;
-	 }
+      if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
+         Mmsg2(&mdb->errmsg, _("Query error for start time request: ERR=%s\nCMD=%s\n"), 
+	    sql_strerror(mdb), mdb->cmd);
+	 db_unlock(mdb);
+	 return 0;
+      }
+      if ((row = sql_fetch_row(mdb)) == NULL) {
 	 sql_free_result(mdb);
+            Mmsg(&mdb->errmsg, _("No prior Full backup Job record found.\n"));
+	 db_unlock(mdb);
+	 return 0;
+      }
+      sql_free_result(mdb);
 	 /* Now edit SQL command for Incremental Job */
 	 Mmsg(&mdb->cmd, 
 "SELECT StartTime FROM Job WHERE JobStatus='T' AND Type='%c' AND "
@@ -109,13 +109,13 @@ db_find_job_start_time(JCR *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
 "ORDER BY StartTime DESC LIMIT 1",
 	   jr->Type, L_INCREMENTAL, L_DIFFERENTIAL, L_FULL, jr->Name,
 	   jr->ClientId);
-      } else {
+   } else {
          Mmsg1(&mdb->errmsg, _("Unknown level=%d\n"), jr->Level);
 	 db_unlock(mdb);
 	 return 0;
-      }
+   }
    } else {
-      Dmsg1(100, "Submitting: %s\n", mdb->cmd);
+   Dmsg1(100, "Submitting: %s\n", mdb->cmd);
       Mmsg(&mdb->cmd, "SELECT StartTime FROM Job WHERE Job.JobId=%u", jr->JobId);
    }
 
@@ -170,7 +170,7 @@ db_find_last_jobid(JCR *jcr, B_DB *mdb, char *Name, JOB_DBR *jr)
 "SELECT JobId FROM Job WHERE Type='B' AND JobStatus='T' AND "
 "Name='%s' ORDER BY StartTime DESC LIMIT 1", Name);
       } else {
-	 Mmsg(&mdb->cmd, 
+      Mmsg(&mdb->cmd, 
 "SELECT JobId FROM Job WHERE Type='B' AND "
 "ClientId=%u ORDER BY StartTime DESC LIMIT 1", jr->ClientId);
       }
diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 47e034e15a..9609d8570a 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -105,7 +105,7 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr)
    int stat = 0;
 
    if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) {
-      Mmsg(&mdb->cmd, 
+   Mmsg(&mdb->cmd, 
 "SELECT FileId, LStat, MD5 FROM File,Job WHERE "
 "File.JobId=Job.JobId AND File.PathId=%u AND "
 "File.FilenameId=%u AND Job.Type='B' AND Job.JobSTATUS='T' AND "
-- 
2.39.5