Changeset 41284

Timestamp:

Feb 24, 2020, 3:51:43 PM (6 years ago)

Author:

eugene

Message:

move ipptool2book from pantasks to general opihi code (rename as queue2book, keep alias ipptool2book)

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• queue2book.c (copied) (copied from trunk/Ohana/src/opihi/pantasks/ipptool2book.c ) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -129 +129 @@
 $(SRC)/queuesubstr.$(ARCH).o    \
 $(SRC)/queueinit.$(ARCH).o      \
+$(SRC)/queue2book.$(ARCH).o     \
 $(SRC)/radial.$(ARCH).o \
 $(SRC)/rd.$(ARCH).o             \

trunk/Ohana/src/opihi/cmd.data/init.c

@@ -115 +115 @@
 int queuesubstr      PROTO((int, char **));
 int queuesize        PROTO((int, char **));
+int queue2book       PROTO((int, char **));
 int rd               PROTO((int, char **));
 int rdseg            PROTO((int, char **));
@@ -314 +315 @@
   {1, "queuesize",    queuesize,        "show queue size"},
   {1, "queuesubstr",  queuesubstr,      "bulk replace strings in queue"},
+  {1, "queue2book",   queue2book,       "convert queue with ipptool output to book"},
+  {1, "ipptool2book", queue2book,       "convert queue with ipptool output to book"},
   {1, "rd",           rd,               "load fits image"},
   {1, "rdseg",        rdseg,            "read a segment of an image from a file"},

trunk/Ohana/src/opihi/cmd.data/queue2book.c

@@ -7 +7 @@
 
 // convert the named queue with ipptool metadata output into book format
-int ipptool2book (int argc, char **argv) {
+int queue2book (int argc, char **argv) {
 
   int i, N, onPage, found, Unique, Nkeys, NKEYS;
@@ -67 +67 @@
 
   if (argc != 3) {
-    gprint (GP_ERR, "USAGE: ipptool2book (queue) (book) [-uniq] [-key key[:key..]]\n");
+    gprint (GP_ERR, "USAGE: queue2book (queue) (book) [-uniq] [-key key[:key..]]\n");
+    gprint (GP_ERR, "       converts the named queue  with ipptool metadata output into book format\n");
     FREEKEYS;
     return (TRUE);