Merge remote-tracking branch 'origin/fieldmap.dmh' into multi-pull

2024-11-21 03:13:42 +08:00 · 2017-07-27 12:16:37 -06:00 · 2017-07-27 12:16:37 -06:00 · c88bc64bfa
commit c88bc64bfa
parent 44b82e8f1d e56e50413f
67 changed files with 43 additions and 62 deletions
--- a/dap4_test/CMakeLists.txt
+++ b/dap4_test/CMakeLists.txt
@ -2,7 +2,6 @@ SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})

 remove_definitions(-DDLL_EXPORT)

-
 ADD_SUBDIRECTORY(baseline)
 ADD_SUBDIRECTORY(baselineraw)
 ADD_SUBDIRECTORY(baselineremote)
--- a/dap4_test/baseline/CMakeLists.txt
+++ b/dap4_test/baseline/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/baseline/test_struct1.nc.d4d
+++ b/dap4_test/baseline/test_struct1.nc.d4d
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct1.nc.d4m
+++ b/dap4_test/baseline/test_struct1.nc.d4m
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct1.nc.d4p
+++ b/dap4_test/baseline/test_struct1.nc.d4p
@ -11,10 +11,7 @@
    </Structure>
  </Types>
  <Variables>
-    <Struct name="s" type="/s">
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
-    </Struct>
+    <Struct name="s" type="/s"/>
  </Variables>
  <Attribute name="_DAP4_Little_Endian" type="UInt8">
    <Value value="1"/>
--- a/dap4_test/baseline/test_struct_array.6.nc.d4d
+++ b/dap4_test/baseline/test_struct_array.6.nc.d4d
@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;
--- a/dap4_test/baseline/test_struct_array.6.nc.d4m
+++ b/dap4_test/baseline/test_struct_array.6.nc.d4m
@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;
--- a/dap4_test/baseline/test_struct_array.6.nc.d4p
+++ b/dap4_test/baseline/test_struct_array.6.nc.d4p
@ -17,8 +17,6 @@
    <Struct name="s" type="/s">
      <Dim name="/_Anonymous2"/>
      <Dim name="/_Anonymous2"/>
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
    </Struct>
  </Variables>
  <Attribute name="_dap4.ce" type="String">
--- a/dap4_test/baseline/test_struct_array.nc.d4d
+++ b/dap4_test/baseline/test_struct_array.nc.d4d
@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_array.nc.d4m
+++ b/dap4_test/baseline/test_struct_array.nc.d4m
@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_array.nc.d4p
+++ b/dap4_test/baseline/test_struct_array.nc.d4p
@ -18,8 +18,6 @@
    <Struct name="s" type="/s">
      <Dim name="/dx"/>
      <Dim name="/dy"/>
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
    </Struct>
  </Variables>
  <Attribute name="_DAP4_Little_Endian" type="UInt8">
--- a/dap4_test/baseline/test_struct_nested.nc.d4d
+++ b/dap4_test/baseline/test_struct_nested.nc.d4d
@ -14,7 +14,6 @@ types:
  }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_nested.nc.d4m
+++ b/dap4_test/baseline/test_struct_nested.nc.d4m
@ -14,7 +14,6 @@ types:
  }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_nested.nc.d4p
+++ b/dap4_test/baseline/test_struct_nested.nc.d4p
@ -19,10 +19,7 @@
    </Structure>
  </Types>
  <Variables>
-    <Struct name="x" type="/x">
-      <Map name="/x_field1.x"/>
-      <Map name="/x_field1.y"/>
-    </Struct>
+    <Struct name="x" type="/x"/>
  </Variables>
  <Attribute name="_DAP4_Little_Endian" type="UInt8">
    <Value value="1"/>
--- a/dap4_test/baseline/test_struct_type.nc.d4d
+++ b/dap4_test/baseline/test_struct_type.nc.d4d
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_type.nc.d4m
+++ b/dap4_test/baseline/test_struct_type.nc.d4m
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baseline/test_struct_type.nc.d4p
+++ b/dap4_test/baseline/test_struct_type.nc.d4p
@ -11,10 +11,7 @@
    </Structure>
  </Types>
  <Variables>
-    <Struct name="s" type="/s">
-      <Map name="/s.x"/>
-      <Map name="/s.y"/>
-    </Struct>
+    <Struct name="s" type="/s"/>
  </Variables>
  <Attribute name="_DAP4_Little_Endian" type="UInt8">
    <Value value="1"/>
