ebl fix an edit_int64(jobid)

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

diff --git a/bacula/patches/testing/batch-insert.patch b/bacula/patches/testing/batch-insert.patch
index 19c9fe911a1c61a61523f4df2360dd25bd0711aa..08fea2d7f7cf7e1cac7fb2689acacd2a3f6b78de 100644 (file)
--- a/bacula/patches/testing/batch-insert.patch
+++ b/bacula/patches/testing/batch-insert.patch
@@ -1,6 +1,6 @@
 diff -Naur cvs/src/cats/cats.h my/src/cats/cats.h
 --- cvs/src/cats/cats.h        2006-12-06 15:11:53.000000000 +0100
-+++ my/src/cats/cats.h 2006-12-14 21:11:40.000000000 +0100
++++ my/src/cats/cats.h 2007-01-10 19:21:42.000000000 +0100
 @@ -141,6 +141,7 @@
     POOLMEM *fname;                    /* Filename only */
     POOLMEM *path;                     /* Path only */
@@ -156,7 +156,7 @@ diff -Naur cvs/src/cats/cats.h my/src/cats/cats.h
  
 diff -Naur cvs/src/cats/mysql.c my/src/cats/mysql.c
 --- cvs/src/cats/mysql.c       2006-12-09 14:41:50.000000000 +0100
-+++ my/src/cats/mysql.c        2006-12-16 19:18:17.000000000 +0100
++++ my/src/cats/mysql.c        2007-01-10 19:21:42.000000000 +0100
 @@ -121,6 +121,7 @@
     mdb->fname = get_pool_memory(PM_FNAME);
     mdb->path = get_pool_memory(PM_FNAME);
@@ -210,7 +210,7 @@ diff -Naur cvs/src/cats/mysql.c my/src/cats/mysql.c
 +
 diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c
 --- cvs/src/cats/postgresql.c  2006-12-06 15:11:53.000000000 +0100
-+++ my/src/cats/postgresql.c   2006-12-14 20:28:28.000000000 +0100
++++ my/src/cats/postgresql.c   2007-01-10 19:25:47.000000000 +0100
 @@ -124,6 +124,7 @@
     mdb->fname          = get_pool_memory(PM_FNAME);
     mdb->path           = get_pool_memory(PM_FNAME);
@@ -227,7 +227,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c
        if (mdb->db_name) {
           free(mdb->db_name);
        }
-@@ -538,5 +540,201 @@
+@@ -538,5 +540,202 @@
     return id;
  }
  
@@ -323,6 +323,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c
 +   int count=30;
 +   size_t len;
 +   char *digest;
++   char ed1[50];
 +
 +   mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1);
 +   my_postgresql_copy_escape(mdb->esc_name, mdb->fname, mdb->fnl);
@@ -336,8 +337,8 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c
 +      digest = ar->Digest;
 +   }
 +
-+   len = Mmsg(mdb->cmd, "%u\t%u\t%s\t%s\t%s\t%s\n", 
-+            ar->FileIndex, ar->JobId, mdb->path, 
++   len = Mmsg(mdb->cmd, "%u\t%s\t%s\t%s\t%s\t%s\n", 
++            ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->path, 
 +            mdb->fname, ar->attr, digest);
 +
 +   do { 
@@ -431,7 +432,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c
  #endif /* HAVE_POSTGRESQL */
 diff -Naur cvs/src/cats/protos.h my/src/cats/protos.h
 --- cvs/src/cats/protos.h      2006-12-06 15:11:53.000000000 +0100
-+++ my/src/cats/protos.h       2006-12-13 19:03:46.000000000 +0100
++++ my/src/cats/protos.h       2007-01-10 19:21:42.000000000 +0100
 @@ -67,6 +67,10 @@
  bool db_create_device_record(JCR *jcr, B_DB *mdb, DEVICE_DBR *dr);
  bool db_create_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *sr);
@@ -445,8 +446,8 @@ diff -Naur cvs/src/cats/protos.h my/src/cats/protos.h
  int db_delete_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pool_dbr);
 diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c
 --- cvs/src/cats/sql_create.c  2006-12-06 15:11:53.000000000 +0100
