#241 - using baseurl of the remote server instead of local server

Former-commit-id: 9fb4be48834421c47788a9aa3f280546e6525612

3 files changed, 56 insertions, 8 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index e5d366c4..eda58e8a 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1028,8 +1028,11 @@ angular.module('zmApp.controllers')
                                     zmDebug ("portal  parsed is " + JSON.stringify(p));
 
                                     var st = "";
+                                    var baseurl = "";
+                                    
                                     st+= (s.scheme? s.scheme: p.scheme)+"://"; // server scheme overrides 
                                     
+                                    
                                     // if server doesn't have a protocol, what we want is in path
                                     if (!s.host) 
                                     {
@@ -1038,13 +1041,22 @@ angular.module('zmApp.controllers')
                                     }
                                     
                                     st+=s.host;
+                                    
+                                    
                                     if (p.port || s.port)
                                     {
                                         st+= (s.port ? ":"+s.port: ":"+p.port);
+                                        
                                     }
+                                    
+                                    baseurl = st;
+                                    
                                     st+= (s.path? s.path: p.path);
                                     monitors[i].Monitor.streamingURL = st;
+                                    monitors[i].Monitor.baseURL = baseurl;
+                                    
                                     zmDebug ("Streaming URL for Monitor " + i + " is " + monitors[i].Monitor.streamingURL );
+                                    zmDebug ("Base URL for Monitor " + i + " is " + monitors[i].Monitor.baseURL );
                                     
                                 }
                             }
@@ -1060,7 +1072,9 @@ angular.module('zmApp.controllers')
                                 monitors[i].Monitor.isAlarmed = false;
                                 monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
                                 monitors[i].Monitor.streamingURL = loginData.streamingurl;
+                                monitors[i].Monitor.baseURL = loginData.url;
 
+                                
 
                             }
                             d.resolve(monitors);
@@ -1343,6 +1357,31 @@ angular.module('zmApp.controllers')
             }
             return "(Unknown)";
         },
+        
+        getStreamingURL: function (id) {
+            var idnum = parseInt(id);
+            for (var i = 0; i < monitors.length; i++) {
+                if (parseInt(monitors[i].Monitor.Id) == idnum) {
+                    // console.log ("Matched, exiting getMonitorname");
+                    return monitors[i].Monitor.streamingURL;
+                }
+
+            }
+            return "(Unknown)";
+        },
+        
+        getBaseURL: function (id) {
+            var idnum = parseInt(id);
+            for (var i = 0; i < monitors.length; i++) {
+                if (parseInt(monitors[i].Monitor.Id) == idnum) {
+                    // console.log ("Matched, exiting getMonitorname");
+                    return monitors[i].Monitor.baseURL;
+                }
+
+            }
+            return "(Unknown)";
+        },
+        
 
     };
 }]);
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 28b64adc..27b1aee0 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -84,6 +84,7 @@ angular.module('zmApp.controllers')
         document.addEventListener("pause", onPause, false);
         //console.log("I got STATE PARAM " + $stateParams.id);
         $scope.id = parseInt($stateParams.id, 10);
+        
        // $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
 
@@ -121,7 +122,7 @@ angular.module('zmApp.controllers')
             title: ""
         };
         $scope.search = {
-            text: ""
+            
         };
         $scope.myfilter = "";
         $scope.eventCommands = eventCommands;
@@ -203,7 +204,7 @@ angular.module('zmApp.controllers')
                     .then(function (data) {
                        // console.log("EventCtrl Got events");
                         //var events = [];
-
+                        console.log ("********** MULTISERVER");
                         var myevents = data;
                         ZMDataModel.zmDebug("EventCtrl: success, got " + myevents.length + " events");
                         var loginData = ZMDataModel.getLogin();
@@ -214,7 +215,7 @@ angular.module('zmApp.controllers')
                                 idfound = false;
                                 for (var ii = 0; ii < $scope.monitors.length; ii++) {
                                     if ($scope.monitors[ii].Monitor.Id == myevents[i].Event.MonitorId) {
-
+                                        
                                         //console.log ( $scope.monitors[ii].Monitor.Id + " MATCHES " + myevents[i].Event.MonitorId);
                                         idfound = true;
                                         break;
@@ -223,6 +224,12 @@ angular.module('zmApp.controllers')
                             }
 
 
+                            myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL (myevents[i].Event.MonitorId);
+                            myevents[i].Event.baseURL = ZMDataModel.getBaseURL (myevents[i].Event.MonitorId);
+                            console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
+                            
+                            console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
+                            
                             myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
                             myevents[i].Event.ShowScrub = false;
                             myevents[i].Event.height = zm.eventsListDetailsHeight;
@@ -237,7 +244,7 @@ angular.module('zmApp.controllers')
                             var min = moment(str).format('mm');
                             var sec = moment(str).format('ss');
 
-                            myevents[i].Event.BasePath = loginData.url + "/events/" +
+                            myevents[i].Event.BasePath = myevents[i].Event.baseURL + "/events/" +
                                 myevents[i].Event.MonitorId + "/" +
                                 yy + "/" +
                                 mm + "/" +
@@ -797,7 +804,7 @@ angular.module('zmApp.controllers')
                         event.Event.DefaultVideo = "";
                     // grab video details
                     event.Event.video = {};
-                    var videoURL = loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;
+                    var videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;
 
                    // console.log("************** VIDEO IS " + videoURL);
                     event.Event.video.config = {
@@ -1258,7 +1265,7 @@ angular.module('zmApp.controllers')
             var min = moment(str).format('mm');
             var sec = moment(str).format('ss');
 
-            basePath = loginData.url + "/events/" +
+            basePath = event.Event.baseURL + "/events/" +
                 event.Event.MonitorId + "/" +
                 yy + "/" +
                 mm + "/" +
@@ -1472,6 +1479,7 @@ angular.module('zmApp.controllers')
 
                                         //console.log ( $scope.monitors[ii].Monitor.Id + " MATCHES " + myevents[i].Event.MonitorId);
                                         idfound = true;
+                                        
                                         break;
                                     }
                                 }
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index a98ad2a8..726cbc04 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -141,7 +141,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             $http({
                 method: 'POST',
                 /*timeout: 15000,*/
-                url: loginData.url + '/index.php',
+                url: $scope.commandURL + '/index.php',
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
                     //'Accept': '*/*',
@@ -660,7 +660,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         //$scope.singleImageQuality = 100;
         
         
-        
+        $scope.commandURL = $scope.currentEvent.Event.baseURL;
+        ZMDataModel.zmLog (">>>>>>>>>>>>>>>>>>ZMS url command is " + $scope.commandURL);
         
         currentEvent = $scope.currentEvent;