fixed cache handling problem: Jira NCF-106

cf

@@ -1,8 +1,8 @@
 #!/bin/bash
 #X="-x"
 
-HDF5=1
-#DAP=1
+#HDF5=1
+DAP=1
 #CDMR=1
 
 #M32=1

libdap2/Make0

@@ -262,7 +262,7 @@ vpt::
 #T=test_varm3
 #T=t_dap3b
 #T=t_dap3c
-T=t_vara9
+T=ansley8
 
 v::
 	cc -g -c ${T}.c ${INCL}

libdap2/constraints3.c

@@ -931,6 +931,8 @@ buildvaraprojection3(Getvara* getvar,
         for(j=0;j<localrank;j++) {
 	    DCEslice* slice = &segment->slices[j];
 	    CDFnode* dim = (CDFnode*)nclistget(vardims,dimindex+j);
+	    /* make each slice represent the corresponding
+               start/count/stride */
 	    slice->first = startp[dimindex+j];
 	    slice->stride = stridep[dimindex+j];
 	    slice->count = countp[dimindex+j];
@@ -950,6 +952,11 @@ buildvaraprojection3(Getvara* getvar,
 
     ASSERT((dimindex == ncrank));
 
+#ifdef DEBUG
+fprintf(stderr,"buildvaraprojection3: projection=%s\n",
+        dumpprojection(projection));
+#endif
+
     if(projectionp) *projectionp = projection;
 
     nclistfree(path);

libdap2/dapdebug.h

@@ -6,7 +6,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#undef DEBUG
+#undef DEBUG 1
 #undef PARSEDEBUG
 
 #include <stdarg.h>

libdap2/dceconstraints.c

@@ -789,7 +789,9 @@ dcemakewholeslice(DCEslice* slice, size_t declsize)
 int
 dceiswholeslice(DCEslice* slice)
 {
-    if(slice->first != 0 || slice->stride != 1) return 0;
+    if(slice->first != 0
+       || slice->stride != 1
+       || slice->stop != slice->declsize) return 0;
     return 1;
 }
 

libdap2/env

@@ -2,8 +2,7 @@
 PARMS=""; ARGS=""; CON="" ; CE="";  OCON=""
 PARMS="[log]"
 
-F="[cache][netcdf4]http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
-CON="number&number>6"
+F="http://ferret.pmel.noaa.gov/geoide/dodsC/ct_flux"
 if test 1 = 0; then
 F="http://motherlode.ucar.edu:9080/thredds/dodsC/fmrc/NCEP/GFS/Alaska_191km/NCEP-GFS-Alaska_191km_fmrc.ncx"
 F="file:///home/dmh/nc/oc/dataset-duacs-nrt-over30d-global-merged-madt-h"