# HG changeset patch
# User robcast
# Date 1364484532 -3600
# Node ID cf8ecc67200e616730c08b651ddf447583cfffac
# Parent 888cdaf022fed426f708c25e722d4f606f5c704e
renamed XMLMetaLoader into IndexMetaLoader. new IndexMetaAuthLoader in progress. moved JDOM dependency to pdf module.
diff -r 888cdaf022fe -r cf8ecc67200e common/pom.xml
--- a/common/pom.xml Wed Mar 27 17:23:44 2013 +0100
+++ b/common/pom.xml Thu Mar 28 16:28:52 2013 +0100
@@ -12,10 +12,20 @@
The Digital Image Library - common library
http://digilib.berlios.de
jar
-
-
- UTF-8
-
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 1.6
+ 1.6
+
+
+
+
+
@@ -43,12 +53,6 @@
compile
- org.jdom
- jdom
- jar
- compile
-
-
log4j
log4j
jar
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/io/DocuDirectory.java
--- a/common/src/main/java/digilib/io/DocuDirectory.java Wed Mar 27 17:23:44 2013 +0100
+++ b/common/src/main/java/digilib/io/DocuDirectory.java Thu Mar 28 16:28:52 2013 +0100
@@ -38,7 +38,7 @@
import digilib.io.FileOps.FileClass;
import digilib.meta.MetadataMap;
-import digilib.meta.XMLMetaLoader;
+import digilib.meta.IndexMetaLoader;
/**
* @author casties
@@ -266,10 +266,10 @@
// check for directory metadata...
File mf = new File(dir, "index.meta");
if (mf.canRead()) {
- XMLMetaLoader ml = new XMLMetaLoader();
+ IndexMetaLoader ml = new IndexMetaLoader();
try {
// read directory meta file
- Map fileMeta = ml.loadURL(mf.getAbsolutePath());
+ Map fileMeta = ml.loadUri(mf.toURI());
if (fileMeta == null) {
return;
}
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/io/DocuDirentImpl.java
--- a/common/src/main/java/digilib/io/DocuDirentImpl.java Wed Mar 27 17:23:44 2013 +0100
+++ b/common/src/main/java/digilib/io/DocuDirentImpl.java Thu Mar 28 16:28:52 2013 +0100
@@ -32,7 +32,7 @@
import digilib.io.FileOps.FileClass;
import digilib.meta.MetadataMap;
-import digilib.meta.XMLMetaLoader;
+import digilib.meta.IndexMetaLoader;
/**
* Abstract directory entry in a DocuDirectory.
@@ -73,10 +73,10 @@
String fn = getFile().getAbsolutePath();
File mf = new File(fn + ".meta");
if (mf.canRead()) {
- XMLMetaLoader ml = new XMLMetaLoader();
+ IndexMetaLoader ml = new IndexMetaLoader();
try {
// read meta file
- Map meta = ml.loadURL(mf.getAbsolutePath());
+ Map meta = ml.loadUri(mf.toURI());
if (meta == null) {
return;
}
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/io/ImageFileSet.java
--- a/common/src/main/java/digilib/io/ImageFileSet.java Wed Mar 27 17:23:44 2013 +0100
+++ b/common/src/main/java/digilib/io/ImageFileSet.java Thu Mar 28 16:28:52 2013 +0100
@@ -32,7 +32,7 @@
import digilib.io.FileOps.FileClass;
import digilib.meta.MetadataMap;
-import digilib.meta.XMLMetaLoader;
+import digilib.meta.IndexMetaLoader;
/**
* @author casties
@@ -309,10 +309,10 @@
String fn = file.getAbsolutePath();
File mf = new File(fn + ".meta");
if (mf.canRead()) {
- XMLMetaLoader ml = new XMLMetaLoader();
+ IndexMetaLoader ml = new IndexMetaLoader();
try {
// read meta file
- Map meta = ml.loadURL(mf.getAbsolutePath());
+ Map meta = ml.loadUri(mf.toURI());
if (meta == null) {
return;
}
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/meta/IndexMetaAuthLoader.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/src/main/java/digilib/meta/IndexMetaAuthLoader.java Thu Mar 28 16:28:52 2013 +0100
@@ -0,0 +1,130 @@
+package digilib.meta;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.log4j.Logger;
+
+/*
+ * #%L
+ * IndexMetaAuthLoader -- Load XML format metadata into MetadataMaps
+ *
+ * Digital Image Library servlet components
+ *
+ * %%
+ * Copyright (C) 2013 MPIWG Berlin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * .
+ * #L%
+ * Author: Robert Casties (robcast@berlios.de)
+ */
+
+/**
+ * Class loading index.meta files with metadata extracting some image file
+ * related information.
+ * Extracts into the MetadataMap all tags in the meta/img tag as key-value
+ * pairs.
+ * Returns a map with filenames and MetadataMaps.
+ *
+ * @see index.meta
+ * spec
+ * @author Robert Casties
+ *
+ */
+public class IndexMetaAuthLoader {
+
+ private Logger logger = Logger.getLogger(this.getClass());
+
+ protected String metaTag = "meta";
+ protected String fileTag = "file";
+ protected String fileNameTag = "name";
+ protected String filePathTag = "path";
+ protected String imgTag = "img";
+
+ private XMLStreamReader reader;
+ private LinkedList tags;
+ private String filename;
+ private String filepath;
+
+ protected boolean readToMetaTag() throws XMLStreamException {
+ String thisTag = null;
+ String lastTag = null;
+ StringBuffer text = null;
+ for (int event = reader.next(); event != XMLStreamConstants.END_DOCUMENT; event = reader.next()) {
+ if (event == XMLStreamConstants.START_ELEMENT) {
+ lastTag = thisTag;
+ text = new StringBuffer();
+ // TODO: make namespace aware
+ thisTag = reader.getLocalName();
+ if (thisTag.equals(metaTag)) {
+ return true;
+ }
+ // save on stack
+ tags.push(thisTag);
+ } else if (event == XMLStreamConstants.END_ELEMENT) {
+ tags.pop();
+ if (thisTag.equals(fileNameTag) && lastTag != null && lastTag.equals(fileTag)) {
+ // name inside file tag -> record name
+ filename = text.toString();
+ } else if (thisTag.equals(filePathTag) && lastTag != null && lastTag.equals(fileTag)) {
+ // path inside file tag -> record path
+ filepath = text.toString();
+ }
+ } else if (event == XMLStreamConstants.CHARACTERS) {
+ text.append(reader.getText());
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Load and parse a file (as URI).
+ * returns HashMap with list data
+ *
+ * @throws IOException
+ */
+ public Map loadUri(URI uri) throws IOException {
+ Map files = new HashMap();
+ try {
+ InputStream in = uri.toURL().openStream();
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+ reader = factory.createXMLStreamReader(in);
+ // start reading
+ tags = new LinkedList();
+ if (readToMetaTag()) {
+
+ }
+
+ } catch (MalformedURLException e) {
+ logger.error("Malformed URL!");
+ throw new IOException(e);
+ } catch (XMLStreamException e) {
+ logger.error("XMLStream Error!");
+ throw new IOException(e);
+ }
+ return files;
+ }
+}
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/meta/IndexMetaLoader.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/src/main/java/digilib/meta/IndexMetaLoader.java Thu Mar 28 16:28:52 2013 +0100
@@ -0,0 +1,330 @@
+package digilib.meta;
+
+/*
+ * #%L
+ * XMLMetaLoader -- Load XML format metadata into MetadataMaps
+ *
+ * Digital Image Library servlet components
+ *
+ * %%
+ * Copyright (C) 2003 - 2013 MPIWG Berlin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * .
+ * #L%
+ * Author: Robert Casties (robcast@berlios.de)
+ */
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.log4j.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Class loading index.meta files with metadata extracting some image file related information.
+ * Extracts into the MetadataMap all tags in the meta/img tag as key-value pairs and the content of the meta/context tag as XML.
+ * Returns a map with filenames and MetadataMaps.
+ *
+ * @see index.meta spec
+ * @author Robert Casties
+ *
+ */
+public class IndexMetaLoader {
+
+ private Logger logger = Logger.getLogger(this.getClass());
+ private String metaTag = "meta";
+ private String fileTag = "file";
+ private String fileNameTag = "name";
+ private String filePathTag = "path";
+ private String imgTag = "img";
+ private String collectTag = "context";
+
+ public IndexMetaLoader() {
+ }
+
+ /**
+ * inner class XMLMetaParser to be called by the parser
+ */
+ private class XMLMetaParser extends DefaultHandler {
+
+ private LinkedList tags;
+ private Map files;
+ private MetadataMap meta;
+ private StringBuffer content;
+ private boolean collecting;
+ private StringBuffer collectedContent;
+ private String fileName;
+ private String filePath;
+
+ /**
+ * extracts the elements name from either localName ln or qName qn.
+ *
+ * @param ln localName
+ * @param qn qName
+ * @return element name
+ */
+ private String getName(String ln, String qn) {
+ if (ln != null) {
+ if (ln.length() > 0) {
+ return ln;
+ }
+ }
+ // else it's qName (or nothing)
+ return qn;
+ }
+
+ /**
+ * returns all attributes as a String
+ *
+ * @param attrs
+ * @return
+ */
+ private String getAttrString(Attributes attrs) {
+ StringBuffer s = new StringBuffer();
+ for (int i = 0; i < attrs.getLength(); i++) {
+ String key = getName(attrs.getLocalName(i), attrs.getQName(i));
+ s.append(" "+key+"=\""+attrs.getValue(i)+"\"");
+ }
+ return s.toString();
+ }
+
+
+ // Parser calls this once at the beginning of a document
+ /* (non-Javadoc)
+ * @see org.xml.sax.helpers.DefaultHandler#startDocument()
+ */
+ public void startDocument() throws SAXException {
+ tags = new LinkedList();
+ files = new HashMap();
+ collecting = false;
+ collectedContent = null;
+ }
+
+ // Parser calls this for each element in a document
+ /* (non-Javadoc)
+ * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ */
+ public void startElement(
+ String namespaceURI,
+ String localName,
+ String qName,
+ Attributes atts)
+ throws SAXException {
+
+ String name = getName(localName, qName);
+ // open a new tag
+ tags.addLast(name);
+ // start new content (no nesting of tags and content)
+ content = new StringBuffer();
+
+ if (name.equals(metaTag)) {
+ // new meta tag
+ meta = new MetadataMap();
+ collectedContent = new StringBuffer();
+ } else if (name.equals(fileTag)) {
+ // new file tag
+ fileName = null;
+ filePath = null;
+ meta = new MetadataMap();
+ collectedContent = new StringBuffer();
+ } else if (name.equals(collectTag)) {
+ // start collecting
+ collecting = true;
+ if (collectedContent == null) {
+ collectedContent = new StringBuffer();
+ }
+ }
+
+ // record mode
+ if (collecting) {
+ collectedContent.append("<"+name);
+ collectedContent.append(getAttrString(atts));
+ collectedContent.append(">");
+ }
+ }
+
+ // parser calls this for all tag content (possibly more than once)
+ /* (non-Javadoc)
+ * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
+ */
+ public void characters(char[] ch, int start, int length)
+ throws SAXException {
+ // append data to current string buffer
+ if (content == null) {
+ content = new StringBuffer();
+ }
+ content.append(ch, start, length);
+ }
+
+ // parser calls this at the end of each element
+ /* (non-Javadoc)
+ * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public void endElement(
+ String namespaceURI,
+ String localName,
+ String qName)
+ throws SAXException {
+
+ String name = getName(localName, qName);
+ // exit the tag
+ tags.removeLast();
+ String lastTag = (tags.isEmpty()) ? "" : tags.getLast();
+
+ // was it a file/name tag?
+ if (name.equals(fileNameTag) && lastTag.equals(fileTag)) {
+ // save name as filename
+ if ((content != null) && (content.length() > 0)) {
+ fileName = content.toString().trim();
+ }
+ content = null;
+ return;
+ }
+
+ // was it a file/path tag?
+ if (name.equals(filePathTag) && lastTag.equals(fileTag)) {
+ // save path as filepath
+ if ((content != null) && (content.length() > 0)) {
+ filePath = content.toString().trim();
+ }
+ content = null;
+ return;
+ }
+
+ // was it a file tag?
+ if (name.equals(fileTag)) {
+ // is there meta to save?
+ if ((meta != null) && (meta.size() > 0)) {
+ // file name is (optional file/path) / file/name
+ String fn = null;
+
+ if (fileName != null) {
+ if (filePath != null) {
+ fn = filePath + "/" + fileName;
+ } else {
+ fn = fileName;
+ }
+ } else {
+ // no file name, no file
+ content = null;
+ return;
+ }
+ // save meta in file list
+ files.put(fn, meta);
+ }
+ content = null;
+ return;
+ }
+
+ // was it a meta tag outside a file tag?
+ if (name.equals(metaTag) && !tags.contains(fileTag)) {
+ // save meta as dir meta
+ if ((meta != null) && (meta.size() > 0)) {
+ files.put("", meta);
+ }
+ content = null;
+ return;
+ }
+
+ // is this inside an digilib info (=img) tag?
+ if (lastTag.equals(imgTag)) {
+ // then add whatever this is
+ if ((content != null) && (content.length() > 0)) {
+ meta.put(name, content.toString().trim());
+ }
+ content = null;
+ return;
+ }
+
+ // is this the end of collectTag?
+ if (name.equals(collectTag)) {
+ collecting = false;
+ collectedContent.append("\n");
+ // store collected stuff
+ meta.put(collectTag, collectedContent.toString());
+ //logger.debug("collected: '"+collectedContent+"'");
+ content = null;
+ return;
+ }
+
+ // write collected content
+ if (collecting) {
+ String s = "";
+ if ((content != null) && (content.length() > 0)) {
+ s = content.toString().trim();
+ }
+ //logger.debug("collect:"+name+" = "+s);
+ collectedContent.append(s);
+ collectedContent.append("\n");
+ content = null;
+ return;
+ }
+ }
+
+ }
+
+ /**
+ * load and parse a file (as URL)
+ * returns HashMap with list data
+ * @deprecated Use {@link #loadUri(URI)} instead
+ */
+ public Map loadURL(String path) throws SAXException, IOException {
+ try {
+ return loadUri(new URI(path));
+ } catch (URISyntaxException e) {
+ logger.error("Unable to convert URI!");
+ throw new IOException(e);
+ }
+ }
+
+ /**
+ * Load and parse a file (as URI).
+ * returns HashMap with list data
+ */
+ public Map loadUri(URI uri) throws SAXException, IOException {
+ logger.debug("loading meta: "+uri);
+ // Create a JAXP SAXParserFactory and configure it
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ spf.setNamespaceAware(true);
+
+ SAXParser parser = null;
+ try {
+ // Create a JAXP SAXParser
+ parser = spf.newSAXParser();
+
+ } catch (ParserConfigurationException e) {
+ throw new SAXException(e);
+ }
+
+ // create a list parser (keeps the data!)
+ XMLMetaParser listParser = new XMLMetaParser();
+
+ // Tell the SAXParser to parse the XML document
+ parser.parse(uri.toString(), listParser);
+
+ return listParser.files;
+ }
+
+}
diff -r 888cdaf022fe -r cf8ecc67200e common/src/main/java/digilib/meta/XMLMetaLoader.java
--- a/common/src/main/java/digilib/meta/XMLMetaLoader.java Wed Mar 27 17:23:44 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-package digilib.meta;
-
-/*
- * #%L
- * XMLMetaLoader -- Load an XML format metadata into a Hashtable
- *
- * Digital Image Library servlet components
- *
- * %%
- * Copyright (C) 2003 - 2013 MPIWG Berlin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * .
- * #L%
- * Author: Robert Casties (robcast@berlios.de)
- */
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.log4j.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class XMLMetaLoader {
-
- private Logger logger = Logger.getLogger(this.getClass());
- private String metaTag = "meta";
- private String fileTag = "file";
- private String fileNameTag = "name";
- private String filePathTag = "path";
- private String imgTag = "img";
- private String collectTag = "context";
-
- public XMLMetaLoader() {
- }
-
- /**
- * inner class XMLMetaParser to be called by the parser
- */
- private class XMLMetaParser extends DefaultHandler {
-
- private LinkedList tags;
- private Map files;
- private MetadataMap meta;
- private StringBuffer content;
- private boolean collecting;
- private StringBuffer collectedContent;
- private String fileName;
- private String filePath;
-
- /**
- * extracts the elements name from either localName ln or qName qn.
- *
- * @param ln localName
- * @param qn qName
- * @return element name
- */
- private String getName(String ln, String qn) {
- if (ln != null) {
- if (ln.length() > 0) {
- return ln;
- }
- }
- // else it's qName (or nothing)
- return qn;
- }
-
- /**
- * returns all attributes as a String
- *
- * @param attrs
- * @return
- */
- private String getAttrString(Attributes attrs) {
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < attrs.getLength(); i++) {
- String key = getName(attrs.getLocalName(i), attrs.getQName(i));
- s.append(" "+key+"=\""+attrs.getValue(i)+"\"");
- }
- return s.toString();
- }
-
-
- // Parser calls this once at the beginning of a document
- public void startDocument() throws SAXException {
- tags = new LinkedList();
- files = new HashMap();
- collecting = false;
- collectedContent = null;
- }
-
- // Parser calls this for each element in a document
- public void startElement(
- String namespaceURI,
- String localName,
- String qName,
- Attributes atts)
- throws SAXException {
-
- String name = getName(localName, qName);
- // open a new tag
- tags.addLast(name);
- // start new content (no nesting of tags and content)
- content = new StringBuffer();
-
- if (name.equals(metaTag)) {
- // new meta tag
- meta = new MetadataMap();
- collectedContent = new StringBuffer();
- } else if (name.equals(fileTag)) {
- // new file tag
- fileName = null;
- filePath = null;
- meta = new MetadataMap();
- collectedContent = new StringBuffer();
- } else if (name.equals(collectTag)) {
- // start collecting
- collecting = true;
- if (collectedContent == null) {
- collectedContent = new StringBuffer();
- }
- }
-
- // record mode
- if (collecting) {
- collectedContent.append("<"+name);
- collectedContent.append(getAttrString(atts));
- collectedContent.append(">");
- }
- }
-
- // parser calls this for all tag content (possibly more than once)
- public void characters(char[] ch, int start, int length)
- throws SAXException {
- // append data to current string buffer
- if (content == null) {
- content = new StringBuffer();
- }
- content.append(ch, start, length);
- }
-
- // parser calls this at the end of each element
- public void endElement(
- String namespaceURI,
- String localName,
- String qName)
- throws SAXException {
-
- String name = getName(localName, qName);
- // exit the tag
- tags.removeLast();
- String lastTag = (tags.isEmpty()) ? "" : tags.getLast();
-
- // was it a file/name tag?
- if (name.equals(fileNameTag) && lastTag.equals(fileTag)) {
- // save name as filename
- if ((content != null) && (content.length() > 0)) {
- fileName = content.toString().trim();
- }
- content = null;
- return;
- }
-
- // was it a file/path tag?
- if (name.equals(filePathTag) && lastTag.equals(fileTag)) {
- // save path as filepath
- if ((content != null) && (content.length() > 0)) {
- filePath = content.toString().trim();
- }
- content = null;
- return;
- }
-
- // was it a file tag?
- if (name.equals(fileTag)) {
- // is there meta to save?
- if ((meta != null) && (meta.size() > 0)) {
- // file name is (optional file/path) / file/name
- String fn = null;
-
- if (fileName != null) {
- if (filePath != null) {
- fn = filePath + "/" + fileName;
- } else {
- fn = fileName;
- }
- } else {
- // no file name, no file
- content = null;
- return;
- }
- // save meta in file list
- files.put(fn, meta);
- }
- content = null;
- return;
- }
-
- // was it a meta tag outside a file tag?
- if (name.equals(metaTag) && !tags.contains(fileTag)) {
- // save meta as dir meta
- if ((meta != null) && (meta.size() > 0)) {
- files.put("", meta);
- }
- content = null;
- return;
- }
-
- // is this inside an digilib info (=img) tag?
- if (lastTag.equals(imgTag)) {
- // then add whatever this is
- if ((content != null) && (content.length() > 0)) {
- meta.put(name, content.toString().trim());
- }
- content = null;
- return;
- }
-
- // is this the end of collectTag?
- if (name.equals(collectTag)) {
- collecting = false;
- collectedContent.append("\n");
- // store collected stuff
- meta.put(collectTag, collectedContent.toString());
- //logger.debug("collected: '"+collectedContent+"'");
- content = null;
- return;
- }
-
- // write collected content
- if (collecting) {
- String s = "";
- if ((content != null) && (content.length() > 0)) {
- s = content.toString().trim();
- }
- //logger.debug("collect:"+name+" = "+s);
- collectedContent.append(s);
- collectedContent.append("\n");
- content = null;
- return;
- }
- }
-
- }
-
- /**
- * load and parse a file (as URL)
- * returns HashMap with list data
- */
- public Map loadURL(String path) throws SAXException, IOException {
- logger.debug("loading meta: "+path);
- // Create a JAXP SAXParserFactory and configure it
- SAXParserFactory spf = SAXParserFactory.newInstance();
- spf.setNamespaceAware(true);
-
- SAXParser parser = null;
- try {
- // Create a JAXP SAXParser
- parser = spf.newSAXParser();
-
- } catch (ParserConfigurationException e) {
- throw new SAXException(e);
- }
-
- // create a list parser (keeps the data!)
- XMLMetaParser listParser = new XMLMetaParser();
-
- // Tell the SAXParser to parse the XML document
- parser.parse(path, listParser);
-
- return listParser.files;
- }
-
-}
diff -r 888cdaf022fe -r cf8ecc67200e pdf/pom.xml
--- a/pdf/pom.xml Wed Mar 27 17:23:44 2013 +0100
+++ b/pdf/pom.xml Thu Mar 28 16:28:52 2013 +0100
@@ -31,6 +31,10 @@
jar
compile
+
+ org.jdom
+ jdom
+