2.10

stcorp · Nov 4, 2015 · 62ea873 · 62ea873
1 parent afe2817
commit 62ea873
Show file tree

Hide file tree

Showing 151 changed files with 338 additions and 179 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,19 @@
+2.10 2014-02-01
+~~~~~~~~~~~~~~~
+
+* Added support for 'offset' and 'invalid' attributes for a Conversion element
+  in codadef files.
+
+* Added int(bool) to CODA expressions.
+
+* Added size check for content of xml elements to codacheck.
+
+* Fixed issue where coda_cursor_has_attributes() and coda_type_has_attributes()
+  would always return false for HDF5. This could result on attributes not being
+  shown in several interfaces (e.g. codadump)
+
+* Fixed bug in codadump debug argument parsing.
+
 2.9.1 2013-06-27
 ~~~~~~~~~~~~~~~~
 
@@ -209,7 +225,7 @@
 * Fixed issue where CODA did not properly support HDF4 dataset names that are
   longer than 63 characters.
 
-* Upgraded the Windows Visual Studion 6.0 project files to Visual Studio 2008
+* Upgraded the Windows Visual Studio 6.0 project files to Visual Studio 2008
   (9.0) project files.
 
 * The binary installer of CODA for Windows now requires IDL 6.3 or higher.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 project(CODA)
 
-set(VERSION 2.9.1)
+set(VERSION 2.10)
 set(CODA_VERSION \"${VERSION}\")
 
 # General setup
@@ -716,7 +716,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/coda.h DESTINATION include)
 # Set dynamic library version
 #
 set(LIBCODA_CURRENT 10)
-set(LIBCODA_REVISION 2)
+set(LIBCODA_REVISION 3)
 set(LIBCODA_AGE 4)
 math(EXPR LIBCODA_MAJOR "${LIBCODA_CURRENT} - ${LIBCODA_AGE}")
 set(LIBCODA_MINOR ${LIBCODA_AGE})

diff --git a/FAQ b/FAQ
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2013 S[&]T, The Netherlands
+Copyright (C) 2007-2014 S[&]T, The Netherlands
 
                 CODA Frequently Asked Questions
 

diff --git a/INSTALL b/INSTALL
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2013 S[&]T, The Netherlands
+Copyright (C) 2007-2014 S[&]T, The Netherlands
 
                         CODA Installation Documentation
 

diff --git a/Makefile.am b/Makefile.am
@@ -306,7 +306,7 @@ libcoda_la_CPPFLAGS = -Ilibcoda/expat -I$(srcdir)/libcoda/expat -Ilibcoda/pcre -
 libcoda_la_LDFLAGS = -no-undefined -version-info $(LIBCODA_CURRENT):$(LIBCODA_REVISION):$(LIBCODA_AGE)
 libcoda_la_LIBADD = @LTLIBOBJS@ libexpat_internal.la libpcre_internal.la libz_internal.la $(QIAPLIBS) $(HDF4LIBS) $(HDF5LIBS)
 INDENTFILES += $(libcoda_la_SOURCES) libcoda/coda.h.in
-BUILT_SOURCES += coda-expr-parser.h
+BUILT_SOURCES += libcoda/coda-expr-parser.h
 
 libcoda_internal_la_SOURCES = \
 	libcoda/coda-ascbin-cursor.c \
@@ -333,8 +333,8 @@ libcoda_internal_la_SOURCES = \
 	libcoda/coda-definition.c \
 	libcoda/coda-definition.h \
 	libcoda/coda-errno.c \
-	coda-expr-parser.c \
-	coda-expr-parser.h \
+	libcoda/coda-expr-parser.c \
+	libcoda/coda-expr-parser.h \
 	libcoda/coda-expr-tokenizer.l \
 	libcoda/coda-expr.c \
 	libcoda/coda-expr.h \

diff --git a/README b/README
@@ -1,6 +1,6 @@
-Copyright (C) 2007-2013 S[&]T, The Netherlands
+Copyright (C) 2007-2014 S[&]T, The Netherlands
 
-                CODA 2.9.1 Release Notes
+                CODA 2.10 Release Notes
 
 
 CODA is the Common Data Access framework that allows reading of scientific data

