Changeset 29536

Timestamp:

Oct 24, 2010, 12:28:56 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100823

Files:

• . (modified) (1 prop)
• dbconfig (modified) (1 prop)
• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/minidvodb.md (modified) (1 diff)
• ippScripts (modified) (1 prop)
• ippScripts/Build.PL (modified) (1 diff)
• ippScripts/scripts/magic_process.pl (modified) (2 diffs)
• ippScripts/scripts/minidvodb_copy.pl (copied) (copied from trunk/ippScripts/scripts/minidvodb_copy.pl )
• ippTasks (modified) (1 prop)
• ippTasks/Makefile.am (modified) (1 diff)
• ippTasks/minidvodbcopy.pro (copied) (copied from trunk/ippTasks/minidvodbcopy.pro )
• ippTools (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql (copied) (copied from trunk/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql )
• ippTools/share/minidvodbtool_find_minidvodbcopy.sql (copied) (copied from trunk/ippTools/share/minidvodbtool_find_minidvodbcopy.sql )
• ippTools/share/minidvodbtool_queue_minidvodb_id.sql (copied) (copied from trunk/ippTools/share/minidvodbtool_queue_minidvodb_id.sql )
• ippTools/share/minidvodbtool_revertminidvodbcopy.sql (copied) (copied from trunk/ippTools/share/minidvodbtool_revertminidvodbcopy.sql )
• ippTools/src/Makefile.am (modified) (5 diffs)
• ippTools/src/minidvodbtool.c (copied) (copied from trunk/ippTools/src/minidvodbtool.c )
• ippTools/src/minidvodbtool.h (copied) (copied from trunk/ippTools/src/minidvodbtool.h )
• ippTools/src/minidvodbtoolConfig.c (copied) (copied from trunk/ippTools/src/minidvodbtoolConfig.c )
• ippTools/src/pxminidvodb.c (copied) (copied from trunk/ippTools/src/pxminidvodb.c )
• ippTools/src/pxminidvodb.h (copied) (copied from trunk/ippTools/src/pxminidvodb.h )

branches/eam_branches/ipp-20100823/dbconfig/changes.txt

@@ -1965 +1965 @@
 -- Version 1.1.66
 
+-- minidvodb copy table (for tracking copying of minidvodbs to other machines
+
+
+CREATE TABLE minidvodbCopy (
+    minidvodbcopy_id     BIGINT AUTO_INCREMENT,
+    minidvodb_id     BIGINT,
+    minidvodb_rsync_path VARCHAR(255) NOT NULL,
+    destination_host VARCHAR(255) NOT NULL,
+    fault  SMALLINT NOT NULL,
+    state   VARCHAR(64) NOT NULL,
+    epoch TIMESTAMP,
+    dtime FLOAT,
+    PRIMARY KEY(minidvodbcopy_id),
+    KEY(minidvodb_id),
+    FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;

branches/eam_branches/ipp-20100823/dbconfig/minidvodb.md

@@ -19 +19 @@
     fault           S16    0
 END
+
+minidvodbCopy METADATA
+    minidvodbcopy_id    S64 0
+    minidvodb_id    S64    0
+    minidvodb_rsync_path   STR    255
+    destination_host       STR    255
+    fault           S16    0
+    state           STR    64
+    epoch           UTC    0001-01-01T00:00:00Z
+    dtime           F32    0.0
+END

branches/eam_branches/ipp-20100823/ippScripts/Build.PL

@@ -64 +64 @@
         scripts/minidvodb_createdb.pl
         scripts/minidvodb_merge.pl
+        scripts/minidvodb_copy.pl
         scripts/ippdb.pl
         scripts/ipp_cleanup.pl

branches/eam_branches/ipp-20100823/ippScripts/scripts/magic_process.pl

@@ -90 +90 @@
 
 # list of VerifyStreaks input and output files to copy to nebulous 
-my @verify_outputs = qw(
-clusterPos.txt
-duplicate.png
-mask.png
-original.png
-original.fits
-residual.png
-residual.fits
-clusters.list
+my %verify_outputs = (
+'clusterPos.txt' => 0,
+'duplicate.png' => 0,
+'mask.png' => 0,
+'original.png' => 0,
+'original.fits' => 0,
+'residual.png' => 0,
+'residual.fits' => 0,
+'clusters.list' => 1
 );
 
@@ -403 +403 @@
     if ($output_streaks and ($output_streaks ne $streaks_file)) {
         copy_to_nebulous($ipprc, $streaks_file, $output_streaks, 1);
-        foreach my $f (@verify_outputs) {
+        my $streaks_map = $outroot . ".streakMap";
+        my $output_streaks_map = $final_outroot . ".streakMap";
+        copy_to_nebulous($ipprc, $streaks_map, $output_streaks_map, 1);
+        foreach my $f (keys %verify_outputs) {
+            my $replicate = $verify_outputs{$f};
             my $src = "$baseroot.verify/${exp_id}_$f";
             my $dest = "$final_outroot.${f}";
-            copy_to_nebulous($ipprc, $src, $dest, 1);
+            copy_to_nebulous($ipprc, $src, $dest, $replicate);
         }
     } else {

branches/eam_branches/ipp-20100823/ippTasks/Makefile.am

@@ -34 +34 @@
         science.cleanup.pro \
         minidvodb.pro \
+        minidvodbcopy.pro \
         nightly_stacks.pro \
         burntool.pro \

branches/eam_branches/ipp-20100823/ippTools/share/Makefile.am

@@ -264 +264 @@
         magicdstool_torevert_warp.sql \
         magicdstool_torevert_diff.sql \
+        minidvodbtool_find_minidvodb_id_dvo.sql \
+        minidvodbtool_find_minidvodbcopy.sql \
+        minidvodbtool_revertminidvodbcopy.sql \
         pstamptool_completedreq.sql \
         pstamptool_datastore.sql \

branches/eam_branches/ipp-20100823/ippTools/src/Makefile.am

@@ -27 +27 @@
         receivetool \
         pubtool \
-        diffphottool
+        diffphottool \
+        minidvodbtool
 
 pkginclude_HEADERS = \
@@ -39 +40 @@
         pxdqstats.h
         pxmagic.h \
+        pxminidvodb.h \
         pxregister.h \
         pxspace.h \
@@ -73 +75 @@
         warptool.h \
         pubtool.h \
-        diffphottool.h
+        diffphottool.h \
+        minidvodbtool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -90 +93 @@
         pxdqstats.c \
         pxmagic.c \
+        pxminidvodb.c \
         pxregister.c \
         pxspace.c \
@@ -280 +284 @@
     diffphottoolConfig.c
 
+minidvodbtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+minidvodbtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+minidvodbtool_SOURCES = \
+    minidvodbtool.c \
+    minidvodbtoolConfig.c
+
 clean-local:
         -rm -f TAGS