Index: trunk/Ohana/src/opihi/dvo/hosts.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/hosts.c	(revision 39539)
+++ trunk/Ohana/src/opihi/dvo/hosts.c	(revision 39540)
@@ -4,6 +4,7 @@
 
 enum {TEMP_NONE, TEMP_DVO_RESULTS, TEMP_DVO_LOG, 
-      TEMP_RELASTRO_CATALOG, TEMP_RELPHOT_CATALOG, TEMP_RELPHOT_LOG, TEMP_DVOPSPS_DET, TEMP_FIXSTKIDS_RESULTS,
-      TEMP_RELASTRO_CAT_FULL, TEMP_RELPHOT_CAT_FULL, TEMP_CHECKASTRO_CAT_FULL,
+      TEMP_RELASTRO_CATALOG, TEMP_RELASTRO_CAT_SUBSET, 
+      TEMP_RELPHOT_CATALOG, TEMP_RELPHOT_CAT_SUBSET, TEMP_RELPHOT_LOG, 
+      TEMP_DVOPSPS_DET, TEMP_FIXSTKIDS_RESULTS, TEMP_CHECKASTRO_CATALOG,
 };
 
@@ -68,23 +69,25 @@
     // log.rlpc.* (relphot logs)
     // relphot.catalog.subset.dat [no glob needed]
-    int TEMP_TYPE = TEMP_DVO_RESULTS;
+    int TEMP_TYPE = TEMP_NONE;
     if ((N = get_argument (argc, argv, "-type"))) {
-      TEMP_TYPE = TEMP_NONE;
       remove_argument (N, &argc, argv);
-      if (!strcasecmp(argv[N], "dvo.results"))       TEMP_TYPE = TEMP_DVO_RESULTS;
-      if (!strcasecmp(argv[N], "dvo.log"))           TEMP_TYPE = TEMP_DVO_LOG;
-      if (!strcasecmp(argv[N], "relastro.catalog"))  TEMP_TYPE = TEMP_RELASTRO_CATALOG;
-      if (!strcasecmp(argv[N], "relphot.catalog"))   TEMP_TYPE = TEMP_RELPHOT_CATALOG;
-      if (!strcasecmp(argv[N], "relastro.catfull"))  TEMP_TYPE = TEMP_RELASTRO_CAT_FULL;
-      if (!strcasecmp(argv[N], "checkastro.catfull"))TEMP_TYPE = TEMP_CHECKASTRO_CAT_FULL;
-      if (!strcasecmp(argv[N], "relphot.catfull"))   TEMP_TYPE = TEMP_RELPHOT_CAT_FULL;
-      if (!strcasecmp(argv[N], "relphot.log"))       TEMP_TYPE = TEMP_RELPHOT_LOG;
-      if (!strcasecmp(argv[N], "dvopsps.det"))       TEMP_TYPE = TEMP_DVOPSPS_DET;
-      if (!strcasecmp(argv[N], "fixstkids.results")) TEMP_TYPE = TEMP_FIXSTKIDS_RESULTS;
-      if (TEMP_TYPE == TEMP_NONE) {
-	gprint (GP_ERR, "USAGE: hosts purge-temp [-type (type)]\n");
-	gprint (GP_ERR, "  allowed types dvo.results, dvo.log, relphot.catalog, relphot.log, relphot.catfull, relastro.catalog, relastro.catfull, checkastro.catfull, dvopsps.det, fixstkids.results]\n");
-	return FALSE;
-      }
+      if (!strcasecmp(argv[N], "dvo.results"))        	     TEMP_TYPE = TEMP_DVO_RESULTS;
+      if (!strcasecmp(argv[N], "dvo.log"))            	     TEMP_TYPE = TEMP_DVO_LOG;
+      if (!strcasecmp(argv[N], "relphot.catalog"))    	     TEMP_TYPE = TEMP_RELPHOT_CATALOG;
+      if (!strcasecmp(argv[N], "relphot.catalog.subset"))    TEMP_TYPE = TEMP_RELPHOT_CAT_SUBSET;
+      if (!strcasecmp(argv[N], "relastro.catalog"))   	     TEMP_TYPE = TEMP_RELASTRO_CATALOG;
+      if (!strcasecmp(argv[N], "relastro.catalog.subset"))   TEMP_TYPE = TEMP_RELASTRO_CAT_SUBSET;
+      if (!strcasecmp(argv[N], "checkastro.catalog"))        TEMP_TYPE = TEMP_CHECKASTRO_CATALOG;
+      if (!strcasecmp(argv[N], "relphot.log"))        	     TEMP_TYPE = TEMP_RELPHOT_LOG;
+      if (!strcasecmp(argv[N], "dvopsps.det"))        	     TEMP_TYPE = TEMP_DVOPSPS_DET;
+      if (!strcasecmp(argv[N], "fixstkids.results"))  	     TEMP_TYPE = TEMP_FIXSTKIDS_RESULTS;
+    }
+    if (TEMP_TYPE == TEMP_NONE) {
+      gprint (GP_ERR, "USAGE: hosts purge-temp [-type (type)]\n");
+      gprint (GP_ERR, "  allowed types: dvo.results, dvo.log\n");
+      gprint (GP_ERR, "    relphot.catalog, relphot.catalog.subset, relphot.log\n");
+      gprint (GP_ERR, "    relastro.catalog, relastro.catalog.subset\n");
+      gprint (GP_ERR, "    checkastro.catalog, dvopsps.det, fixstkids.results\n");
+      return FALSE;
       remove_argument (N, &argc, argv);
     }
