Changeset 35709

Timestamp:

Jun 24, 2013, 8:44:48 PM (13 years ago)

Author:

eugene

Message:

finish -dup-measures

Location:

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src

Files:

• args.c (modified) (2 diffs)
• delete_duplicate_measures.c (modified) (2 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/args.c

@@ -174 +174 @@
     MODE = MODE_DUP_MEASURES;
     remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
   }
   if ((N = get_argument (argc, argv, "-photcodes"))) {
@@ -250 +251 @@
      }*/
 
+  if (MODE == MODE_NONE) usage ();
+
   if (argc != 1) usage ();
   return (TRUE);

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_duplicate_measures.c

@@ -86 +86 @@
   }    
 
-  int i;
+  int i, j;
   for (i = 0; i < table->Nhosts; i++) {
+
+    if (sky->Nregions < table->Nhosts) {
+      // do any of the regions want this host?
+      int wantThisHost = FALSE;
+      for (j = 0; j < sky->Nregions; j++) {
+        if (HostTableTestHost (sky->regions[j], table->hosts[i].hostID)) {
+          wantThisHost = TRUE;
+          break;
+        }
+      }
+      if (!wantThisHost) {
+        // fprintf (stderr, "skip host %s\n", table->hosts[i].hostname);
+        continue;
+      }
+    }
 
     // ensure that the paths are absolute path names
@@ -100 +115 @@
 
     char tmpline[1024];
-    if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                    strcpy (command, tmpline); }
-    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
+    if (VERBOSE)    { snprintf (tmpline, 1024, "%s -v",      command);             strcpy (command, tmpline); }
+    if (VERBOSE2)   { snprintf (tmpline, 1024, "%s -vv",     command);             strcpy (command, tmpline); }
+    if (SINGLE_CPT) { snprintf (tmpline, 1024, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); }
+    if (UPDATE)     { snprintf (tmpline, 1024, "%s -update", command);             strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);