X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fsql_update.c;h=520c1b553a10faee2074be66eed5ebaf97f5ccb8;hb=75c8f56ea801b916a43e807e56bb9149b0ecf653;hp=d84eeab77cf8b217999bf371b60a523dcab28e50;hpb=b5752d5d38754259dc2bb30e1461ae0431c2333d;p=bacula%2Fbacula

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index d84eeab77c..520c1b553a 100644
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -26,8 +26,6 @@
 
  */
 
-/* *****FIXME**** fix fixed length of select_cmd[] and insert_cmd[] */
-
 /* The following is necessary so that we do not include
  * the dummy external definition of DB.
  */
@@ -49,14 +47,6 @@
 extern void print_result(B_DB *mdb);
 extern int UpdateDB(char *file, int line, B_DB *db, char *update_cmd);
 
-static int do_update(B_DB *mdb, char *cmd)
-{
-   int stat;
-
-   stat = UPDATE_DB(mdb, cmd);
-   return stat;
-}
-
 /* -----------------------------------------------------------------------
  *
  *   Generic Routines (or almost generic)
@@ -69,24 +59,24 @@ db_add_MD5_to_file_record(B_DB *mdb, FileId_t FileId, char *MD5)
 {
    int stat;
 
-   P(mdb->mutex);
-   Mmsg(&mdb->cmd, "UPDATE File SET MD5=\"%s\" WHERE FileId=%d", MD5, FileId);
+   db_lock(mdb);
+   Mmsg(&mdb->cmd, "UPDATE File SET MD5='%s' WHERE FileId=%u", MD5, FileId);
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
 /* Mark the file record as being visited during database
- * verify compare. Stuff JobId into FileIndex field
+ * verify compare. Stuff JobId into MarkedId field
  */
-int db_mark_file_record(B_DB *mdb, FileId_t FileId, int JobId) 
+int db_mark_file_record(B_DB *mdb, FileId_t FileId, JobId_t JobId) 
 {
    int stat;
 
-   P(mdb->mutex);
-   Mmsg(&mdb->cmd, "UPDATE File SET FileIndex=%d WHERE FileId=%d", JobId, FileId);
+   db_lock(mdb);
+   Mmsg(&mdb->cmd, "UPDATE File SET MarkId=%u WHERE FileId=%u", JobId, FileId);
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -111,12 +101,13 @@ db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
    JobTDate = (btime_t)stime;
 
-   P(mdb->mutex);
-   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime=\"%s\", \
-ClientId=%d, JobTDate=%s WHERE JobId=%d",
+   db_lock(mdb);
+   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime='%s', \
+ClientId=%u, JobTDate=%s WHERE JobId=%u",
       (char)(jr->Level), dt, jr->ClientId, edit_uint64(JobTDate, ed1), jr->JobId);
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
+   mdb->changes = 0;
    return stat;
 }
 
@@ -143,17 +134,17 @@ db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
    JobTDate = ttime;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    Mmsg(&mdb->cmd,
       "UPDATE Job SET JobStatus='%c', EndTime='%s', \
-ClientId=%d, JobBytes=%s, JobFiles=%d, JobErrors=%d, VolSessionId=%d, \
-VolSessionTime=%d, PoolId=%d, FileSetId=%d, JobTDate=%s WHERE JobId=%d",
+ClientId=%u, JobBytes=%s, JobFiles=%u, JobErrors=%u, VolSessionId=%u, \
+VolSessionTime=%u, PoolId=%u, FileSetId=%u, JobTDate=%s WHERE JobId=%u",
       (char)(jr->JobStatus), dt, jr->ClientId, edit_uint64(jr->JobBytes, ed1), 
       jr->JobFiles, jr->JobErrors, jr->VolSessionId, jr->VolSessionTime, 
       jr->PoolId, jr->FileSetId, edit_uint64(JobTDate, ed2), jr->JobId);
 
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -163,15 +154,15 @@ db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
 {
    int stat;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    Mmsg(&mdb->cmd,
 "UPDATE Pool SET NumVols=%d, MaxVols=%d, UseOnce=%d, UseCatalog=%d, \
-AcceptAnyVolume=%d, LabelFormat=\"%s\" WHERE PoolId=%d",
+AcceptAnyVolume=%d, LabelFormat='%s' WHERE PoolId=%u",
       pr->NumVols, pr->MaxVols, pr->UseOnce, pr->UseCatalog,
       pr->AcceptAnyVolume, pr->LabelFormat, pr->PoolId);
 
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -195,27 +186,28 @@ db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
 
    Dmsg1(100, "update_media: FirstWritten=%d\n", mr->FirstWritten);
-   P(mdb->mutex);
-   if (mr->VolMounts == 1) {
-      Mmsg(&mdb->cmd, "UPDATE Media SET FirstWritten=\"%s\"\
- WHERE VolumeName=\"%s\"", dt, mr->VolumeName);
-      if (do_update(mdb, mdb->cmd) == 0) {
-	 V(mdb->mutex);
-	 return 0;
-      }
+   db_lock(mdb);
+   if (mr->VolMounts == 1 && mr->VolBlocks==1 && mr->VolWrites==1) {
+      Dmsg1(400, "Set FirstWritten Vol=%s\n", mr->VolumeName);
+      Mmsg(&mdb->cmd, "UPDATE Media SET FirstWritten='%s'\
+ WHERE VolumeName='%s'", dt, mr->VolumeName);
+      stat = UPDATE_DB(mdb, mdb->cmd);
+      Dmsg1(400, "Firstwritten stat=%d\n", stat);
    }
 
-   Mmsg(&mdb->cmd, "UPDATE Media SET VolJobs=%d,\
- VolFiles=%d, VolBlocks=%d, VolBytes=%s, VolMounts=%d, VolErrors=%d,\
- VolWrites=%d, VolMaxBytes=%s, LastWritten=\"%s\", VolStatus=\"%s\" \
- WHERE VolumeName=\"%s\"",
+   Mmsg(&mdb->cmd, "UPDATE Media SET VolJobs=%u,\
+ VolFiles=%u, VolBlocks=%u, VolBytes=%s, VolMounts=%u, VolErrors=%u,\
+ VolWrites=%u, VolMaxBytes=%s, LastWritten='%s', VolStatus='%s',\
+ Slot=%d WHERE VolumeName='%s'",
    mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
    mr->VolMounts, mr->VolErrors, mr->VolWrites, 
    edit_uint64(mr->VolMaxBytes, ed2), dt, 
-   mr->VolStatus, mr->VolumeName);
+   mr->VolStatus, mr->Slot, mr->VolumeName);
+
+   Dmsg1(400, "%s\n", mdb->cmd);
 
    stat = UPDATE_DB(mdb, mdb->cmd);
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }