Changeset 37495

Timestamp:

Oct 17, 2014, 5:50:02 PM (12 years ago)

Author:

eugene

Message:

add function to dvorepair to remove a list of extern_ids

Location:

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge

Files:

• Makefile (modified) (1 diff)
• include/dvomerge.h (modified) (2 diffs)
• src/ReadDeleteListExternID.c (added)
• src/dvorepair.c (modified) (2 diffs)
• src/dvorepairDeleteImagesByExternID.c (added)
• src/myIndex.c (added)

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/Makefile

@@ -122 +122 @@
 $(SRC)/dvorepairImagesVsMeasures.$(ARCH).o \
 $(SRC)/dvorepairDeleteImageList.$(ARCH).o \
+$(SRC)/dvorepairDeleteImagesByExternID.$(ARCH).o \
+$(SRC)/dvorepairDeleteImagesByExternID.$(ARCH).o \
 $(SRC)/dvorepairFixImages.$(ARCH).o \
 $(SRC)/psps_ids.$(ARCH).o \
 $(SRC)/LoadImages.$(ARCH).o \
 $(SRC)/ReadDeleteList.$(ARCH).o \
+$(SRC)/ReadDeleteListExternID.$(ARCH).o \
+$(SRC)/myIndex.$(ARCH).o \
 $(SRC)/match_image.$(ARCH).o \
 $(SRC)/help.$(ARCH).o \

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/include/dvomerge.h

@@ -45 +45 @@
 SkyRegion UserPatch;  // used by MODE CAT
 
+# ifndef MAX_INT
+# define MAX_INT 2147483647
+# endif
+
+typedef struct {
+  int minID;
+  int maxID;
+  int *index;
+  int Nindex;
+  int NINDEX;
+} myIndexType;
+
 typedef struct {
   unsigned int Nmap;
@@ -200 +212 @@
 int dvoCreateID (char *catdir);
 
+myIndexType *myIndexInit ();
+int myIndexFree (myIndexType *myIndex);
+int myIndexUpdateLimits (myIndexType *myIndex, int value);
+int myIndexSetRange (myIndexType *myIndex);
+int myIndexSetEntry (myIndexType *myIndex, int value, int entry);
+int myIndexGetEntry (myIndexType *myIndex, int value);
+
+int dvorepairDeleteImagesByExternID (int argc, char **argv);
+int RepairTableCPT_V1(char *cptFilenameSrc, char *cptFilenameTgt, char *cpsFilenameSrc, char *cpsFilenameTgt, Measure *measure, off_t Nmeasure, Image *image, off_t Nimage, myIndexType *imageIDindex, char catformat);
+int *ReadDeleteListExternID(char *filename, int *nindex);

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/dvorepair.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  fprintf (stderr, "this program needs to be updated to load old format Measure tables (pre PV1_V5) in which dR,dD are saved, not R,D\n");
-  fprintf (stderr, "reminder: relastro can re-construct R,D from X,Y; FtableToMeasure and vice versa could just NAN those values\n");
-  exit (2);
+  // fprintf (stderr, "this program needs to be updated to load old format Measure tables (pre PV1_V5) in which dR,dD are saved, not R,D\n");
+  // fprintf (stderr, "reminder: relastro can re-construct R,D from X,Y; FtableToMeasure and vice versa could just NAN those values\n");
+  // exit (2);
 
   dvorepair_help(argc, argv);
@@ -13 +13 @@
   if (!strcmp(argv[1], "-images-vs-measures")) dvorepairImagesVsMeasures(argc, argv);
   if (!strcmp(argv[1], "-delete-image-list")) dvorepairDeleteImageList(argc, argv);
+  if (!strcmp(argv[1], "-delete-images-by-extern-id")) dvorepairDeleteImagesByExternID(argc, argv);
   if (!strcmp(argv[1], "-fix-images")) dvorepairFixImages(argc, argv);
   dvorepair_help(0, NULL);