Changed reports so that when using localhost they don't add the versi…

…on number to the json path.
STEPBible · Sep 26, 2023 · dcf033e · dcf033e
1 parent 37cd7e5
commit dcf033e
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 15 deletions.
diff --git a/step-web/src/main/webapp/html/gospel_harmony.html b/step-web/src/main/webapp/html/gospel_harmony.html
@@ -198,7 +198,10 @@ <h2>Harmony of the Gospels</h2>
 	}
 	$.ajaxSetup({async: false});
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 		for (var i = 0; i < array.length; i ++ ) {

diff --git a/step-web/src/main/webapp/html/lectionary.html b/step-web/src/main/webapp/html/lectionary.html
@@ -298,7 +298,10 @@
     var earliest_date;
     var latest_date;
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     // set 'date' to be the first Advent of the current year (or of the reference year if looking ahead/back)
     $.getJSON(jsonPath + jsonFileName1 + ".json", function(array) {
         var i = 0;

diff --git a/step-web/src/main/webapp/html/mcheynes_readings.html b/step-web/src/main/webapp/html/mcheynes_readings.html
@@ -254,7 +254,9 @@ <h2 class="hTitle">R. M. M'Cheyne's 1, 2, or 3 Year Readings</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
 
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 

diff --git a/step-web/src/main/webapp/html/miracles.html b/step-web/src/main/webapp/html/miracles.html
@@ -195,7 +195,10 @@ <h2>Miracles in the Bible</h2>
 		else if (pos > 0) jsonFileName = tmp.substr(0,pos);
 	}
 	var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	$.ajaxSetup({async: false});
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {

diff --git a/step-web/src/main/webapp/html/names.html b/step-web/src/main/webapp/html/names.html
@@ -246,7 +246,10 @@ <h2>Names of God</h2>
     }
 
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 		for (var i = 0; i < array.length; i ++ ) {
             var clickText = "";

diff --git a/step-web/src/main/webapp/html/nt_letters.html b/step-web/src/main/webapp/html/nt_letters.html
@@ -220,7 +220,10 @@ <h2>New Testament Letter Structure</h2>
 	}
 	$.ajaxSetup({async: false});
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 		for (var i = 0; i < array.length; i ++ ) {

diff --git a/step-web/src/main/webapp/html/one_year_chrono_NT_related_OT.html b/step-web/src/main/webapp/html/one_year_chrono_NT_related_OT.html
@@ -261,7 +261,9 @@ <h2 class="hTitle">One Year Chronological NT with Related OT</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
 
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 

diff --git a/step-web/src/main/webapp/html/one_year_chrono_OT_and_NT_together.html b/step-web/src/main/webapp/html/one_year_chrono_OT_and_NT_together.html
@@ -237,7 +237,10 @@ <h2 class="hTitle">One Year Chronological OT and NT Together</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 
         var anchor = ' id="today"';

diff --git a/step-web/src/main/webapp/html/one_year_chrono_OT_related_NT.html b/step-web/src/main/webapp/html/one_year_chrono_OT_related_NT.html
@@ -261,7 +261,10 @@ <h2 class="hTitle">One Year Chronological OT with Related NT</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 
         var anchor = ' id="today"';

diff --git a/step-web/src/main/webapp/html/one_year_themes_chrono.html b/step-web/src/main/webapp/html/one_year_themes_chrono.html
@@ -261,7 +261,10 @@ <h2 class="hTitle">One Year Themes Collected Chronologically</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 
         var anchor = ' id="today"';

diff --git a/step-web/src/main/webapp/html/ot_in_nt.html b/step-web/src/main/webapp/html/ot_in_nt.html
@@ -197,7 +197,10 @@ <h2>Old Testament used in New Testament</h2>
 	}
 	$.ajaxSetup({async: false});
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 		for (var i = 0; i < array.length; i ++ ) {

diff --git a/step-web/src/main/webapp/html/ot_parallel.html b/step-web/src/main/webapp/html/ot_parallel.html
@@ -205,7 +205,10 @@ <h2>Old Testament parallels</h2>
 	}
 	$.ajaxSetup({async: false});
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {
 		for (var i = 0; i < array.length; i ++ ) {

diff --git a/step-web/src/main/webapp/html/parashot.html b/step-web/src/main/webapp/html/parashot.html
@@ -313,7 +313,10 @@
     var first_sabbath_of_year;
     var first_sabbath_of_next_year;
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
     // set 'date' to be the first Sabbath of the current year
     $.getJSON(jsonPath + jsonFileName1 + ".json", function(array) {
         var i = 0;

diff --git a/step-web/src/main/webapp/html/places.html b/step-web/src/main/webapp/html/places.html
@@ -226,7 +226,10 @@ <h2>Biblical locations</h2>
 		else if (pos > 0) jsonFileName = tmp.substr(0,pos);
 	}
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
+
 	$.ajaxSetup({async: false});
 	var tblRowHTML = ""
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {

diff --git a/step-web/src/main/webapp/html/two_year_chrono_OT_related_NT.html b/step-web/src/main/webapp/html/two_year_chrono_OT_related_NT.html
@@ -261,7 +261,9 @@ <h2 class="hTitle">Two Year Chronological OT with Related NT</h2>
     var clickText2 = '")>';
     var clickText3 = '</span>';
     var jsonPath =  urlPart1 + "/html/json/";
-    jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    if (urlPart1.indexOf("localhost") == -1 && urlPart1.indexOf("127.0.0.1") == -1) {
+        jsonPath += ("STEP_SERVER_VERSION_TOKEN".toLowerCase() !== "step_server_version_token") ? "STEP_SERVER_VERSION_TOKEN/" : "";
+    }
 
     $.getJSON(jsonPath + jsonFileName + ".json", function(array) {