Changeset 35594 for branches/eam_branches/ipp-20130509/ippTools/share

Timestamp:

May 24, 2013, 1:37:30 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_find_rawexp.sql (modified) (1 diff)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/laptool_definerunbyrelease.sql (copied) (copied from trunk/ippTools/share/laptool_definerunbyrelease.sql )
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

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

@@ -449 +449 @@
         diffphottool_data.sql \
         laptool_definerun.sql \
+        laptool_definerunbyrelease.sql \
         laptool_exposures.sql \
         laptool_inactiveexp.sql \

branches/eam_branches/ipp-20130509/ippTools/share/chiptool_find_rawexp.sql

@@ -6 +6 @@
 FROM rawExp
 JOIN newExp using (exp_id)
-LEFT JOIN chipRun USING (exp_id)
+LEFT JOIN chipRun ON chipRun.exp_id = rawExp.exp_id -- JOIN hook %s
 WHERE
     rawExp.fault = 0