Index: /trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 4702)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 4703)
@@ -75,7 +75,11 @@
 $(SDIR)/point.$(ARCH).o		\
 $(SDIR)/ps.$(ARCH).o		\
-$(SDIR)/pop.$(ARCH).o		\
-$(SDIR)/push.$(ARCH).o		\
-$(SDIR)/queues.$(ARCH).o	\
+$(SDIR)/queuelist.$(ARCH).o	\
+$(SDIR)/queuesize.$(ARCH).o	\
+$(SDIR)/queuepush.$(ARCH).o	\
+$(SDIR)/queuepop.$(ARCH).o	\
+$(SDIR)/queueprint.$(ARCH).o	\
+$(SDIR)/queueinit.$(ARCH).o	\
+$(SDIR)/queuedelete.$(ARCH).o	\
 $(SDIR)/radial.$(ARCH).o	\
 $(SDIR)/rd.$(ARCH).o		\
Index: /trunk/Ohana/src/opihi/cmd.data/init.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/init.c	(revision 4702)
+++ /trunk/Ohana/src/opihi/cmd.data/init.c	(revision 4703)
@@ -56,8 +56,11 @@
 int dot              PROTO((int, char **));
 int point            PROTO((int, char **));
-int pop              PROTO((int, char **));
 int ps               PROTO((int, char **));
-int push             PROTO((int, char **));
 int queuelist        PROTO((int, char **));
+int queueinit        PROTO((int, char **));
+int queuedelete      PROTO((int, char **));
+int queuepop         PROTO((int, char **));
+int queueprint       PROTO((int, char **));
+int queuepush        PROTO((int, char **));
 int queuesize        PROTO((int, char **));
 int rd               PROTO((int, char **));
@@ -159,6 +162,9 @@
   {"point",	   point,	     "load overlay with single point"},
   {"ps",      	   ps,		     "define labels for plot"},
-  {"pop",      	   pop,		     "pop value from queue to variable"},
-  {"push",     	   push,	     "push value onto queue"},
+  {"queuepop", 	   queuepop,	     "pop value from queue to variable"},
+  {"queueprint",   queueprint,	     "print the contents of a queue"},
+  {"queuepush",	   queuepush,	     "push value onto queue"},
+  {"queueinit",	   queueinit,	     "create an empty queue"},
+  {"queuedelete",  queuedelete,	     "delete a queue"},
   {"queuelist",	   queuelist,	     "list defined queues"},
   {"queuesize",    queuesize,	     "show queue size"},
