Changeset 33563 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gcat.c

Timestamp:

Mar 16, 2012, 2:14:22 PM (14 years ago)

Author:

eugene

Message:

rework dvo_client calls to pass the command via a file, not the cmd line (parens too complex)

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gcat.c (modified) (3 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gcat.c

@@ -3 +3 @@
 int gcat (int argc, char **argv) {
   
-  int i;
+  int i, N;
   struct stat filestat;
   double Ra, Dec, Radius;
@@ -9 +9 @@
   SkyList *skylist;
   void *Signal;
+
+  int ShowHost = FALSE;
+  if ((N = get_argument (argc, argv, "-host"))) {
+    remove_argument (N, &argc, argv);
+    ShowHost = TRUE;
+  }
+  int ShowBackup = FALSE;
+  if ((N = get_argument (argc, argv, "-backup"))) {
+    remove_argument (N, &argc, argv);
+    ShowBackup = TRUE;
+  }
+  int ShowFlags = FALSE;
+  if ((N = get_argument (argc, argv, "-flags"))) {
+    remove_argument (N, &argc, argv);
+    ShowFlags = TRUE;
+  }
 
   if ((argc != 3) && (argc != 4)) {
@@ -31 +47 @@
 
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
+    gprint (GP_ERR, "%3d %s", i, skylist[0].regions[i][0].name);
     if (stat (skylist[0].filename[i], &filestat) != -1) {
-      gprint (GP_ERR, "%3d %s *\n", i, skylist[0].regions[i][0].name);
+      gprint (GP_ERR, " *");
     } else {
-      gprint (GP_ERR, "%3d %s\n", i, skylist[0].regions[i][0].name);
+      gprint (GP_ERR, "  ");
     } 
+    if (ShowHost) {
+      gprint (GP_ERR, "  %3d", skylist[0].regions[i][0].hostID);
+    } else {
+      gprint (GP_ERR, "     ");
+    }
+    if (ShowBackup) {
+      gprint (GP_ERR, "  %3d", skylist[0].regions[i][0].backupID);
+    } else {
+      gprint (GP_ERR, "     ");
+    }
+    if (ShowFlags) {
+      gprint (GP_ERR, "  0x%04x", skylist[0].regions[i][0].hostFlags);
+    } else {
+      gprint (GP_ERR, "        ");
+    }
+    gprint (GP_ERR, "\n");
     set_str_variable ("CATNAME", skylist[0].filename[i]);
   }