@@ -108,5 +111,7 @@
     
     if (argc != 2) {
-      gprint (GP_ERR, "USAGE: hosts purge-temp [-all-pid] [-old-pid PID] [-verbose] [-commit]\n");
+      gprint (GP_ERR, "USAGE: hosts purge-temp -type type [options] : delete all tempfiles for this shell\n");
+      gprint (GP_ERR, "   [-old-pid] [-all-pid] [-v] [-verbose]\n");
+      gprint (GP_ERR, "    [-commit] [-age hours]\n");
       return FALSE;
     }
@@ -119,25 +124,25 @@
       char name[DVO_MAX_PATH];
       if (ALL_PID) {
-	if (TEMP_TYPE == TEMP_DVO_RESULTS)     	 snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.fits", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_DVO_LOG)         	 snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.fits.log", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELASTRO_CATALOG)  snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.subset.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELPHOT_CATALOG) 	 snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.subset.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELPHOT_LOG)     	 snprintf (name, DVO_MAX_PATH, "%s/log.rlpc.*", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELASTRO_CAT_FULL) snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.?????.?????.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_CHECKASTRO_CAT_FULL) snprintf (name, DVO_MAX_PATH, "%s/checkastro.catalog.?????.?????.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELPHOT_CAT_FULL)	 snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.?????.?????.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_DVOPSPS_DET)     	 snprintf (name, DVO_MAX_PATH, "%s/dvopsps.*.det.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_FIXSTKIDS_RESULTS) snprintf (name, DVO_MAX_PATH, "%s/fixstkids.results.*.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_DVO_RESULTS)     	   snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.fits", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_DVO_LOG)         	   snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.fits.log", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELPHOT_CATALOG)	   snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.?????.?????.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELPHOT_CAT_SUBSET)  snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.subset.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELPHOT_LOG)     	   snprintf (name, DVO_MAX_PATH, "%s/log.rlpc.*", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELASTRO_CATALOG)    snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.?????.?????.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELASTRO_CAT_SUBSET) snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.subset.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_CHECKASTRO_CATALOG)  snprintf (name, DVO_MAX_PATH, "%s/checkastro.catalog.?????.?????.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_DVOPSPS_DET)     	   snprintf (name, DVO_MAX_PATH, "%s/dvopsps.*.det.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_FIXSTKIDS_RESULTS)   snprintf (name, DVO_MAX_PATH, "%s/fixstkids.results.*.dat", table->hosts[i].pathname);
       } else {
-	if (TEMP_TYPE == TEMP_DVO_RESULTS)     	 snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_DVO_LOG)         	 snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits.log", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_RELASTRO_CATALOG)  snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.subset.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELPHOT_CATALOG) 	 snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.subset.dat", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELPHOT_LOG)     	 snprintf (name, DVO_MAX_PATH, "%s/log.rlpc.*", table->hosts[i].pathname);
-	if (TEMP_TYPE == TEMP_RELASTRO_CAT_FULL) snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_CHECKASTRO_CAT_FULL) snprintf (name, DVO_MAX_PATH, "%s/checkastro.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_RELPHOT_CAT_FULL)	 snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_DVOPSPS_DET)     	 snprintf (name, DVO_MAX_PATH, "%s/dvopsps.%05d.*.det.dat", table->hosts[i].pathname, PID);
-	if (TEMP_TYPE == TEMP_FIXSTKIDS_RESULTS) snprintf (name, DVO_MAX_PATH, "%s/fixstkids.results.%05d.*.dat", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_DVO_RESULTS)     	   snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_DVO_LOG)         	   snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits.log", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_RELPHOT_CATALOG)	   snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_RELPHOT_CAT_SUBSET)  snprintf (name, DVO_MAX_PATH, "%s/relphot.catalog.subset.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELPHOT_LOG)     	   snprintf (name, DVO_MAX_PATH, "%s/log.rlpc.*", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_RELASTRO_CATALOG)    snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_RELASTRO_CAT_SUBSET) snprintf (name, DVO_MAX_PATH, "%s/relastro.catalog.subset.dat", table->hosts[i].pathname);
+	if (TEMP_TYPE == TEMP_CHECKASTRO_CATALOG)  snprintf (name, DVO_MAX_PATH, "%s/checkastro.catalog.%05d.?????.dat", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_DVOPSPS_DET)     	   snprintf (name, DVO_MAX_PATH, "%s/dvopsps.%05d.*.det.dat", table->hosts[i].pathname, PID);
+	if (TEMP_TYPE == TEMP_FIXSTKIDS_RESULTS)   snprintf (name, DVO_MAX_PATH, "%s/fixstkids.results.%05d.*.dat", table->hosts[i].pathname, PID);
       }
       if (VERBOSE) gprint (GP_ERR, "checking %s\n", name);