diff --git a/config.h.cmake.in b/config.h.cmake.in
@@ -158,9 +158,6 @@
    */
 #cmakedefine LT_OBJDIR ${LT_OBJDIR}
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#cmakedefine NO_MINUS_C_MINUS_O ${NO_MINUS_C_MINUS_O}
-
 /* Name of package */
 #cmakedefine PACKAGE ${PACKAGE}
 

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 # autoconf file for CODA
-AC_INIT([CODA],[2.9.1])
+AC_INIT([CODA],[2.10])
 AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE(foreign 1.10 -Wall)
+AM_INIT_AUTOMAKE(foreign subdir-objects 1.10 -Wall)
 
 AC_PREREQ(2.63)
 
@@ -100,7 +100,7 @@ AC_CONFIG_FILES([windows/coda.iss windows/setup.py])
 # 6. If any interfaces have been removed or changed since the last public
 #    release, then set age to 0.
 LIBCODA_CURRENT=10
-LIBCODA_REVISION=2
+LIBCODA_REVISION=3
 LIBCODA_AGE=4
 AC_SUBST(LIBCODA_CURRENT)
 AC_SUBST(LIBCODA_REVISION)

diff --git a/doc/html/codadef/codadef-expressions.html b/doc/html/codadef/codadef-expressions.html
@@ -175,6 +175,12 @@ <h3>operators</h3>
 
       <h3>functions</h3>
 
+      <h5>int(bool)</h5>
+
+      <p>Convert the boolean value to an integer value.</p>
+
+      <p>This is equivalent to calling '<code><b>if</b>(bool, 1, 0)</code>'</p>
+
       <h5>int(node)</h5>
 
       <p>Reads the value at the node as an integer. If the node does not point to data that represents an integer value this will result in an error.</p>
@@ -304,7 +310,7 @@ <h5>with(indexvar = integer, integer)</h5>
       <p>Example:</p>
       <div class="fragment"><code><b>with</b>(<i>k</i> = <b>int</b>(/data/intvalue), <b>if</b>(<i>k</i> &gt; 10, <i>k</i> + 10, <i>k</i> - 5))</code></div>
 
-      <p>This will be faster than using '<code><b>if</b>(<b>int</b>(/data/intvalue) &gt; 10, <b>int</b>(/data/intvalue) + 10, <b>int</b>(/data/intvalue) - 5)</code>'.</p>
+      <p>This will be faster than using '<code><b>if</b>(<b>int</b>(/data/intvalue) &gt; 10, <b>int</b>(/data/intvalue) + 10, <b>int</b>(/data/intvalue) - 5)</code>', since the value <code>/data/intvalue</code> will only be read once instead of 3 times.</p>
 
       <h2 id="float">float expressions</h2>
 
@@ -694,6 +700,7 @@ <h2 id="bnf">formal definition</h2>
 intexpr = 
 	intvalue |
 	'int', '(', intexpr, ')' |
+	'int', '(', boolexpr, ')' |
 	'int', '(', node, ')' |
 	'int', '(', stringexpr, ')' |
 	'$', identifier |

diff --git a/doc/html/codadef/codadef-hdf4.html b/doc/html/codadef/codadef-hdf4.html
@@ -83,6 +83,8 @@ <h3>Attributes</h3>
 
       <p>If an HDF4 object has a scale_factor and/or add_offset attribute CODA will use this to automatically convert any values that are read from the object (value_returned = value_read * scale_factor + add_offset). The application of this conversion can be enabled/disabled using the same global option that is used to turn on/off conversions for products that are described by CODA format definition files (this option is turned on by default).</p>
 
+      <p>If a variable has a _FillValue attribute CODA will use this to automatically set the value to NaN (potentially upgrading the type to a double). The application of this conversion can be enabled/disabled as described above.</p>
+
       <div class="footer">
         <hr />
         <p>Copyright &copy; 2007-2013 <b>s<span class="soft-red">[</span>&amp;<span class="soft-red">]</span>t</b>, The Netherlands.</p>

diff --git a/doc/html/codadef/codadef-netcdf.html b/doc/html/codadef/codadef-netcdf.html
@@ -28,6 +28,10 @@ <h1>CODA netCDF Mapping Description</h1>
 
       <p>The global attributes can be accessed via CODA as attributes of the root record. The attributes of a variable can be accessed as attributes of the base type (in case of scalar data) or as attributes of the array (for variables that have one or more dimensions). The same character to string mapping properties for variables also hold for attributes.</p>
 
