svn commit: r1668944 - in /tika/trunk/tika-parsers/src: main/java/org/apache/tika/parser/netcdf/NetCDFParser.java test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java

[aburgess]

Author: aburgess
Date: Tue Mar 24 17:48:29 2015
New Revision: 1668944

URL: http://svn.apache.org/r1668944
Log:
updated patch for TIKA-1579: outputs NetCDF file type in metadata

Modified:
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java

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=1668944&r1=1668943&r2=1668944&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
 Tue Mar 24 17:48:29 2015
@@ -85,7 +85,7 @@ public class NetCDFParser extends Abstra
         TikaInputStream tis = TikaInputStream.get(stream, new 
TemporaryResources());
         try {
             NetcdfFile ncFile = 
NetcdfFile.open(tis.getFile().getAbsolutePath());
-
+            metadata.set("File-Type-Description", 
ncFile.getFileTypeDescription());
             // first parse out the set of global attributes
             for (Attribute attr : ncFile.getGlobalAttributes()) {
                 Property property = resolveMetadataKey(attr.getFullName());

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java?rev=1668944&r1=1668943&r2=1668944&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
 Tue Mar 24 17:48:29 2015
@@ -59,6 +59,8 @@ public class NetCDFParserTest {
         assertEquals(metadata.get(Metadata.REALIZATION), "1");
         assertEquals(metadata.get(Metadata.EXPERIMENT_ID),
                 "720 ppm stabilization experiment (SRESA1B)");
+        assertEquals(metadata.get("File-Type-Description"), 
+                "NetCDF-3/CDM");
 
         String content = handler.toString();
         assertContains("long_name = \"Surface area\"", content);
@@ -66,6 +68,7 @@ public class NetCDFParserTest {
         assertContains("float lat(lat=128)", content);
         assertContains("double lat_bnds(lat=128, bnds=2)", content);
         assertContains("double lon_bnds(lon=256, bnds=2)", content);
+        
 
 
     }