Changeset 28181 for trunk/ippTools/share

Timestamp:

Jun 1, 2010, 3:09:47 PM (16 years ago)

Author:

Paul Price

Message:

Merging branches/haf_branches/ipp.20100512/ into trunk: addtool development to ingest sources into separate dvo catalogues and dvodb merging. (Committed by PAP for HAF)

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/addtool_checkminidvodbaddrun.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_checkminidvodbaddrun.sql )
• ippTools/share/addtool_find_minidvodbprocessed.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_find_minidvodbprocessed.sql )
• ippTools/share/addtool_find_minidvodbrun.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_find_minidvodbrun.sql )
• ippTools/share/addtool_find_minidvodbrun2.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_find_minidvodbrun2.sql )
• ippTools/share/addtool_find_pendingmergeprocess.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_find_pendingmergeprocess.sql )
• ippTools/share/addtool_find_processedexp.sql (modified) (1 diff)
• ippTools/share/addtool_queue_cam_id.sql (modified) (1 diff)
• ippTools/share/addtool_queue_minidvodbrun.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_queue_minidvodbrun.sql )
• ippTools/share/addtool_reset_faulted_minidvodbruns.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_reset_faulted_minidvodbruns.sql )
• ippTools/share/addtool_revertminidvodbprocessed.sql (copied) (copied from branches/haf_branches/ipp.20100512/ippTools/share/addtool_revertminidvodbprocessed.sql )

trunk/ippTools/share/Makefile.am

@@ -4 +4 @@
 
 dist_pkgdata_DATA = \
+     addtool_checkminidvodbaddrun.sql \
      addtool_donecleanup.sql \
      addtool_find_cam_id.sql \
      addtool_find_pendingexp.sql \
+     addtool_find_pendingmergeprocess.sql \
      addtool_find_processedexp.sql \
+     addtool_find_minidvodbprocessed.sql \
+     addtool_find_minidvodbrun.sql \
      addtool_pendingcleanupexp.sql \
      addtool_pendingcleanuprun.sql \
      addtool_queue_cam_id.sql \
+     addtool_queue_minidvodbrun.sql \
+     addtool_reset_faulted_minidvodbruns.sql \
      addtool_reset_faulted_runs.sql \
+     addtool_revertminidvodbprocessed.sql \
      addtool_revertprocessedexp.sql \
      camtool_donecleanup.sql \

trunk/ippTools/share/addtool_find_processedexp.sql

@@ -2 +2 @@
     addProcessedExp.*,
     addRun.workdir
-FROM addRun
-JOIN camProcessedExp
+FROM addProcessedExp
+JOIN addRun
+    USING(add_id)
+JOIN camRun
     USING(cam_id)
 JOIN chipRun

trunk/ippTools/share/addtool_queue_cam_id.sql

@@ -11 +11 @@
         '%s',           -- dvodb 
         '%s',           -- note
-        %d              -- image_only
+        %d,             -- image_only
+        %d,             -- minidvodb
+        '%s',           -- minidvodb_group 
+        '%s'            -- minidvodb_name
     FROM camRun
     WHERE