+      <p>If a variable has a scale_factor and/or add_offset attribute CODA will use this to automatically convert any values that are read from the object (value_returned = value_read * scale_factor + add_offset). The application of this conversion can be enabled/disabled using the same global option that is used to turn on/off conversions for products that are described by CODA format definition files (this option is turned on by default).</p>
+
+      <p>If a variable has a missing_value and/or _FillValue attribute CODA will use this to automatically set the value to NaN (potentially upgrading the type to a double). The application of this conversion can be enabled/disabled as described above.</p>
+
       <div class="footer">
         <hr />
         <p>Copyright &copy; 2007-2013 <b>s<span class="soft-red">[</span>&amp;<span class="soft-red">]</span>t</b>, The Netherlands.</p>

diff --git a/fortran/coda_fortran.c b/fortran/coda_fortran.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/fortran/generate-finc.c b/fortran/generate-finc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *
@@ -31,7 +31,7 @@
 
 static void print_copyright_notice(void)
 {
-    printf("C Copyright (C) 2007-2013 S[&]T, The Netherlands.\n");
+    printf("C Copyright (C) 2007-2014 S[&]T, The Netherlands.\n");
     printf("C\n");
     printf("C This file is part of CODA.\n");
     printf("C\n");

diff --git a/idl/coda-idl.c b/idl/coda-idl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/java/CodaTest.java b/java/CodaTest.java
@@ -1,6 +1,6 @@
 // CodaTest.java - Sample file for the CODA Java library interface
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/coda_ignore.i b/java/coda_ignore.i
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/coda_rename.i b/java/coda_rename.i
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/codac.i b/java/codac.i
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/java/nl/stcorp/coda/Coda.java b/java/nl/stcorp/coda/Coda.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/nl/stcorp/coda/CodaException.java b/java/nl/stcorp/coda/CodaException.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/nl/stcorp/coda/Cursor.java b/java/nl/stcorp/coda/Cursor.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/nl/stcorp/coda/Expression.java b/java/nl/stcorp/coda/Expression.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/nl/stcorp/coda/Product.java b/java/nl/stcorp/coda/Product.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/java/nl/stcorp/coda/Type.java b/java/nl/stcorp/coda/Type.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2007-2013 S[&]T, The Netherlands.
+// Copyright (C) 2007-2014 S[&]T, The Netherlands.
 //
 // This file is part of CODA.
 //

diff --git a/libcoda/coda-ascbin-cursor.c b/libcoda/coda-ascbin-cursor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascbin-internal.h b/libcoda/coda-ascbin-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascbin.c b/libcoda/coda-ascbin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascbin.h b/libcoda/coda-ascbin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascii-cursor.c b/libcoda/coda-ascii-cursor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *
@@ -614,7 +614,6 @@ int coda_ascii_cursor_get_bit_size(const coda_cursor *cursor, int64_t *bit_size,
     char buffer[MAX_ASCII_NUMBER_LENGTH];
     long buffer_size = -1;
     int use_buffer = 0;
-    int dynamic_size;
 
     if (type->bit_size >= 0)
     {
@@ -648,6 +647,8 @@ int coda_ascii_cursor_get_bit_size(const coda_cursor *cursor, int64_t *bit_size,
     /* only read buffer when we are dealing with numbers (without size_expr) or if there are mappings */
     if (use_buffer)
     {
+        int dynamic_size;
+
         buffer_size = get_buffer_size(-1, size_boundary, (cursor->product->file_size << 3) - bit_offset, &dynamic_size);
         if (buffer_size < 0)
         {

diff --git a/libcoda/coda-ascii-internal.h b/libcoda/coda-ascii-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascii.c b/libcoda/coda-ascii.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-ascii.h b/libcoda/coda-ascii.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-bin-cursor.c b/libcoda/coda-bin-cursor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-bin-internal.h b/libcoda/coda-bin-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-bin.c b/libcoda/coda-bin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-bin.h b/libcoda/coda-bin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-cdf-cursor.c b/libcoda/coda-cdf-cursor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-cdf-internal.h b/libcoda/coda-cdf-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-cdf-type.c b/libcoda/coda-cdf-type.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *

diff --git a/libcoda/coda-cdf.c b/libcoda/coda-cdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 S[&]T, The Netherlands.
+ * Copyright (C) 2007-2014 S[&]T, The Netherlands.
  *
  * This file is part of CODA.
  *