Changeset 37672 for trunk/Ohana

Timestamp:

Nov 25, 2014, 3:59:19 AM (12 years ago)

Author:

eugene

Message:

added forced_warp_objects

Location:

trunk/Ohana/src/dvopsps

Files:

• Makefile (modified) (2 diffs)
• include/dvopsps.h (modified) (1 diff)
• src/dvopsps.c (modified) (1 diff)
• src/dvopsps_client.c (modified) (1 diff)
• src/initialize_dvopsps.c (modified) (1 diff)
• src/insert_FWobjects_dvopsps.c (added)
• src/insert_FWobjects_dvopsps_catalog.c (added)

trunk/Ohana/src/dvopsps/Makefile

@@ -30 +30 @@
 $(SRC)/insert_objects_dvopsps.$(ARCH).o \
 $(SRC)/insert_objects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
+$(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o
@@ -46 +48 @@
 $(SRC)/insert_objects_dvopsps.$(ARCH).o \
 $(SRC)/insert_objects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
+$(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o

trunk/Ohana/src/dvopsps/include/dvopsps.h

@@ -102 +102 @@
                                           
 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_FWobjects_dvopsps             PROTO(());
+int    insert_FWobjects_dvopsps_parallel    PROTO((SkyList *sky));
+int    insert_FWobjects_dvopsps_catalog     PROTO((Catalog *catalog, char *basename, MYSQL *mysql));
+                                          
+int    insert_FWobjects_mysql_create_tables PROTO((char *basename, MYSQL *mysql));
+int    insert_FWobjects_mysql_init          PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, IOBuffer *cpy_buffer, char *basename));
+int    insert_FWobjects_mysql_value         PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, IOBuffer *cpy_buffer, Average *average, SecFilt *secfilt, int Nsecfilt, Lensobj *lensobj, int Nlensobj));
+int    insert_FWobjects_mysql_commit        PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, IOBuffer *cpy_buffer, MYSQL *mysql));
 
 int    insert_skytable                    PROTO(());

trunk/Ohana/src/dvopsps/src/dvopsps.c

@@ -14 +14 @@
   if (!strcasecmp (argv[1], "objects")) {
     status = insert_objects_dvopsps ();
+  }
+  if (!strcasecmp (argv[1], "forced_warp_objects")) {
+    status = insert_FWobjects_dvopsps ();
   }
   if (!strcasecmp (argv[1], "skytable")) {

trunk/Ohana/src/dvopsps/src/dvopsps_client.c

@@ -22 +22 @@
     status = insert_objects_dvopsps ();
   }
+  if (!strcasecmp (argv[1], "forced_warp_objects")) {
+    status = insert_FWobjects_dvopsps ();
+  }
   if (status == -1) {
     fprintf (stderr, "invalid mode, should be : detections, skytable\n");

trunk/Ohana/src/dvopsps/src/initialize_dvopsps.c

@@ -21 +21 @@
   fprintf (stderr, "\n");
 
-  fprintf (stderr, " (mode) is one of detections, objects, skytable\n");
+  fprintf (stderr, " (mode) is one of detections, objects, forced_warp_objects, skytable\n");
 
   fprintf (stderr, "\n");