--- a/dap4_test/baselineraw/CMakeLists.txt
+++ b/dap4_test/baselineraw/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/baselineraw/test_struct1.nc.dmp
+++ b/dap4_test/baselineraw/test_struct1.nc.dmp
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baselineraw/test_struct_array.6.nc.dmp
+++ b/dap4_test/baselineraw/test_struct_array.6.nc.dmp
@ -8,7 +8,6 @@ dimensions:
 	_Anonymous2 = 2 ;
 variables:
 	s_t s(_Anonymous2, _Anonymous2) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		string :_dap4.ce = "/s[0:2:3][0:1]" ;
--- a/dap4_test/baselineraw/test_struct_array.nc.dmp
+++ b/dap4_test/baselineraw/test_struct_array.nc.dmp
@ -9,7 +9,6 @@ dimensions:
 	dy = 3 ;
 variables:
 	s_t s(dx, dy) ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baselineraw/test_struct_nested.nc.dmp
+++ b/dap4_test/baselineraw/test_struct_nested.nc.dmp
@ -14,7 +14,6 @@ types:
  }; // x_t
 variables:
 	x_t x ;
-		string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baselineraw/test_struct_type.nc.dmp
+++ b/dap4_test/baselineraw/test_struct_type.nc.dmp
@ -6,7 +6,6 @@ types:
  }; // s_t
 variables:
 	s_t s ;
-		string s:_edu.ucar.maps = "/s.x", "/s.y" ;

 // global attributes:
 		:_DAP4_Little_Endian = 1UB ;
--- a/dap4_test/baselineremote/CMakeLists.txt
+++ b/dap4_test/baselineremote/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/cdltestfiles/CMakeLists.txt
+++ b/dap4_test/cdltestfiles/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/daptestfiles/CMakeLists.txt
+++ b/dap4_test/daptestfiles/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/daptestfiles/test_atomic_array.nc.dap
+++ b/dap4_test/daptestfiles/test_atomic_array.nc.dap
--- a/dap4_test/daptestfiles/test_atomic_array.syn.dap
+++ b/dap4_test/daptestfiles/test_atomic_array.syn.dap
--- a/dap4_test/daptestfiles/test_atomic_types.nc.dap
+++ b/dap4_test/daptestfiles/test_atomic_types.nc.dap
--- a/dap4_test/daptestfiles/test_atomic_types.syn.dap
+++ b/dap4_test/daptestfiles/test_atomic_types.syn.dap
--- a/dap4_test/daptestfiles/test_enum.nc.dap
+++ b/dap4_test/daptestfiles/test_enum.nc.dap
--- a/dap4_test/daptestfiles/test_enum_2.nc.dap
+++ b/dap4_test/daptestfiles/test_enum_2.nc.dap
--- a/dap4_test/daptestfiles/test_enum_array.4.nc.dap
+++ b/dap4_test/daptestfiles/test_enum_array.4.nc.dap
--- a/dap4_test/daptestfiles/test_enum_array.nc.dap
+++ b/dap4_test/daptestfiles/test_enum_array.nc.dap
--- a/dap4_test/daptestfiles/test_struct1.nc.dap
+++ b/dap4_test/daptestfiles/test_struct1.nc.dap
--- a/dap4_test/daptestfiles/test_struct_array.6.nc.dap
+++ b/dap4_test/daptestfiles/test_struct_array.6.nc.dap
--- a/dap4_test/daptestfiles/test_struct_array.nc.dap
+++ b/dap4_test/daptestfiles/test_struct_array.nc.dap
--- a/dap4_test/daptestfiles/test_struct_nested.nc.dap
+++ b/dap4_test/daptestfiles/test_struct_nested.nc.dap
--- a/dap4_test/daptestfiles/test_struct_type.nc.dap
+++ b/dap4_test/daptestfiles/test_struct_type.nc.dap
--- a/dap4_test/dmrtestfiles/CMakeLists.txt
+++ b/dap4_test/dmrtestfiles/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/dmrtestfiles/test_atomic_array.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_atomic_array.nc.dmr
@ -51,7 +51,7 @@
    </Opaque>
    <Enum name="primary_cloud" enum="/cloud_class_t">
        <Dim name="/d5"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_atomic_array.syn.dmr
