From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 31 Jan 2023 09:01:42 +0000 (+0100)
Subject: Add bconsole command 'list jobs reviewed=<0|1>'
X-Git-Tag: Beta-15.0.0~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4672c37fcb1e0f443c282ad05ceaab705942f8a0;p=thirdparty%2Fbacula.git

Add bconsole command 'list jobs reviewed=<0|1>'
---

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 68fd6982d..02ffd927a 100644
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -949,8 +949,9 @@ alist *BDB::bdb_list_job_records(JCR *jcr, JOB_DBR *jr, DB_LIST_HANDLER *sendit,
       Mmsg(tmp, " Job.Job='%s' ", esc);
       append_filter(&where, tmp);
 
+   /* 1 => 0, 2 => 1, 0 => not used */
    } else if (jr->Reviewed > 0) {
-      Mmsg(tmp, " Job.Reviewed = %d ", jr->Reviewed);
+      Mmsg(tmp, " Job.Reviewed = %d ", jr->Reviewed - 1);
       append_filter(&where, tmp);
 
    } else if (jr->isVirtualFull > 0) {
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 24f4f214a..fbbee6951 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -148,7 +148,7 @@ static struct cmdstruct commands[] = {                                      /* C
       ), false},
 
  { NT_("llist"),      llist_cmd,     _("Full or long list like list command"),
-   NT_("jobs [client=<cli>] [jobid=<nn>] [ujobid=<name> [tag=<name>] [job=<name>] [joberrors] [jobstatus=<s>] [level=<l>] [jobtype=<t>] [order=<asc/desc>] [limit=<n>]|\n"
+   NT_("jobs [client=<cli>] [jobid=<nn>] [ujobid=<name> [tag=<name>] [job=<name>] [joberrors] [jobstatus=<s>] [level=<l>] [jobtype=<t>] [reviewed=<0|1>] [order=<asc/desc>] [limit=<n>]|\n"
        "\tjobtotals | pools | volume | media <pool=pool-name> | files jobid=<nn> | copies jobid=<nn> |\n"
        "\tjoblog jobid=<nn> | pluginrestoreconf jobid=<nn> restoreobjectid=<nn> | snapshot |\n"
        "\tfilemedia jobid=<nn> fileindex=<mm> | clients\n"
diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index f878b867e..80b4d960e 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -449,6 +449,9 @@ static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist)
       } else if (strcasecmp(ua->argk[j], NT_("limit")) == 0) {
          jr.limit = atoi(ua->argv[j]);
 
+      } else if (strcasecmp(ua->argk[j], NT_("reviewed")) == 0) {
+         jr.Reviewed = atoi(ua->argv[j]) + 1;
+
       } else if (strcasecmp(ua->argk[j], NT_("jobstatus")) == 0) {
          if (B_ISALPHA(ua->argv[j][0])) {
             jr.JobStatus = ua->argv[j][0]; /* TODO: Check if the code is correct */
@@ -1136,6 +1139,7 @@ static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist)
                  || strcasecmp(ua->argk[i], NT_("code")) == 0
                  || strcasecmp(ua->argk[i], NT_("offset")) == 0
                  || strcasecmp(ua->argk[i], NT_("pattern")) == 0
+                 || strcasecmp(ua->argk[i], NT_("reviewed")) == 0
          ) {
          /* Ignore it */
       } else if (strcasecmp(ua->argk[i], NT_("snapshot")) == 0 ||