You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2014/10/12 08:59:42 UTC
svn commit: r1631149 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/gdal/GDALParser.java
test/java/org/apache/tika/parser/gdal/TestGDALParser.java
Author: mattmann
Date: Sun Oct 12 06:59:42 2014
New Revision: 1631149
URL: http://svn.apache.org/r1631149
Log:
- TIKA-605: fix remainder of tpalsulich comments from https://reviews.apache.org/r/26542
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java?rev=1631149&r1=1631148&r2=1631149&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java Sun Oct 12 06:59:42 2014
@@ -31,6 +31,7 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
//Tika imports
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.TemporaryResources;
@@ -39,6 +40,7 @@ import org.apache.tika.metadata.Metadata
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.external.ExternalParser;
import org.apache.tika.sax.XHTMLContentHandler;
import static org.apache.tika.parser.external.ExternalParser.INPUT_FILE_TOKEN;
@@ -230,6 +232,10 @@ public class GDALParser extends Abstract
Metadata metadata, ParseContext context) throws IOException,
SAXException, TikaException {
+ if (!ExternalParser.check("gdalinfo")){
+ return;
+ }
+
// first set up and run GDAL
// process the command
TemporaryResources tmp = new TemporaryResources();
@@ -394,9 +400,10 @@ public class GDALParser extends Abstract
xhtml.characters(buffer, 0, n);
}
xhtml.endElement("p");
- xhtml.endDocument();
+
} finally {
reader.close();
+ xhtml.endDocument();
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java?rev=1631149&r1=1631148&r2=1631149&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java Sun Oct 12 06:59:42 2014
@@ -86,11 +86,11 @@ public class TestGDALParser extends Tika
e.printStackTrace();
fail(e.getMessage());
}
-
}
@Test
public void testParseMetadata() {
+ assumeTrue(canRun());
String expectedNcInst = "NCAR (National Center for Atmospheric Research, Boulder, CO, USA)";
String expectedModelNameEnglish = "NCAR CCSM";
String expectedProgramId = "Source file unknown Version unknown Date unknown";
@@ -122,17 +122,17 @@ public class TestGDALParser extends Tika
e.printStackTrace();
fail(e.getMessage());
}
-
}
-
+
@Test
- public void testParseFITS(){
+ public void testParseFITS() {
+ assumeTrue(canRun());
String expectedAllgMin = "-7.319537E1";
String expectedAtodcorr = "COMPLETE";
String expectedAtodfile = "uref$dbu1405iu.r1h";
String expectedCalVersion = " ";
String expectedCalibDef = "1466";
-
+
GDALParser parser = new GDALParser();
InputStream stream = TestGDALParser.class
.getResourceAsStream("/test-documents/WFPC2u5780205r_c0fx.fits");
@@ -144,19 +144,17 @@ public class TestGDALParser extends Tika
assertNotNull(met.get("ALLG-MIN"));
assertEquals(expectedAllgMin, met.get("ALLG-MIN"));
assertNotNull(met.get("ATODCORR"));
- assertEquals(expectedAtodcorr, met.get("ATODCORR"));
+ assertEquals(expectedAtodcorr, met.get("ATODCORR"));
assertNotNull(met.get("ATODFILE"));
assertEquals(expectedAtodfile, met.get("ATODFILE"));
assertNotNull(met.get("CAL_VER"));
assertEquals(expectedCalVersion, met.get("CAL_VER"));
assertNotNull(met.get("CALIBDEF"));
- assertEquals(expectedCalibDef, met.get("CALIBDEF"));
-
+ assertEquals(expectedCalibDef, met.get("CALIBDEF"));
+
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
}
-
}
-
}