+++ b/dap4_test/dmrtestfiles/test_atomic_array.syn.dmr
@ -51,7 +51,7 @@
    </Opaque>
    <Enum name="primary_cloud" enum="/cloud_class_t">
        <Dim name="/d5"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_atomic_types.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_atomic_types.nc.dmr
@ -33,12 +33,12 @@
    <String name="vs"/>
    <Opaque name="vo" _edu.ucar.opaque.size="8"/>
    <Enum name="primary_cloud" enum="/cloud_class_t">
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
    <Enum name="secondary_cloud" enum="/cloud_class_t">
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_atomic_types.syn.dmr
+++ b/dap4_test/dmrtestfiles/test_atomic_types.syn.dmr
@ -33,12 +33,12 @@
    <String name="vs"/>
    <Opaque name="vo"/>
    <Enum name="primary_cloud" enum="/cloud_class_t">
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
    <Enum name="secondary_cloud" enum="/cloud_class_t">
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_enum.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_enum.nc.dmr
@ -20,7 +20,7 @@
        <EnumConst name="Missing" value="127"/>
    </Enumeration>
    <Enum name="primary_cloud" enum="/cloud_class_t">
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_enum_2.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_enum_2.nc.dmr
@ -24,7 +24,7 @@
    </Attribute>
    <Group name="h">
        <Enum name="primary_cloud" enum="/cloud_class_t">
-            <Attribute name="_FillValue" type="String">
+            <Attribute name="_FillValue" type="/cloud_class_t">
                <Value value="Missing"/>
            </Attribute>
        </Enum>
--- a/dap4_test/dmrtestfiles/test_enum_array.4.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_enum_array.4.nc.dmr
@ -21,7 +21,7 @@
    </Enumeration>
    <Enum name="primary_cloud" enum="/cloud_class_t">
        <Dim size="2"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_enum_array.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_enum_array.nc.dmr
@ -22,7 +22,7 @@
    </Enumeration>
    <Enum name="primary_cloud" enum="/cloud_class_t">
        <Dim name="/d5"/>
-        <Attribute name="_FillValue" type="String">
+        <Attribute name="_FillValue" type="/cloud_class_t">
            <Value value="Missing"/>
        </Attribute>
    </Enum>
--- a/dap4_test/dmrtestfiles/test_struct1.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_struct1.nc.dmr
@ -8,8 +8,6 @@
    <Structure name="s">
        <Int32 name="x"/>
        <Int32 name="y"/>
-        <Map name="/s.x"/>
-        <Map name="/s.y"/>
    </Structure>
    <Attribute name="_DAP4_Little_Endian" type="UInt8">
        <Value value="1"/>
--- a/dap4_test/dmrtestfiles/test_struct_array.6.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_struct_array.6.nc.dmr
@ -10,8 +10,6 @@
        <Int32 name="y"/>
        <Dim size="2"/>
        <Dim size="2"/>
-        <Map name="/s.x"/>
-        <Map name="/s.y"/>
    </Structure>
    <Attribute name="_dap4.ce" type="String">
        <Value value="/s[0:2:3][0:1]"/>
--- a/dap4_test/dmrtestfiles/test_struct_array.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_struct_array.nc.dmr
@ -12,8 +12,6 @@
        <Int32 name="y"/>
        <Dim name="/dx"/>
        <Dim name="/dy"/>
-        <Map name="/s.x"/>
-        <Map name="/s.y"/>
    </Structure>
    <Attribute name="_DAP4_Little_Endian" type="UInt8">
        <Value value="1"/>
--- a/dap4_test/dmrtestfiles/test_struct_nested.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_struct_nested.nc.dmr
@ -14,8 +14,6 @@
            <Int32 name="x"/>
            <Int32 name="y"/>
        </Structure>
-        <Map name="/x.field1.x"/>
-        <Map name="/x.field1.y"/>
    </Structure>
    <Attribute name="_DAP4_Little_Endian" type="UInt8">
        <Value value="1"/>
--- a/dap4_test/dmrtestfiles/test_struct_type.nc.dmr
+++ b/dap4_test/dmrtestfiles/test_struct_type.nc.dmr
@ -8,8 +8,6 @@
    <Structure name="s">
        <Int32 name="x"/>
        <Int32 name="y"/>