Index: unk/Ohana/src/opihi/cmd.data/pop.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/pop.c	(revision 4702)
+++ 	(revision )
@@ -1,44 +1,0 @@
-# include "data.h"
-
-int pop (int argc, char **argv) {
-  
-  int N;
-  char *var;
-  char *line;
-  Queue *queue;
-
-  var = (char *) NULL;
-  if ((N = get_argument (argc, argv, "-var"))) {
-    remove_argument (N, &argc, argv);
-    var = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
-  if (argc != 2) {
-    fprintf (stderr, "USAGE: pop (queue) [-var variable]\n");
-    return (FALSE);
-  }
-
-  /* will create a queue if none exists */
-  queue = FindQueue (argv[1]);
-  if (queue == NULL) {
-    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
-    return (FALSE);
-  }
-
-  line = PopQueue (queue);
-  if (line == NULL) {
-    fprintf (stderr, "ERROR: queue %s is empty\n", argv[1]);
-    return (FALSE);
-  }
-
-  if (var == (char *) NULL) {
-    fprintf (stderr, "%s\n", line);
-  } else {
-    set_str_variable (argv[2], line);
-  }
-
-  free (line);
-  return (TRUE);
-}
-
Index: unk/Ohana/src/opihi/cmd.data/push.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/push.c	(revision 4702)
+++ 	(revision )
@@ -1,46 +1,0 @@
-# include "data.h"
-
-int push (int argc, char **argv) {
-  
-  int N, Unique, Replace, Key;
-  Queue *queue;
-
-  Unique = FALSE;
-  if ((N = get_argument (argc, argv, "-uniq"))) {
-    remove_argument (N, &argc, argv);
-    Unique = TRUE;
-  }
-
-  Replace = FALSE;
-  if ((N = get_argument (argc, argv, "-replace"))) {
-    remove_argument (N, &argc, argv);
-    Replace = TRUE;
-  }
-
-  Key = -1;
-  if ((N = get_argument (argc, argv, "-key"))) {
-    remove_argument (N, &argc, argv);
-    Key = atoi (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
-  if (argc != 3) {
-    fprintf (stderr, "USAGE: push (queue) (value) [-key N] [-uniq] [-replace]\n");
-    return (FALSE);
-  }
-
-  /* will create a queue if none exists */
-  queue = CreateQueue (argv[1]);
-
-  if (Unique) {
-    PushQueueUnique (queue, argv[2], Key);
-  }
-  if (Replace) {
-    PushQueueReplace (queue, argv[2], Key);
-  }
-  if (!Unique && !Replace) {
-    PushQueue (queue, argv[2]);
-  }
-  return (TRUE);
-}
-
Index: /trunk/Ohana/src/opihi/cmd.data/queuedelete.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queuedelete.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queuedelete.c	(revision 4703)
@@ -0,0 +1,21 @@
+# include "data.h"
+
+int queuedelete (int argc, char **argv) {
+  
+  Queue *queue;
+
+  if (argc != 2) {
+    fprintf (stderr, "USAGE: queuedelete (name)\n");
+    return (FALSE);
+  }
+
+  queue = FindQueue (argv[1]);
+  if (queue == NULL) {
+    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
+    return (FALSE);
+  }
+
+  DeleteQueue (queue);
+  return (TRUE);
+}
+
Index: /trunk/Ohana/src/opihi/cmd.data/queueinit.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queueinit.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queueinit.c	(revision 4703)
@@ -0,0 +1,15 @@
+# include "data.h"
+
+int queueinit (int argc, char **argv) {
+
+  Queue *queue;
+
+  if (argc != 2) {
+    fprintf (stderr, "USAGE: queueinit (name)\n");
+    return (FALSE);
+  }
+
+  queue = CreateQueue (argv[1]);
+  InitQueue (queue);
+  return (TRUE);
+}
Index: /trunk/Ohana/src/opihi/cmd.data/queuelist.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queuelist.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queuelist.c	(revision 4703)
@@ -0,0 +1,12 @@
+# include "data.h"
+
+int queuelist (int argc, char **argv) {
+  
+  if (argc != 1) {
+    fprintf (stderr, "USAGE: queuelist\n");
+    return (FALSE);
+  }
+
+  ListQueues ();
+  return (TRUE);
+}
Index: /trunk/Ohana/src/opihi/cmd.data/queuepop.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queuepop.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queuepop.c	(revision 4703)
@@ -0,0 +1,44 @@
+# include "data.h"
+
+int queuepop (int argc, char **argv) {
+  
+  int N;
+  char *var;
+  char *line;
+  Queue *queue;
+
+  var = (char *) NULL;
+  if ((N = get_argument (argc, argv, "-var"))) {
+    remove_argument (N, &argc, argv);
+    var = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 2) {
+    fprintf (stderr, "USAGE: queuepop (queue) [-var variable]\n");
+    return (FALSE);
+  }
+
+  /* will create a queue if none exists */
+  queue = FindQueue (argv[1]);
+  if (queue == NULL) {
+    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
+    return (FALSE);
+  }
+
+  line = PopQueue (queue);
+  if (line == NULL) {
+    fprintf (stderr, "ERROR: queue %s is empty\n", argv[1]);
+    return (FALSE);
+  }
+
+  if (var == (char *) NULL) {
+    fprintf (stderr, "%s\n", line);
+  } else {
+    set_str_variable (argv[2], line);
+  }
+
+  free (line);
+  return (TRUE);
+}
+
Index: /trunk/Ohana/src/opihi/cmd.data/queueprint.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queueprint.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queueprint.c	(revision 4703)
@@ -0,0 +1,21 @@
+# include "data.h"
+
+int queueprint (int argc, char **argv) {
+  
+  Queue *queue;
+
+  if (argc != 2) {
+    fprintf (stderr, "USAGE: queueprint (name)\n");
+    return (FALSE);
+  }
+
+  queue = FindQueue (argv[1]);
+  if (queue == NULL) {
+    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
+    return (FALSE);
+  }
+
+  PrintQueue (GetOutfile(), queue);
+  return (TRUE);
+}
+
Index: /trunk/Ohana/src/opihi/cmd.data/queuepush.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queuepush.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queuepush.c	(revision 4703)
@@ -0,0 +1,46 @@
+# include "data.h"
+
+int queuepush (int argc, char **argv) {
+  
+  int N, Unique, Replace, Key;
+  Queue *queue;
+
+  Unique = FALSE;
+  if ((N = get_argument (argc, argv, "-uniq"))) {
+    remove_argument (N, &argc, argv);
+    Unique = TRUE;
+  }
+
+  Replace = FALSE;
+  if ((N = get_argument (argc, argv, "-replace"))) {
+    remove_argument (N, &argc, argv);
+    Replace = TRUE;
+  }
+
+  Key = -1;
+  if ((N = get_argument (argc, argv, "-key"))) {
+    remove_argument (N, &argc, argv);
+    Key = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 3) {
+    fprintf (stderr, "USAGE: queuepush (queue) (value) [-key N] [-uniq] [-replace]\n");
+    return (FALSE);
+  }
+
+  /* will create a queue if none exists */
+  queue = CreateQueue (argv[1]);
+
+  if (Unique) {
+    PushQueueUnique (queue, argv[2], Key);
+  }
+  if (Replace) {
+    PushQueueReplace (queue, argv[2], Key);
+  }
+  if (!Unique && !Replace) {
+    PushQueue (queue, argv[2]);
+  }
+  return (TRUE);
+}
+
Index: unk/Ohana/src/opihi/cmd.data/queues.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queues.c	(revision 4702)
+++ 	(revision )
@@ -1,48 +1,0 @@
-# include "data.h"
-
-int queuelist (int argc, char **argv) {
-  
-  if (argc != 1) {
-    fprintf (stderr, "USAGE: queuelist\n");
-    return (FALSE);
-  }
-
-  ListQueues ();
-  return (TRUE);
-}
-
-
-int queuesize (int argc, char **argv) {
-  
-  int N;
-  char *var;
-  Queue *queue;
-
-  var = (char *) NULL;
-  if ((N = get_argument (argc, argv, "-var"))) {
-    remove_argument (N, &argc, argv);
-    var = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
-  if (argc != 2) {
-    fprintf (stderr, "USAGE: queuesize (name) [-var variable]\n");
-    return (FALSE);
-  }
-
-  queue = FindQueue (argv[1]);
-  if (queue == NULL) {
-    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
-    return (FALSE);
-  }
-
-  if (var == (char *) NULL) {
-    fprintf (stderr, "Nlines: %d\n", queue[0].Nlines);
-    return (TRUE);
-  }
-
-  set_int_variable (var, queue[0].Nlines);
-  free (var);
-  return (TRUE);
-}
-
Index: /trunk/Ohana/src/opihi/cmd.data/queuesize.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/queuesize.c	(revision 4703)
+++ /trunk/Ohana/src/opihi/cmd.data/queuesize.c	(revision 4703)
@@ -0,0 +1,36 @@
+# include "data.h"
+
+int queuesize (int argc, char **argv) {
+  
+  int N;
+  char *var;
+  Queue *queue;
+
+  var = (char *) NULL;
+  if ((N = get_argument (argc, argv, "-var"))) {
+    remove_argument (N, &argc, argv);
+    var = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 2) {
+    fprintf (stderr, "USAGE: queuesize (name) [-var variable]\n");
+    return (FALSE);
+  }
+
+  queue = FindQueue (argv[1]);
+  if (queue == NULL) {
+    fprintf (stderr, "ERROR: queue %s not found\n", argv[1]);
+    return (FALSE);
+  }
+
+  if (var == (char *) NULL) {
+    fprintf (stderr, "Nlines: %d\n", queue[0].Nlines);
+    return (TRUE);
+  }
+
+  set_int_variable (var, queue[0].Nlines);
+  free (var);
+  return (TRUE);
+}
+