From 73ee10117d97c2b3c56db1c0efa1e7d8c0d59e19 Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Sun, 16 Aug 2015 23:12:37 +0200 Subject: [PATCH] fix --- src/dird/ua_dotcmds.c | 11 +++++++++++ src/lib/output_formatter.h | 2 +- src/qt-console/console/console.cpp | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/dird/ua_dotcmds.c b/src/dird/ua_dotcmds.c index 1b97da7..a10f2b5 100644 --- a/src/dird/ua_dotcmds.c +++ b/src/dird/ua_dotcmds.c @@ -1406,27 +1406,38 @@ static bool defaultscmd(UAContext *ua, const char *cmd) ua->send->object_key_value("job", "%s=", job->name(), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("pool", "%s=", job->pool->name(), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("messages", "%s=", job->messages->name(), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("client", "%s=", ((job->client) ? job->client->name() : _("*None*")), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); get_job_storage(&store, job, NULL); ua->send->object_key_value("storage", "%s=", store.store->name(), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("where", "%s=", (job->RestoreWhere ? job->RestoreWhere : ""), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("level", "%s=", level_to_str(job->JobLevel), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("type", "%s=", job_type_to_str(job->JobType), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("fileset", "%s=", ((job->fileset) ? job->fileset->name() : _("*None*")), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("enabled", "%s=", job->enabled, "%d"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); ua->send->object_key_value("catalog", "%s=", ((job->client) ? job->client->catalog->name() : _("*None*")), "%s"); ua->send->decoration("\n"); + ua->send->process_text_buffer(); } } else if ((pos = find_arg_with_value(ua, "client")) >= 0) { CLIENTRES *client; diff --git a/src/lib/output_formatter.h b/src/lib/output_formatter.h index abee93a..ae10e40 100644 --- a/src/lib/output_formatter.h +++ b/src/lib/output_formatter.h @@ -70,6 +70,7 @@ public: void message(const char *type, POOL_MEM &message); + void process_text_buffer(); void finalize_result(bool result); #if HAVE_JANSSON @@ -96,7 +97,6 @@ private: */ void rewrap(POOL_MEM &string, int wrap); - void process_text_buffer(); #if HAVE_JANSSON json_t *result_json; diff --git a/src/qt-console/console/console.cpp b/src/qt-console/console/console.cpp index b357402..8b0ea6f 100644 --- a/src/qt-console/console/console.cpp +++ b/src/qt-console/console/console.cpp @@ -435,6 +435,8 @@ bool Console::get_job_defaults(int &conn, struct job_defaults &job_defs, bool do *def++ = 0; strip_trailing_newline(def); + Pmsg2(000, "job_defaults: key=%s, value=%s\n", dircomm->msg(), def); + if (strcmp(dircomm->msg(), "job") == 0) { if (strcmp(def, job_defs.job_name.toUtf8().data()) != 0) { goto bail_out; -- 1.9.1