-        <Map name="/s.x"/>
-        <Map name="/s.y"/>
    </Structure>
    <Attribute name="_DAP4_Little_Endian" type="UInt8">
        <Value value="1"/>
--- a/dap4_test/nctestfiles/CMakeLists.txt
+++ b/dap4_test/nctestfiles/CMakeLists.txt
@ -2,5 +2,5 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
--- a/dap4_test/nctestfiles/test_atomic_array.nc
+++ b/dap4_test/nctestfiles/test_atomic_array.nc
--- a/dap4_test/nctestfiles/test_atomic_types.nc
+++ b/dap4_test/nctestfiles/test_atomic_types.nc
--- a/dap4_test/nctestfiles/test_unlim1.nc
+++ b/dap4_test/nctestfiles/test_unlim1.nc
--- a/dap4_test/test_data.sh
+++ b/dap4_test/test_data.sh
@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

 . ${srcdir}/d4test_common.sh

+echo "test_data.sh:"
+
 cd ${DAPTESTFILES}
 F=`ls -1 *.dap | sed -e 's/[.]dap//g' | tr '\r\n' '  '`
 cd $WD
--- a/dap4_test/test_meta.sh
+++ b/dap4_test/test_meta.sh
@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

 . ${srcdir}/d4test_common.sh

+echo "test_meta.sh:"
+
 cd ${DMRTESTFILES}
 F=`ls -1 *.dmr | sed -e 's/[.]dmr//g' | tr '\r\n' '  '`
 cd $WD
--- a/dap4_test/test_parse.sh
+++ b/dap4_test/test_parse.sh
@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

 . ${srcdir}/d4test_common.sh

+echo "test_parse.sh:"
+
 cd ${DMRTESTFILES}
 F=`ls -1 *.dmr | sed -e 's/[.]dmr//' |tr '\r\n' '  '`
 cd $WD
--- a/dap4_test/test_raw.sh
+++ b/dap4_test/test_raw.sh
@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

 . ${srcdir}/d4test_common.sh

+echo "test_raw.sh:"
+
 # Compute the set of testfiles
 PUSHD ${srcdir}/daptestfiles
 F=`ls -1d *.dap`
--- a/dap4_test/test_remote.sh
+++ b/dap4_test/test_remote.sh
@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

 . ${srcdir}/d4test_common.sh

+echo "test_remote.sh:"
+
 #BIG=1
 #NOCSUM=1

--- a/libdap4/d4read.c
+++ b/libdap4/d4read.c
@ -167,7 +167,9 @@ readfile(const NCURI* uri, const char* suffix, NCbytes* packet)
 #ifdef O_BINARY
    flags |= O_BINARY;
 #endif
+#ifdef D4DEBUGPARSER
 fprintf(stderr,"XXX: flags=0x%x file=%s\n",flags,filename);
+#endif
    fd = NCopen2(filename,flags);
    if(fd < 0) {
 	nclog(NCLOGERR,"open failed:%s",filename);
--- a/libdap4/d4util.c
+++ b/libdap4/d4util.c
@ -207,7 +207,7 @@ backslashEscape(const char* s)
 }

 /* Parse an fqn into a sequence of names;
-   initially using '/', then '.' */
+   using '/', and then (conditionally) '.' */
 int
 NCD4_parseFQN(const char* fqn0, NClist* pieces)
 {
@ -239,6 +239,7 @@ NCD4_parseFQN(const char* fqn0, NClist* pieces)
 	    break;
 	}
    }
+#ifdef ALLOWFIELDMAPS
    /* Step 2, walk the final piece to break up based on '.' */
    for(p=start;*p;) {
 	switch(*p) {
@ -255,6 +256,7 @@ NCD4_parseFQN(const char* fqn0, NClist* pieces)
 	    break;
 	}
    }
+#endif
    count++; /* acct for last piece */
    /* Step 3: capture and de-scape the pieces */
    for(p=fqn;count > 0;count--) {
--- a/libdap4/ncd4types.h
+++ b/libdap4/ncd4types.h
@ -13,6 +13,12 @@ are defined here.

 #undef COMPILEBYDEFAULT

+/*
+Control if struct fields can be map targets.
+Currently turned off because semantics are unclear.
+*/
+#undef ALLOWFIELDMAPS
+
 #define long64 long long
 #define ncerror int