Changeset 35055

Timestamp:

Jan 25, 2013, 4:45:55 PM (13 years ago)

Author:

eugene

Message:

add dvopsps objects ingest

Location:

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps

Files:

• Makefile (modified) (2 diffs)
• include/dvopsps.h (modified) (1 diff)
• src/dvopsps.c (modified) (1 diff)
• src/initialize_dvopsps.c (modified) (1 diff)
• src/insert_detections_dvopsps.c (modified) (1 diff)
• src/insert_objects_dvopsps.c (added)
• src/insert_objects_dvopsps_catalog.c (added)

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/Makefile

@@ -27 +27 @@
 $(SRC)/mysql_dvopsps.$(ARCH).o \
 $(SRC)/insert_skytable.$(ARCH).o \
+$(SRC)/insert_objects_dvopsps.$(ARCH).o \
+$(SRC)/insert_objects_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o
@@ -40 +42 @@
 $(SRC)/mysql_dvopsps.$(ARCH).o \
 $(SRC)/insert_skytable.$(ARCH).o \
+$(SRC)/insert_objects_dvopsps.$(ARCH).o \
+$(SRC)/insert_objects_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/include/dvopsps.h

@@ -42 +42 @@
 int    args_dvopsps_client                PROTO((int argc, char **argv));
        
+MYSQL *mysql_dvopsps_connect              PROTO((MYSQL *mysqlBase));
+
 int    insert_detections_dvopsps          PROTO(());
 int    insert_detections_dvopsps_parallel PROTO((SkyTable *sky));
 int    insert_detections_dvopsps_catalog  PROTO((Catalog *catalog, MYSQL *mysql));
       
-MYSQL *mysql_dvopsps_connect              PROTO((MYSQL *mysqlBase));
-
 int    insert_detections_mysql_commit     PROTO((IOBuffer *buffer, MYSQL *mysql));
 int    insert_detections_mysql_value      PROTO((IOBuffer *buffer, Average *average, Measure *measure));
 int    insert_detections_mysql_init       PROTO((IOBuffer *buffer));
+
+int    insert_objects_dvopsps             PROTO(());
+int    insert_objects_dvopsps_parallel    PROTO((SkyTable *sky));
+int    insert_objects_dvopsps_catalog     PROTO((Catalog *catalog, char *basename, MYSQL *mysql));
+                                          
+int    insert_objects_mysql_create_tables PROTO((char *basename, MYSQL *mysql));
+
+int    insert_objects_mysql_commit        PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, MYSQL *mysql));
+int    insert_objects_mysql_value         PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt));
+int    insert_objects_mysql_init          PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, char *basename));
 
 int    insert_skytable                    PROTO(());

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/dvopsps.c

@@ -11 +11 @@
   if (!strcasecmp (argv[1], "detections")) {
     status = insert_detections_dvopsps ();
+  }
+  if (!strcasecmp (argv[1], "objects")) {
+    status = insert_objects_dvopsps ();
   }
   if (!strcasecmp (argv[1], "skytable")) {

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/initialize_dvopsps.c

@@ -151 +151 @@
   fprintf (stderr, "    -v : verbose mode\n");
   fprintf (stderr, "    -region Rmin Rmax Dmin Dmax\n");
+  fprintf (stderr, "    -cpt filename\n");
   fprintf (stderr, "    -parallel : run in parallel mode\n");
   fprintf (stderr, "    -h     : this help list\n");

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

@@ -52 +52 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();