浏览代码

Switches over to using Legacy to differentiate thor

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 13 年之前
父节点
当前提交
57636d170a
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      common/workunit/workunit.cpp
  2. 1 1
      esp/services/ws_workunits/ws_workunitsHelpers.cpp
  3. 1 1
      esp/smc/SMCLib/TpWrapper.cpp

+ 2 - 2
common/workunit/workunit.cpp

@@ -3827,11 +3827,11 @@ public:
                 if (clusterWidth && (ts!=clusterWidth)) 
                     throw MakeStringException(WUERR_MismatchClusterSize,"CEnvironmentClusterInfo: mismatched thor sizes in cluster");
                 clusterWidth = ts;
-                bool islcr = thor.getPropBool("@LCR");
+                bool islcr = !thor.getPropBool("@Legacy");
                 if (i==0)
                     lcr = islcr;
                 else if (lcr!=islcr)
-                    throw MakeStringException(WUERR_MismatchThorType,"CEnvironmentClusterInfo: mismatched thor LCR in cluster");
+                    throw MakeStringException(WUERR_MismatchThorType,"CEnvironmentClusterInfo: mismatched thor Legacy in cluster");
             }
             platform.set(lcr ? "thorlcr" : "thor");
         }

+ 1 - 1
esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -918,7 +918,7 @@ bool WsWuInfo::getClusterInfo(IEspECLWorkunit &info, unsigned flags)
             VStringBuffer xpath("Software/ThorCluster[@name='%s']", clusterProcess.str());
             IPropertyTree *ptCluster = root->queryPropTree(xpath.str());
             if (ptCluster)
-                info.setThorLCR(ptCluster->getPropBool("LCR", false));
+                info.setThorLCR(!ptCluster->getPropBool("@Legacy", false));
         }
     }
     return true;

+ 1 - 1
esp/smc/SMCLib/TpWrapper.cpp

@@ -80,7 +80,7 @@ bool CTpWrapper::getClusterLCR(const char* clusterType, const char* clusterName)
     if (!pCluster)
         throw MakeStringException(ECLWATCH_CLUSTER_NOT_IN_ENV_INFO, "'%s %s' is not defined.", clusterType, clusterName);
 
-    bLCR = pCluster->getPropBool("LCR");
+    bLCR = !pCluster->getPropBool("@Legacy");
 
     return bLCR;
 }