rebaseline_server: make intermediate JSON specify base urls for diff images

gm/rebaseline_server/static/loader.js

 /*
  * Loader:
  * Reads GM result reports written out by results.py, and imports
  * them into $scope.extraColumnHeaders and $scope.imagePairs .
  */
 var Loader = angular.module(
     'Loader',
     ['ConstantsModule']
 );
 
@@ skipping 45 matching lines @@
   }
 );
 
 
 Loader.controller(
   'Loader.Controller',
     function($scope, $http, $filter, $location, $log, $timeout, constants) {
     $scope.constants = constants;
     $scope.windowTitle = "Loading GM Results...";
     $scope.resultsToLoad = $location.search().resultsToLoad;
-    $scope.loadingMessage = "Loading results from '" + $scope.resultsToLoad +
-        "', please wait...";
+    $scope.loadingMessage = "please wait...";
 
     /**
      * On initial page load, load a full dictionary of results.
      * Once the dictionary is loaded, unhide the page elements so they can
      * render the data.
      */
     $http.get($scope.resultsToLoad).success(
       function(data, status, header, config) {
         var dataHeader = data[constants.KEY__HEADER];
-        if (dataHeader[constants.KEY__HEADER__IS_STILL_LOADING]) {
+        if (dataHeader[constants.KEY__HEADER__SCHEMA_VERSION] !=
+            constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER) {
+          $scope.loadingMessage = "ERROR: Got JSON file with schema version "
+              + dataHeader[constants.KEY__HEADER__SCHEMA_VERSION]
+              + " but expected schema version "
+              + constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER;
+        } else if (dataHeader[constants.KEY__HEADER__IS_STILL_LOADING]) {
           // Apply the server's requested reload delay to local time,
           // so we will wait the right number of seconds regardless of clock
           // skew between client and server.
           var reloadDelayInSeconds =
               dataHeader[constants.KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE] -
               dataHeader[constants.KEY__HEADER__TIME_UPDATED];
           var timeNow = new Date().getTime();
           var timeToReload = timeNow + reloadDelayInSeconds * 1000;
           $scope.loadingMessage =
-              "Server is still loading results; will retry at " +
+              "server is still loading results; will retry at " +
               $scope.localTimeString(timeToReload / 1000);
           $timeout(
               function(){location.reload();},
               timeToReload - timeNow);
-        } else if (dataHeader[constants.KEY__HEADER__SCHEMA_VERSION] !=
-                   constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER) {
-          $scope.loadingMessage = "ERROR: Got JSON file with schema version "
-              + dataHeader[constants.KEY__HEADER__SCHEMA_VERSION]
-              + " but expected schema version "
-              + constants.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER;
         } else {
-          $scope.loadingMessage = "Processing data, please wait...";
+          $scope.loadingMessage = "processing data, please wait...";
 
           $scope.header = dataHeader;
           $scope.extraColumnHeaders = data[constants.KEY__EXTRACOLUMNHEADERS];
           $scope.imagePairs = data[constants.KEY__IMAGEPAIRS];
           $scope.imageSets = data[constants.KEY__IMAGESETS];
           $scope.sortColumnSubdict = constants.KEY__DIFFERENCE_DATA;
           $scope.sortColumnKey = constants.KEY__DIFFERENCE_DATA__WEIGHTED_DIFF;
 
           $scope.showSubmitAdvancedSettings = false;
           $scope.submitAdvancedSettings = {};
@@ skipping 55 matching lines @@
           // If any defaults were overridden in the URL, get them now.
           $scope.queryParameters.load();
 
           $scope.updateResults();
           $scope.loadingMessage = "";
           $scope.windowTitle = "Current GM Results";
         }
       }
     ).error(
       function(data, status, header, config) {
-        $scope.loadingMessage = "Failed to load results from '"
-            + $scope.resultsToLoad + "'";
+        $scope.loadingMessage = "FAILED to load.";
         $scope.windowTitle = "Failed to Load GM Results";
       }
     );
 
 
     //
     // Select/Clear/Toggle all tests.
     //
 
     /**
@@ skipping 604 matching lines @@
      */
     $scope.getImageDiffRelativeUrl = function(imagePair) {
       var before =
           imagePair[constants.KEY__IMAGE_A_URL] + "-vs-" +
           imagePair[constants.KEY__IMAGE_B_URL];
       return before.replace(/[^\w\-]/g, "_") + ".png";
     }
 
   }
 );