svn commit: r889149 - in /incubator/stonehenge/trunk/stocktrader/php: business_service/order_processor_proxy.php config_service/config_svc.php

[chintana]

Author: chintana
Date: Thu Dec 10 09:02:46 2009
New Revision: 889149

URL: http://svn.apache.org/viewvc?rev=889149&view=rev
Log:
Fixing talking to the correct OPS endpoint for both MSSQL and MySQL.

Modified:
    
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
    incubator/stonehenge/trunk/stocktrader/php/config_service/config_svc.php

Modified: 
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php?rev=889149&r1=889148&r2=889149&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
 Thu Dec 10 09:02:46 2009
@@ -147,7 +147,7 @@
                                "OrderDataBean" => "OrderDataBean",
                                "SubmitOrder" => "SubmitOrder");
                                
-               if ($OPSConfig->GetBSConfigResult->Sec == "true")
+               if ( ($OPSConfig->GetBSConfigResult->Sec == "Y") || 
($OPSConfig->GetBSConfigResult->Sec == 1) )
                {
                        //This is the security information
                        $rec_cert = 
ws_get_key_from_file("../resources/keys/OPS.cert");

Modified: 
incubator/stonehenge/trunk/stocktrader/php/config_service/config_svc.php
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/config_service/config_svc.php?rev=889149&r1=889148&r2=889149&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/php/config_service/config_svc.php 
(original)
+++ incubator/stonehenge/trunk/stocktrader/php/config_service/config_svc.php 
Thu Dec 10 09:02:46 2009
@@ -55,7 +55,7 @@
         if ($result) {
             $client_config->GetClientConfigResult = new ClientConfigResponse();
                $dbval = $db->GetSQLValue($result);
-            $client_config->GetClientConfigResult->Sec = $dbval['sec'] ? 
"true" : "false";
+                   $client_config->GetClientConfigResult->Sec = $dbval['sec'];
             $client_config->GetClientConfigResult->BSName = 
$dbval['servicename'];
             $client_config->GetClientConfigResult->BS = $dbval['url'];    
         } 
@@ -96,11 +96,11 @@
         if ($ops) {
             $query = "SELECT sec, servicename, url FROM service WHERE 
servicename = '$ops'";
             $result = $db->ExecuteQuery ( $query );
-            
+
             if ($result) {
                 $bs_config->GetBSConfigResult = new BSConfigResponse ( );
-                $dbval = $db->GetSQLValue( $result );
-                $bs_config->GetBSConfigResult->Sec = ($dbval['sec'] == "true" 
|| $dbval['sec'] == "Y") ? "true" : "false";
+                $dbval = $db->GetSQLValue( $result );                
+                $bs_config->GetBSConfigResult->Sec = $dbval['sec'];
                 $bs_config->GetBSConfigResult->OPSName = $dbval['servicename'];
                 $bs_config->GetBSConfigResult->OPS = $dbval['url'];
                 
@@ -202,7 +202,7 @@
     if ($result) {
         for ($i = 0; $dbval = $db->GetSQLValue($result); $i++) {
             $locations->GetBSLocationsResult->ServiceLocation[$i] = new 
ServiceLocation();
-            $locations->GetBSLocationsResult->ServiceLocation[$i]->Sec = 
$dbval['sec'] ? "true" : "false";
+            $locations->GetBSLocationsResult->ServiceLocation[$i]->Sec = 
$dbval['sec'];
             $locations->GetBSLocationsResult->ServiceLocation[$i]->ServiceName 
= $dbval['servicename'];
             $locations->GetBSLocationsResult->ServiceLocation[$i]->ServiceURL 
= $dbval['url'];
         }
@@ -233,7 +233,7 @@
     if ($result) {
         for ($i = 0; $dbval = $db->GetSQLValue($result); $i++) {
             $locations->GetOPSLocationsResult->ServiceLocation[$i] = new 
ServiceLocation();
-            $locations->GetOPSLocationsResult->ServiceLocation[$i]->Sec = 
$dbval['sec'] ? "true" : "false";
+            $locations->GetOPSLocationsResult->ServiceLocation[$i]->Sec = 
$dbval['sec'];
             
$locations->GetOPSLocationsResult->ServiceLocation[$i]->ServiceName = 
$dbval['servicename'];
             $locations->GetOPSLocationsResult->ServiceLocation[$i]->ServiceURL 
= $dbval['url'];
         }