Improve debug output scheduler+jobq+tracing

[bacula/bacula] / bacula / src / cats / sql.c

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index c71f92c27f27659a74fdca0f50b17feb2565a1e0..58d331037be1ff53f24a5044c1960a071ff0b68a 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -10,7 +10,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -52,16 +52,16 @@ static int int_handler(void *ctx, int num_fields, char **row)
 {
    uint32_t *val = (uint32_t *)ctx;
 
-   Dmsg1(50, "int_handler starts with row pointing at %x\n", row);
+   Dmsg1(200, "int_handler starts with row pointing at %x\n", row);
 
    if (row[0]) {
-      Dmsg1(50, "int_handler finds '%s'\n", row[0]);
+      Dmsg1(200, "int_handler finds '%s'\n", row[0]);
       *val = atoi(row[0]);
    } else {
-      Dmsg0(50, "int_handler finds zero\n");
+      Dmsg0(200, "int_handler finds zero\n");
       *val = 0;
    }
-   Dmsg0(50, "int_handler finishes\n");
+   Dmsg0(200, "int_handler finishes\n");
    return 0;
 }
        
@@ -351,7 +351,7 @@ void split_path_and_filename(JCR *jcr, B_DB *mdb, char *fname)
 }
 
 /*
- * List dashs as part of header for listing SQL results in a table
+ * List dashes as part of header for listing SQL results in a table
  */
 void
 list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
@@ -363,7 +363,7 @@ list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    send(ctx, "+");
    for (i = 0; i < sql_num_fields(mdb); i++) {
       field = sql_fetch_field(mdb);
-      for (j = 0; j < field->max_length + 2; j++) {
+      for (j = 0; j < (int)field->max_length + 2; j++) {
          send(ctx, "-");
       }
       send(ctx, "+");
@@ -376,24 +376,24 @@ list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
  * list on one line horizontally.      
  */
 void
-list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
+list_result(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
 {
    SQL_FIELD *field;
    SQL_ROW row;
    int i, col_len, max_len = 0;
    char buf[2000], ewc[30];
 
-   Dmsg0(50, "list_result starts\n");
+   Dmsg0(200, "list_result starts\n");
    if (mdb->result == NULL || sql_num_rows(mdb) == 0) {
       send(ctx, _("No results to list.\n"));
       return;
    }
 
-   Dmsg1(50, "list_result starts looking at %d fields\n", sql_num_fields(mdb));
+   Dmsg1(200, "list_result starts looking at %d fields\n", sql_num_fields(mdb));
    /* determine column display widths */
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
-      Dmsg1(50, "list_result processing field %d\n", i);
+      Dmsg1(200, "list_result processing field %d\n", i);
       field = sql_fetch_field(mdb);
       col_len = strlen(field->name);
       if (type == VERT_LIST) {
@@ -401,10 +401,10 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
            max_len = col_len;
         }
       } else {
-        if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
+        if (IS_NUM(field->type) && (int)field->max_length > 0) { /* fixup for commas */
            field->max_length += (field->max_length - 1) / 3;
         }
-        if (col_len < field->max_length) {
+        if (col_len < (int)field->max_length) {
            col_len = field->max_length;
         }
         if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
@@ -414,37 +414,37 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
       }
    }
 
-   Dmsg0(50, "list_result finished first loop\n");
+   Dmsg0(200, "list_result finished first loop\n");
    if (type == VERT_LIST) {
       goto vertical_list;
    }
 
-   Dmsg1(50, "list_result starts second loop looking at %d fields\n", sql_num_fields(mdb));
+   Dmsg1(200, "list_result starts second loop looking at %d fields\n", sql_num_fields(mdb));
    list_dashes(mdb, send, ctx);
    send(ctx, "|");
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
-      Dmsg1(50, "list_result looking at field %d\n", i);
+      Dmsg1(200, "list_result looking at field %d\n", i);
       field = sql_fetch_field(mdb);
-      bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, field->name);
+      bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
       send(ctx, buf);
    }
    send(ctx, "\n");
    list_dashes(mdb, send, ctx);
 
-   Dmsg1(50, "list_result starts third loop looking at %d fields\n", sql_num_fields(mdb));
+   Dmsg1(200, "list_result starts third loop looking at %d fields\n", sql_num_fields(mdb));
    while ((row = sql_fetch_row(mdb)) != NULL) {
       sql_field_seek(mdb, 0);
       send(ctx, "|");
       for (i = 0; i < sql_num_fields(mdb); i++) {
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
-            bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, "NULL");
-        } else if (IS_NUM(field->type)) {
-            bsnprintf(buf, sizeof(buf), " %*s |", field->max_length,       
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
+        } else if (IS_NUM(field->type) && !jcr->gui) {
+            bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,       
                      add_commas(row[i], ewc));
         } else {
-            bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, row[i]);
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
         }
         send(ctx, buf);
       }
@@ -455,14 +455,14 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
 
 vertical_list:
    
-   Dmsg1(50, "list_result starts vertical list at %d fields\n", sql_num_fields(mdb));
+   Dmsg1(200, "list_result starts vertical list at %d fields\n", sql_num_fields(mdb));
    while ((row = sql_fetch_row(mdb)) != NULL) {
       sql_field_seek(mdb, 0);
       for (i = 0; i < sql_num_fields(mdb); i++) {
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
-        } else if (IS_NUM(field->type)) {
+        } else if (IS_NUM(field->type) && !jcr->gui) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
                add_commas(row[i], ewc));
         } else {