code

libs/map_config.ini.php

@@ -12,12 +12,12 @@ if ($_SESSION['ONLINE_USER']['is_demo'] == "t") {
     $_CBP_DB['port'] = '5432';
     $_CBP_DB['type'] = 'postgres';
 } else {
-    $_CBP_DB['host'] = '192.168.8.82';
-    $_CBP_DB['username'] = 'ksmap';
-    $_CBP_DB['password'] = 'A876ctG$Fex!!';
-    $_CBP_DB['dbname'] = 'redant_online';
-    $_CBP_DB['port'] = '5437';
-    $_CBP_DB['type'] = 'postgres';
+    // $_CBP_DB['host'] = '192.168.8.82';
+    // $_CBP_DB['username'] = 'ksmap';
+    // $_CBP_DB['password'] = 'A876ctG$Fex!!';
+    // $_CBP_DB['dbname'] = 'redant_online';
+    // $_CBP_DB['port'] = '5437';
+    // $_CBP_DB['type'] = 'postgres';
 
     // $_CBP_DB['host'] = '192.168.0.121';
     // $_CBP_DB['username'] = 'root';
@@ -25,6 +25,17 @@ if ($_SESSION['ONLINE_USER']['is_demo'] == "t") {
     // $_CBP_DB['dbname'] = 'online_t_1125';
     // $_CBP_DB['port'] = '5434';
     // $_CBP_DB['type'] = 'postgres';
+
+    $_CBP_DB['host'] = '192.168.0.177';
+    $_CBP_DB['username'] = 'root';
+    $_CBP_DB['password'] = '123456';
+    if (!empty($_GET['_schemas'])) {
+        $_CBP_DB['dbname'] = 'redant_online_new2';
+    } else {
+        $_CBP_DB['dbname'] = 'redant_online_new2';
+    }
+    $_CBP_DB['port'] = '5433';
+    $_CBP_DB['type'] = 'postgres';
 }
 
 $mapdb_url = "host=" . $_CBP_DB['host'] . " port=" . $_CBP_DB['port'] . " dbname=" . $_CBP_DB['dbname'] . " user=" . $_CBP_DB['username'] . " password=" . $_CBP_DB['password'];
@@ -32,22 +43,4 @@ $mapdb = NewADOConnection($_CBP_DB['type']);
 $mapdb->Connect($mapdb_url) or die('Connect Database Error');
 $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 //$mapdb->Execute("set client_encoding to 'gbk'");
-
-//打開詳細頁面時指定模式
-if (!empty($_REQUEST['_schemas'])) {
-    $mapdb->Execute("SET search_path TO " . $_REQUEST['_schemas'] . ";");
-} elseif (!empty($_REQUEST['__schemas'])) {//部分report
-    $mapdb->Execute("SET search_path TO " . $_REQUEST['__schemas'] . ";");
-} else {
-    //超级管理员有没有选择数据库模式
-    if (!empty($_SESSION['_current_schemas'])) {
-        $mapdb->Execute("SET search_path TO " . $_SESSION['_current_schemas'] . ";");
-    } else {
-        if (empty($_SESSION['ONLINE_USER']['main_schemas'])) {
-            $mapdb->Execute("SET search_path TO public;");
-        } else {
-            $mapdb->Execute("SET search_path TO " . $_SESSION['ONLINE_USER']['main_schemas'] . ";");
-        }
-    }
-}
 ?>

main_new_version.php

@@ -540,7 +540,7 @@ switch ($action) {
         //           {"lng":"100.88333333","lat":"13.08333333","label":"Destination","infor":"LAEM CHABANG PORT,THAILAND","sort":"1","stime":null,"ptype":"pol"},
         //           {"lng":"-122.28640000","lat":"37.79784000","label":"Transfer","infor":"OAKLAND, CA, USA","sort":"2","stime":null,"ptype":"pod"}]';
         //$rss = json_decode($json,true);
-        global $mapdb;
+        ///global $mapdb;
         //查询线(包含所有的线)  空运不查询航线
         if ($transport_mode == "air"){
             $Line =array();

service/ocean_booking.class.php

@@ -129,6 +129,9 @@ class ocean_booking {
     }
 
     private function _booking_search() {
+        //分担查询
+        include ONLINE_ROOT . 'libs' . DS . 'map_config.ini.php';
+
         $cp = common::check_input($_POST ['cp']); //current_page
         $ps = common::check_input($_POST ['ps']); //ps
         if (empty($ps)){
@@ -220,7 +223,9 @@ class ocean_booking {
 
             error_log($sql_all_status );
 
-            $sql_all_status_data = common::excuteObjectSql($sql_all_status);
+            //$sql_all_status_data = common::excuteObjectSql($sql_all_status);
+            $sql_all_status_data =  $mapdb->GetRow($sql_all_status) or ( (!$mapdb->ErrorMsg()) or error_log(common::dbLog($mapdb, $sql_all_status), 0));
+
             $seach_rc = $sql_all_status_data['seach_rc'];
             $rc = $sql_all_status_data['rc'];
             $sea_rc = $sql_all_status_data['sea_rc'];
@@ -272,7 +277,8 @@ class ocean_booking {
                         color,transport_mode, bol_type, m_voyage as _m_voyage, m_vessel as _m_vessel," .
                         column::getInstance()->getSearchSqlForDisplay('Booking_Search') . " from public.kln_booking $ocean_dest_sql " . $sqlWhere . " order by $order_by limit " . $ps . " offset " . ($cp - 1) * $ps;
             
-            $rs = common::excuteListSql($sql);
+            //$rs = common::excuteListSql($sql);
+            $rs =  $mapdb->GetAll($sql) or ( (!$mapdb->ErrorMsg()) or error_log(common::dbLog($mapdb, $sql), 0));
             error_log("online_booking_search_SQL: ".$sql);
 
             //对查询的结果做特殊处理，比如要拼接某个值，合并值等

service/ocean_order.class.php

@@ -664,6 +664,9 @@ class ocean_order {
     * ocean order search
     */
     private function _ocean_search() {
+        //分担查询
+        include ONLINE_ROOT . 'libs' . DS . 'map_config.ini.php';
+
         $cp = common::check_input($_POST ['cp']); //current_page
         $ps = common::check_input($_POST ['ps']); //ps
         if (empty($ps))
@@ -884,7 +887,8 @@ class ocean_order {
             from public.kln_ocean". $sqlWhere_befrom_filterTag;
             error_log("online_ocean_search_All_Status: ".$sql);
 
-            $sql_all_status_data = common::excuteObjectSql($sql);
+            //$sql_all_status_data = common::excuteObjectSql($sql);
+            $sql_all_status_data =  $mapdb->GetRow($sql) or ( (!$mapdb->ErrorMsg()) or error_log(common::dbLog($mapdb, $sql), 0));
             $incoterms = explode("<$>", $sql_all_status_data['incoterm_str']);
             $IncotermsList = array();
             foreach($incoterms as $terms){
@@ -997,7 +1001,8 @@ class ocean_order {
                 end as \"Other refenrence No.\"
             from oo";
             
-            $rs = common::excuteListSql($sql);
+            //$rs = common::excuteListSql($sql);
+            $rs =  $mapdb->GetAll($sql) or ( (!$mapdb->ErrorMsg()) or error_log(common::dbLog($mapdb, $sql), 0));
             error_log("online_ocean_search_SQL: ".$sql);
             
             //对查询的结果做特殊处理，比如要拼接某个值，合并值等
@@ -1544,7 +1549,6 @@ class ocean_order {
     
     private function _ams_isf_log(){
         include ONLINE_ROOT . 'libs' . DS . 'ams_config.ini.php';
-        global $cbpdb;
         $ams_ss = $_POST['ams_ss'];
         $isf_ss = $_POST['isf_ss'];