Giancarlo Voci 8 years ago
parent
commit
0eaa3ab520
4 changed files with 18 additions and 7 deletions
  1. 9 2
      cfg/config - dimatec.ini
  2. 1 1
      cfg/config.bin
  3. 7 3
      src/Modules/Dimatec/MigrationData.php
  4. 1 1
      ui/icamcontrol.tpl

+ 9 - 2
cfg/config - dimatec.ini

@@ -23,16 +23,23 @@ ICON_LOGOUT={{@BASEURL}}/ui/images/logout.png
 CUSTOMERNAME=dimatec
 CUSTOMERNAME=dimatec
 
 
 [CORE.fb]
 [CORE.fb]
-host=192.168.0.73
-;host=192.168.1.140
+; Production
+;host=192.168.0.73
+host=192.168.1.140
 port=50443
 port=50443
+; Server TEST
 key=C0000000000011474023057
 key=C0000000000011474023057
 pass=ZrgzkvJrOKnNSCnPnGz3u{A6eHSNXVvs
 pass=ZrgzkvJrOKnNSCnPnGz3u{A6eHSNXVvs
+; Production
+;key=C0000000000011538407590
+;pass=BI5C5YFd3Bs4hvlPHGux5JoW2ZfuUdxj
 
 
 [VERTICALSTORAGE]
 [VERTICALSTORAGE]
 ; Magazzino verticale ICAM
 ; Magazzino verticale ICAM
 MV_ADDRESS=192.168.0.39
 MV_ADDRESS=192.168.0.39
+; VM TEST
 ;MV_ADDRESS=192.168.253.130
 ;MV_ADDRESS=192.168.253.130
+; Production
 DB2_ADDRESS=192.168.0.100
 DB2_ADDRESS=192.168.0.100
 
 
 [FINDBOXSERVICE]
 [FINDBOXSERVICE]

+ 1 - 1
cfg/config.bin

@@ -1 +1 @@
-eJx1kWtvmzAUhr9b8n9A0T5smsYl5NrI0gi4QMtNXKJoUYUIcQgqwRRI1ibKf59J0+1LhwQy9vseP+85q6yg66RoniBQotC1XEVDvaZOhR4EqqIamENc6EcYgshEh1yAQMPzSEd9CLCjuprp6KgXhfc/JsxgmLphsTdEW1aSQPCg+Dx5rfKaoPO5zffk67fvsjSUR6IoXi6sVuCg3v6teSnudrRpUUHTpOhWs4rWLZJlcTTbrMtkTxDdF3n5zC7ZrA8NqVFNadv9VEnToCxPyjSpCwrB7Lbl2vp0MqHbyRcIPMOLPSU0kHonlFlevgrVrhp3H0bHMG1lGc8t03mMQ9PGcYBVJPVFCFg1zkvaHQRzJcCRbyHhHQOCwAyxo9gYafk+aUkKgeXqbqxGQeja2Gdxf948l4vA+sZUGWmEm9qiGeWrMoPAVF0n7qxR+D9PwcSH9l3eEQWkIGnL/d7l6Y5LD01L96Tm0oKl5kiZrAuW6IPjirj5QIRgpbo+5rdrNu5rw6Vpn5dGE17ipQELfO36UBwMZAieyRtSxX+PJA3GA7Evi8MxE3Yt/lVnp+fjQ+0+lk6gll6pn+TDWRkRI3CWi2NzvXCB/dBUFYvx+IqOn7oEdpIlp1NeUu5I6jZnMycc09hsEotY0TQfB8FfNJGXp8z0yUl/KPOSzLC1ef8TmyReR7i6Nx1t7i4D7C9MtQMILIy9btJIguAPm/zf4Q==
+eJx1UutvmzAc/G7J/wOK9mHTNAIB8mhkaQRcQssj4pF1raqIEIewEpzyyNJU+d9naKo92iGBsHV3vjv/7pKMLqOsvIdADQPXclUddcoi7nYg0FRtijnEBV6IIQhNVKddCHQ8CQ3UgwA7mqubjoE6YXD5ZcgIU9OYWuwN0JpJEgiuVI8nh11aEPT8XKVb8vHTZ0lUpL4gCKcT0/Id1Nk+lY/ZxYaWFcpoHGXN33hHiwpJktAfr5Z5tCWIbrM0f2CHrJZ1SQpUUFo1i11UlihJozyOioxCMD5vubYxGg7pevgBgtl0tpipwRRpF908SfNDd7fZDZoPc8ds2urNYmKZzvUiMG288LGGxJ4AAVPjZlG1gWCi+jj0LNR9sQGBbwbYUW2M9HQbVSSGwHINd6GFfuDa2GNxv545p1OX9cZQCSm7Z7RFE8rv8gQCU3OdRUMNg/9xMgauqxd448gnGYkr7ucmjTdcXJcV3ZKCizOWmiN5tMxYolcfrcXVq0UI7jTXw/x6ed9GK+iqjquU5mzV9i+OerzYH/ICP5Ag+GtL5EWZVdLeiyLIsvRipdizswPsBxA8kCekCb8fUZQHstCTBGXAeM2d3BbJ8WF/VbjXueNr+Sw3jlL9rPbJ1Hdu5vvyjam3koo0lIWBMmJWxq3mxFQ05fvlSpqU8mafzaZGfVCu6Lfe7boOV4cfbeo59gJTUy1WiqcauE1vR0l0PKY55ViEKmWDRziGsdk4zBeqrnvY9/8oRBo1pLl9Djt+B9RTJF6UhH9T6JPeO3qi0A7Y3aXp6BP3xsfe3NQaZ76F8ayZQyRC8Ath6wyF

+ 7 - 3
src/Modules/Dimatec/MigrationData.php

@@ -96,9 +96,13 @@ class MigrationData
    */
    */
   public function RollbackPendingMissionsToNew()
   public function RollbackPendingMissionsToNew()
   {
   {
-    $this->query(
-      "UPDATE SMEDAT_DIM.INTMAV0F SET MXSTAT=" . MigrationData::STATUS_NEW . " WHERE MXSTAT=" . MigrationData::STATUS_PENDING
-    );
+    // Stranamente se non facci oquesto count pdostatement genera un server error 500 intrappabile!!
+    $pendingCount = count($this->query('SELECT * FROM SMEDAT_DIM.INTMAV0F WHERE MXSTAT=' . MigrationData::STATUS_PENDING));
+    if ($pendingCount > 0) {
+      $this->query(
+        "UPDATE SMEDAT_DIM.INTMAV0F SET MXSTAT=" . MigrationData::STATUS_NEW . " WHERE MXSTAT=" . MigrationData::STATUS_PENDING
+      );
+    }
   }
   }
 
 
   /**
   /**

+ 1 - 1
ui/icamcontrol.tpl

@@ -16,7 +16,7 @@
 <div class="container-fluid" style="position: absolute; top: 0; bottom: 0">
 <div class="container-fluid" style="position: absolute; top: 0; bottom: 0">
 	<div class="row h-100">
 	<div class="row h-100">
 		<div class="col h-100">
 		<div class="col h-100">
-			<iframe class="h-100 w-100" src="http://localhost/omlink"></iframe>
+			<iframe class="h-100 w-100" src="{{@BASEURL}}"></iframe>
 		</div>
 		</div>
 		<div class="col h-100">
 		<div class="col h-100">
 			<iframe class="h-100 w-100" src="http://{{@VERTICALSTORAGE.MV_ADDRESS}}/"></iframe>
 			<iframe class="h-100 w-100" src="http://{{@VERTICALSTORAGE.MV_ADDRESS}}/"></iframe>