Update to the code that determines the data type of a variable

asascience-open · Oct 22, 2015 · 290e82a · 290e82a
1 parent 9f4ef56
commit 290e82a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/jar/ncSOS-1.1.1.zip b/jar/ncSOS-1.1.1.zip
diff --git a/jar/ncSOS.zip b/jar/ncSOS.zip
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.asascience</groupId>
   <artifactId>ncsos</artifactId>
-  <version>1.1</version>
+  <version>1.1.1</version>
   <packaging>jar</packaging>
 
   <name>ncsos</name>

diff --git a/src/main/java/com/asascience/ncsos/ds/IoosPlatform10Handler.java b/src/main/java/com/asascience/ncsos/ds/IoosPlatform10Handler.java
@@ -6,6 +6,8 @@
 import com.asascience.ncsos.outputformatter.ds.IoosPlatform10Formatter;
 import com.asascience.ncsos.util.LogReporter;
 import com.asascience.ncsos.util.VocabDefinitions;
+
+import ucar.ma2.DataType;
 import ucar.nc2.Attribute;
 import ucar.nc2.Dimension;
 import ucar.nc2.VariableSimpleIF;
@@ -93,8 +95,8 @@ private void formatSmlIdentification() {
         try {
             if (this.stationVariable.getDimensions().size() == 1) {
                 Dimension dim = this.stationVariable.getDimension(0);
-                if (this.stationVariable.getEnumTypedef().getBaseType() == ucar.ma2.DataType.CHAR ||
-                        this.stationVariable.getEnumTypedef().getBaseType() == ucar.ma2.DataType.STRING ||
+                DataType type = this.stationVariable.getDataType();
+                if (type == ucar.ma2.DataType.CHAR || type == ucar.ma2.DataType.STRING ||
                         dim.getLength() < 2) {
                     // single station if the dataType is a char or string or the length of the dimension is 1
                     formatIdentificationSingleStation();