Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[11825] unicorex/trunk/uas-metadata
|
From: <jry...@us...> - 2011-11-17 16:31:24
|
Revision: 11825
http://unicore.svn.sourceforge.net/unicore/?rev=11825&view=rev
Author: jrybicki
Date: 2011-11-17 16:31:17 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
updated to tika 1.0
Modified Paths:
--------------
unicorex/trunk/uas-metadata/pom.xml
unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/LuceneIndexer.java
unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataCrawler.java
unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataFile.java
unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/utils/ExtensionParser.java
unicorex/trunk/uas-metadata/src/test/java/eu/unicore/uas/metadata/utils/ExtensionParserTest.java
Modified: unicorex/trunk/uas-metadata/pom.xml
===================================================================
--- unicorex/trunk/uas-metadata/pom.xml 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/pom.xml 2011-11-17 16:31:17 UTC (rev 11825)
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>0.9</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Modified: unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/LuceneIndexer.java
===================================================================
--- unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/LuceneIndexer.java 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/LuceneIndexer.java 2011-11-17 16:31:17 UTC (rev 11825)
@@ -101,7 +101,7 @@
private static final String SEARCH_KEY = CONTENT_KEY;
private final String dataDirectory;
private final Directory directory;
- private final static Version VER = Version.LUCENE_34;
+ private static final Version VER = Version.LUCENE_34;
private final QueryParser parser = new QueryParser(VER, SEARCH_KEY, new StandardAnalyzer(VER));
/**
Modified: unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataCrawler.java
===================================================================
--- unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataCrawler.java 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataCrawler.java 2011-11-17 16:31:17 UTC (rev 11825)
@@ -71,6 +71,8 @@
private static final Logger LOG = LogUtil.getLogger(LogUtil.SERVICES, MetadataCrawler.class);
//how long the crawling waits when scheduled (in seconds)
public static final long DEFAULTSCHEDULEDELAY = 1;
+
+
private final String base; /* base is absolute/relative path where crawler start its job.*/
private final ContentHandler handler = new BodyContentHandler(-1);
@@ -227,8 +229,9 @@
}
return statuses;
}
-
+
+
private void getFiles(String directoryName, List<String> list, int level) throws ExecutionException {
currentLevel++;
//TODO: make it more flexible and define extension to be avoided
Modified: unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataFile.java
===================================================================
--- unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataFile.java 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/MetadataFile.java 2011-11-17 16:31:17 UTC (rev 11825)
@@ -9,7 +9,7 @@
private XnjsFile gridFile;
public static final String MD_FILE_EXTENSION = "metadata";
- private static final String mdFormatter = ".%s."+MD_FILE_EXTENSION;
+ private static final String MD_NAME_FORMATER = ".%s."+MD_FILE_EXTENSION;
public static enum MD_State {
CONSISTENT, RESOURCE_DELETED, INCONSISTENT, CHK_CONSISTENCE, NEW
@@ -71,7 +71,7 @@
private static String transformFileName(String fileName) {
- return String.format(mdFormatter, fileName);
+ return String.format(MD_NAME_FORMATER, fileName);
}
Modified: unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/utils/ExtensionParser.java
===================================================================
--- unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/utils/ExtensionParser.java 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/src/main/java/eu/unicore/uas/metadata/utils/ExtensionParser.java 2011-11-17 16:31:17 UTC (rev 11825)
@@ -34,12 +34,6 @@
@Override
public void parse(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException {
- //we are actually contex free
- parse(stream, handler, metadata);
- }
-
- @Override
- public void parse(InputStream stream, ContentHandler handler, Metadata metadata) throws IOException, SAXException, TikaException {
String path = metadata.get(Metadata.RESOURCE_NAME_KEY);
String ext = FilenameUtils.getExtension(path);
Modified: unicorex/trunk/uas-metadata/src/test/java/eu/unicore/uas/metadata/utils/ExtensionParserTest.java
===================================================================
--- unicorex/trunk/uas-metadata/src/test/java/eu/unicore/uas/metadata/utils/ExtensionParserTest.java 2011-11-17 14:45:56 UTC (rev 11824)
+++ unicorex/trunk/uas-metadata/src/test/java/eu/unicore/uas/metadata/utils/ExtensionParserTest.java 2011-11-17 16:31:17 UTC (rev 11825)
@@ -118,6 +118,6 @@
public void testNonProper() throws IOException, SAXException, TikaException {
Metadata meta = new Metadata();
meta.add(Metadata.RESOURCE_NAME_KEY, "");
- parser.parse(null, handler, meta);
+ parser.parse(null, handler, meta, null);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|