Merge pull request #1255 from DennisHeimbigner/dap4proto.dmh

Fix handling of the dap4: protocol.

dap4/build.gradle

@@ -32,11 +32,9 @@ test {
   include 'dap4/test/TestParserCE.class'
   include 'dap4/test/TestRaw.class'
   include 'dap4/test/TestDap4Url.class'
-if(false) { // disable selected dap4 tests for now
   include 'dap4/test/TestRemote.class'
   include 'dap4/test/TestConstraints.class'
   include 'dap4/test/TestHyrax.class'
-}
 
   dependsOn('farmBeforeIntegrationTest')
   finalizedBy('farmAfterIntegrationTest')

dap4/src/main/java/dap4/core/util/XURI.java

@@ -265,6 +265,19 @@ public void insertQueryField(String key, String newval) {
     rebuildQuery();
   }
 
+  /**
+   * Allow fragment fields to be inserted
+   *
+   * @param key
+   * @param newval
+   * @return previous value or this value if key not set
+   */
+  public void insertFragmentField(String key, String newval) {
+    // Watch out in case there is no query
+    this.fragfields = insertAmpField(key, newval, parent.getFragment());
+    rebuildQuery();
+  }
+
   /**
    * Allow queryfields to be removed
    *

dap4/src/main/java/dap4/dap4lib/cdm/nc2/DapNetcdfFile.java

@@ -128,6 +128,13 @@ public DapNetcdfFile(String location, CancelTask cancelTask) throws IOException
     } catch (URISyntaxException use) {
       throw new IOException(use);
     }
+    // We need to convert the protocol to #dap4
+    if ("dap4".equalsIgnoreCase(xuri.getScheme())) {
+      xuri.setScheme("https"); // Note that this should be https, but
+                               // test.opendap.org still uses http; one
+                               // hopes that other servers are setup to
+                               // redirect http: to https:
+    }
     this.dsplocation = xuri.assemble(XURI.URLQUERY);
     cancel = (cancelTask == null ? nullcancel : cancelTask);