svn commit: r1665751 - in /tika/trunk: CHANGES.txt tika-parsers/pom.xml tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java

[le...@apache.org]

Author: lewismc
Date: Wed Mar 11 00:56:11 2015
New Revision: 1665751

URL: http://svn.apache.org/r1665751
Log:
TIKA-1571 Upgrade UCAR dependencies to 4.5.5

Modified:
    tika/trunk/CHANGES.txt
    tika/trunk/tika-parsers/pom.xml
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java

Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1665751&r1=1665750&r2=1665751&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Wed Mar 11 00:56:11 2015
@@ -1,5 +1,7 @@
 Release 1.8 - Current Development
 
+  * Upgrade UCAR dependencies to 4.5.5 (TIKA-1571)
+  
   * Fix Paths in Tika server welcome page (TIKA-1567).
 
   * Fixed infinite recursion while parsing some PDFs (TIKA-1038).

Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1665751&r1=1665750&r2=1665751&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Wed Mar 11 00:56:11 2015
@@ -44,7 +44,7 @@
     <mime4j.version>0.7.2</mime4j.version>
     <vorbis.version>0.6</vorbis.version>
     <pdfbox.version>1.8.8</pdfbox.version>
-    <netcdf-java.version>4.5.4</netcdf-java.version>
+    <netcdf-java.version>4.5.5</netcdf-java.version>
   </properties>
 
   <dependencies>

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java?rev=1665751&r1=1665750&r2=1665751&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java Wed Mar 11 00:56:11 2015
@@ -104,10 +104,10 @@ public class HDFParser extends AbstractP
         // unravel its string attrs
         for (Attribute attribute : group.getAttributes()) {
             if (attribute.isString()) {
-                met.add(attribute.getName(), attribute.getStringValue());
+                met.add(attribute.getFullName(), attribute.getStringValue());
             } else {
                 // try and cast its value to a string
-                met.add(attribute.getName(), String.valueOf(attribute
+                met.add(attribute.getFullName(), String.valueOf(attribute
                         .getNumericValue()));
             }
         }

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java?rev=1665751&r1=1665750&r2=1665751&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java Wed Mar 11 00:56:11 2015
@@ -18,7 +18,6 @@ package org.apache.tika.parser.netcdf;
 
 //JDK imports
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
@@ -26,7 +25,6 @@ import java.util.Set;
 import java.util.List;
 
 import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
 import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
@@ -90,7 +88,7 @@ public class NetCDFParser extends Abstra
 
             // first parse out the set of global attributes
             for (Attribute attr : ncFile.getGlobalAttributes()) {
-                Property property = resolveMetadataKey(attr.getName());
+                Property property = resolveMetadataKey(attr.getFullName());
                 if (attr.getDataType().isString()) {
                     metadata.add(property, attr.getStringValue());
                 } else if (attr.getDataType().isNumeric()) {
@@ -107,7 +105,7 @@ public class NetCDFParser extends Abstra
             xhtml.startElement("ul");
             xhtml.newline();
             for (Dimension dim : ncFile.getDimensions()) {
-                xhtml.element("li", dim.getName() + " = " + dim.getLength());
+                xhtml.element("li", dim.getFullName() + " = " + dim.getLength());
             }
             xhtml.endElement("ul");