Changeset 34389 for branches/eam_branches/ipp-20120805/Ohana

Timestamp:

Sep 5, 2012, 3:28:36 PM (14 years ago)

Author:

eugene

Message:

new mode to create a database ID

Location:

branches/eam_branches/ipp-20120805/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/addstar.h (modified) (2 diffs)
• src/addstar.c (modified) (1 diff)
• src/args.c (modified) (4 diffs)

branches/eam_branches/ipp-20120805/Ohana/src/addstar/Makefile

@@ -47 +47 @@
 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/addstar.$(ARCH).o \
+$(SRC)/addstar_create_ID.$(ARCH).o \
 $(SRC)/airmass.$(ARCH).o \
 $(SRC)/args.$(ARCH).o \

branches/eam_branches/ipp-20120805/Ohana/src/addstar/include/addstar.h

@@ -59 +59 @@
 typedef struct sockaddr_in SockAddress;
 
-enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT};
+enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT, ADDSTAR_MODE_CREATE_ID};
 enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
 /* note: MEF implies CMF */
@@ -293 +293 @@
 // this is a gnu extension?? caution!
 void *memrchr(const void *s, int c, size_t n);
+int addstar_create_ID ();
 
 /** 

branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/addstar.c

@@ -27 +27 @@
   options = args (argc, argv, options);
 
+  if (options.mode == ADDSTAR_MODE_CREATE_ID) {
+    addstar_create_ID ();
+    exit (0);
+  }
+
   sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, TRUE, SKY_DEPTH, VERBOSE);
   if (sky == NULL) {

branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/args.c

@@ -32 +32 @@
   if ((N = get_argument (argc, argv, "-resort"))) {
     options.mode = ADDSTAR_MODE_RESORT;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-create-id"))) {
+    options.mode = ADDSTAR_MODE_CREATE_ID;
     remove_argument (N, &argc, argv);
   }
@@ -101 +105 @@
       if (options.mode == ADDSTAR_MODE_FAKEIMAGE) goto allow;
       if (options.mode == ADDSTAR_MODE_REFLIST) goto allow;
+      if (options.mode == ADDSTAR_MODE_CREATE_ID) goto allow;
       if (options.mode == ADDSTAR_MODE_REFCAT) {
           fprintf (stderr, "you have requested uploading from a catalog to the entire sky in one pass\n");
@@ -364 +369 @@
   }
 
+  if ((options.mode == ADDSTAR_MODE_CREATE_ID) && (argc == 1)) return (options);
   if ((options.mode == ADDSTAR_MODE_RESORT) && (argc == 1)) return (options);
   if (argc == 2) return (options);
@@ -378 +384 @@
   fprintf (stderr, "USAGE: addstar -fakeimage (ra) (dec) (theta) (name)\n");
   fprintf (stderr, "USAGE: addstar -resort (SkyRegion)\n");
+  fprintf (stderr, "USAGE: addstar -add-id\n");
   fprintf (stderr, "USAGE: addstar -ppm (filename)\n");
   exit (2);