Changeset 34041 for branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/Gpc1Db.pm

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/czartool/czartool/Gpc1Db.pm (modified) (4 diffs)

branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/Gpc1Db.pm

@@ -24 +24 @@
     elsif ($stage eq "warp") {${$joinTable}="warpSkyfile";}
     elsif ($stage eq "stack") {${$joinTable}="stackSumSkyfile";}
+    elsif ($stage eq "staticsky") {${$id} = "sky_id"; ${$joinTable}="staticskyResult";}
     elsif ($stage eq "diff") {${$joinTable}="diffSkyfile";}
     elsif ($stage eq "magic") {${$joinTable}="magicNodeResult";}
@@ -29 +30 @@
     elsif ($stage eq "dist") {${$joinTable}="distComponent";}
     elsif ($stage eq "pub") {${$joinTable}="publishDone";}
+    elsif ($stage eq "chipbackground") {${$id}="chip_bg_id"; ${$joinTable}="chipBackgroundImfile";}
     else {
 
@@ -51 +53 @@
     elsif ($stage eq "warp" ) {return "warpRun";}
     elsif ($stage eq "stack" ) {return "stackRun";}
+    elsif ($stage eq "staticsky" ) {return "staticskyRun";}
     elsif ($stage eq "diff" ) {return "diffRun";}
     elsif ($stage eq "magic" ) {return "magicRun";}
@@ -56 +59 @@
     elsif ($stage eq "dist" ) {return "distRun";}
     elsif ($stage eq "pub" ) {return "publishRun";}
+    elsif ($stage eq "chipbackground" ) {return "chipBackgroundRun";}
 
     return "ERROR";