ckp

dap4_test/cdltestfiles/CMakeLists.txt

@@ -1,6 +0,0 @@
-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)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

dap4_test/daptestfiles/CMakeLists.txt

@@ -1,6 +0,0 @@
-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)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

dap4_test/dmrtestfiles/CMakeLists.txt

@@ -1,6 +0,0 @@
-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)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

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

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

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

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`

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
 

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);

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--) {

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