diff --git a/config/app.config b/config/app.config index 7c1b9bf..47879b0 100644 --- a/config/app.config +++ b/config/app.config @@ -2,13 +2,13 @@ // adjustable application runtime properties //--------------------------------------------- BuildMajor = 2025 -BuildMinor = 4 -BuildRev = 2 +BuildMinor = 5 +BuildRev = 0 BuildNumber = 0 // NB: the BuildType is overridden in the environment-specific settings below. BuildType = "Development" -firefly.tag.name = "release-2025.4.2" +firefly.tag.name = "release-2025.5.2" mail.transport.protocol = "smtp" mail.smtp.host = "mail.ncsa.illinois.edu" diff --git a/src/suit/js/SUIT.js b/src/suit/js/SUIT.js index 4988e6c..35ac0d1 100644 --- a/src/suit/js/SUIT.js +++ b/src/suit/js/SUIT.js @@ -298,6 +298,7 @@ let options = { ], label: 'Rubin Featured MOC ' }, + adhocMocIncludeAdditionSources: '', }, // workspace: {showOptions: true}, searchActions : [ diff --git a/src/suit/test/edu/caltech/ipac/firefly/server/query/LSSTDbServTest.java b/src/suit/test/edu/caltech/ipac/firefly/server/query/LSSTDbServTest.java index 6061644..073508c 100644 --- a/src/suit/test/edu/caltech/ipac/firefly/server/query/LSSTDbServTest.java +++ b/src/suit/test/edu/caltech/ipac/firefly/server/query/LSSTDbServTest.java @@ -17,6 +17,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -87,7 +88,7 @@ public void testCatalogQueries() { private static boolean getJsonData(String query) { try { - String sql = "QUERY=" + URLEncoder.encode(query, "UTF-8"); + String sql = URLEncoder.encode(query, "UTF-8"); String url = LSSTQuery.getDbservURL(); File file = File.createTempFile("lssttest", "json"); @@ -96,7 +97,8 @@ private static boolean getJsonData(String query) { requestHeader.put("Accept", "application/json"); long cTime = System.currentTimeMillis(); - FileInfo fileData = URLDownload.getDataToFileUsingPost(new URL(url), sql, null, requestHeader, file, null, 180); + var postParams= Collections.singletonMap("QUERY", sql); + FileInfo fileData = URLDownload.getDataToFileUsingPost(new URL(url), postParams, null, requestHeader, file, null, 180); ConfigTest.LOG.info("SQL query took " + (System.currentTimeMillis() - cTime) + "ms"); ConfigTest.LOG.info(query);