Changeset 42413

Timestamp:

Mar 15, 2023, 11:01:42 AM (3 years ago)

Author:

eugene

Message:

fix the -simple usage to produce single-line outputs

Location:

branches/eam_branches/ipp-20230313/ippTools/src

Files:

• disttool.c (modified) (5 diffs)
• disttoolConfig.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/ippTools/src/disttool.c

@@ -765 +765 @@
     }
 
-    if (simple) {/* no option? */}
-
     if (pretend) {
-        if (!ippdbPrintMetadatas(stdout, output, "distRunsToUpdate", true)) {
+        if (!ippdbPrintMetadatas(stdout, output, "distRunsToUpdate", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
             psFree(output);
@@ -1652 +1650 @@
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(comment, config->args, "-comment", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
     distTargetRow *row = distTargetRowAlloc(
@@ -1676 +1675 @@
     row->target_id = psDBLastInsertID(config->dbh);
 
-    if (!distTargetPrintObject(stdout, row, true)) {
+    if (!distTargetPrintObject(stdout, row, !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print object");
             psFree(row);
@@ -1815 +1814 @@
     PXOPT_LOOKUP_STR(last_fileset, config->args, "-last_fileset", false, false);
     PXOPT_LOOKUP_STR(state, config->args,        "-set_state", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args,      "-simple", false);
 
     // XXX: should we insure that these names do not contatin any whitespace?
@@ -1842 +1842 @@
     row->dest_id = psDBLastInsertID(config->dbh);
 
-    if (!rcDestinationPrintObject(stdout, row, true)) {
+    if (!rcDestinationPrintObject(stdout, row, !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print object");
         psFree(row);

branches/eam_branches/ipp-20230313/ippTools/src/disttoolConfig.c

@@ -275 +275 @@
     psMetadataAddStr(definedestinationArgs, PS_LIST_TAIL, "-last_fileset",0, "define last_fileset", NULL);
     psMetadataAddStr(definedestinationArgs, PS_LIST_TAIL, "-set_state",   0, "define state", NULL);
+    psMetadataAddBool(definedestinationArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
 
     // -updatedestination
@@ -292 +293 @@
     psMetadataAddStr(definetargetArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL);
     psMetadataAddStr(definetargetArgs, PS_LIST_TAIL, "-comment",   0, "define comment", NULL);
+    psMetadataAddBool(definetargetArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
 
     // -updatetarget