Changeset 37833 for trunk/ippTools/share

Timestamp:

Jan 12, 2015, 12:53:36 PM (12 years ago)

Author:

eugene

Message:

merging changes from ipp-pv3-20140717 (via branches/eam_branches/ipp-pv3-20140717-merge)

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• laptool_exposures.sql (modified) (1 prop)
• pxadmin_create_tables.sql (modified) (1 diff)
• remotetool_definebyquery_cam.sql (modified) (1 diff)
• remotetool_definebyquery_chip.sql (modified) (2 diffs)
• remotetool_definebyquery_stack.sql (modified) (1 diff)
• remotetool_definebyquery_staticsky.sql (copied) (copied from branches/eam_branches/ipp-pv3-20140717-merge/ippTools/share/remotetool_definebyquery_staticsky.sql )
• remotetool_definebyquery_warp.sql (modified) (1 diff)
• remotetool_doneprep.sql (copied) (copied from branches/eam_branches/ipp-pv3-20140717-merge/ippTools/share/remotetool_doneprep.sql )
• remotetool_listcomponent.sql (copied) (copied from branches/eam_branches/ipp-pv3-20140717-merge/ippTools/share/remotetool_listcomponent.sql )

trunk/ippTools/share/Makefile.am

@@ -524 +524 @@
         remotetool_definebyquery_warp.sql \
         remotetool_definebyquery_stack.sql \
+        remotetool_definebyquery_staticsky.sql \
         remotetool_dropcomponent.sql \
+        remotetool_listcomponent.sql \
+        remotetool_doneprep.sql \
         remotetool_updatepoll.sql

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -2385 +2385 @@
     remote_id BIGINT,
     stage_id  BIGINT,
+    jobs      INT
+    state     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255),
     KEY (stage_id),
     FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)

trunk/ippTools/share/remotetool_definebyquery_cam.sql

@@ -11 +11 @@
 LEFT JOIN
 
-(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state 
-   FROM remoteRun 
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'camera'
+remoteRun.stage = 'camera' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R

trunk/ippTools/share/remotetool_definebyquery_chip.sql

@@ -11 +11 @@
 LEFT JOIN
 
-(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state 
-   FROM remoteRun 
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'chip'
+remoteRun.stage = 'chip' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R
@@ -24 +24 @@
 
 
-       
+

trunk/ippTools/share/remotetool_definebyquery_stack.sql

@@ -15 +15 @@
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'stack'
+remoteRun.stage = 'stack' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R

trunk/ippTools/share/remotetool_definebyquery_warp.sql

@@ -17 +17 @@
    JOIN remoteComponent USING (remote_id)
 WHERE
-remoteRun.stage = 'warp'
+remoteRun.stage = 'warp' and remoteComponent.state != 'retry'
 -- where hook %s
 ) AS R