-+++ my/src/cats/sql_create.c   2006-12-14 22:06:41.000000000 +0100
-@@ -664,9 +664,207 @@
++++ my/src/cats/sql_create.c   2007-01-10 21:46:59.000000000 +0100
+@@ -664,9 +664,208 @@
   *  };
   */
  
@@ -478,6 +479,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c
 +{
 +   size_t len;
 +   char *digest;
++   char edi1[50];
 +
 +   mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1);
 +   db_escape_string(mdb->esc_name, mdb->fname, mdb->fnl);
@@ -491,8 +493,8 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c
 +      digest = ar->Digest;
 +   }
 +
-+   len = Mmsg(mdb->cmd, "INSERT INTO batch VALUES (%u,%u,'%s','%s','%s','%s')",
-+              ar->FileIndex, ar->JobId, mdb->path, 
++   len = Mmsg(mdb->cmd, "INSERT INTO batch VALUES (%u,%s,'%s','%s','%s','%s')",
++              ar->FileIndex, edit_int64(ar->JobId,ed1), mdb->path, 
 +              mdb->fname, ar->attr, digest);
 +
 +   sql_query(mdb, mdb->cmd);
@@ -654,7 +656,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c
   * Create File record in B_DB
   *
   *  In order to reduce database size, we store the File attributes,
-@@ -721,6 +919,8 @@
+@@ -721,6 +920,8 @@
     return 0;
  }
  
@@ -665,7 +667,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c
   *  The filename and path records have already been created.
 diff -Naur cvs/src/cats/sqlite.c my/src/cats/sqlite.c
 --- cvs/src/cats/sqlite.c      2006-12-06 15:11:53.000000000 +0100
-+++ my/src/cats/sqlite.c       2006-12-14 22:30:35.000000000 +0100
++++ my/src/cats/sqlite.c       2007-01-10 19:21:42.000000000 +0100
 @@ -108,6 +108,7 @@
     mdb->fname = get_pool_memory(PM_FNAME);
     mdb->path = get_pool_memory(PM_FNAME);
@@ -701,7 +703,7 @@ diff -Naur cvs/src/cats/sqlite.c my/src/cats/sqlite.c
  #endif /* HAVE_SQLITE */
 diff -Naur cvs/src/dird/backup.c my/src/dird/backup.c
 --- cvs/src/dird/backup.c      2006-12-13 11:57:52.000000000 +0100
-+++ my/src/dird/backup.c       2006-12-13 19:03:46.000000000 +0100
++++ my/src/dird/backup.c       2007-01-10 19:21:42.000000000 +0100
 @@ -233,6 +233,9 @@
  
     /* Pickup Job termination data */
@@ -714,7 +716,7 @@ diff -Naur cvs/src/dird/backup.c my/src/dird/backup.c
        return true;
 diff -Naur cvs/src/dird/jobq.c my/src/dird/jobq.c
 --- cvs/src/dird/jobq.c        2006-11-24 11:29:37.000000000 +0100
-+++ my/src/dird/jobq.c 2006-12-13 19:03:46.000000000 +0100
++++ my/src/dird/jobq.c 2007-01-10 19:21:42.000000000 +0100
 @@ -563,6 +563,10 @@
              db_close_database(jcr, jcr->db);
              jcr->db = NULL;
@@ -727,8 +729,8 @@ diff -Naur cvs/src/dird/jobq.c my/src/dird/jobq.c
           jcr->SDJobStatus = 0;
           V(jq->mutex);                /* release internal lock */
 diff -Naur cvs/src/jcr.h my/src/jcr.h
---- cvs/src/jcr.h      2006-12-12 21:03:36.000000000 +0100
-+++ my/src/jcr.h       2006-12-13 19:03:46.000000000 +0100
+--- cvs/src/jcr.h      2006-12-19 21:57:38.000000000 +0100
++++ my/src/jcr.h       2007-01-10 19:21:42.000000000 +0100
 @@ -184,6 +184,7 @@
     bool cached_attribute;             /* set if attribute is cached */
     POOLMEM *attr;                     /* Attribute string from SD */