PAGE 2019

PAGE XML 2019-07-15
PRImA-Research-Lab · Sep 3, 2019 · e209c9d · e209c9d
1 parent 0eddb79
commit e209c9d
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 35 deletions.
diff --git a/apidoc/allclasses-frame.html b/apidoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>All Classes (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/allclasses-noframe.html b/apidoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>All Classes (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/constant-values.html b/apidoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Constant Field Values (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/deprecated-list.html b/apidoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Deprecated List (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/help-doc.html b/apidoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>API Help (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/index-all.html b/apidoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Index (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -103,7 +103,7 @@ <h2 class="title">P</h2>
 </a>
 <h2 class="title">R</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#run-java.lang.String-java.lang.String-">run(String, String)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
+<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#run-java.lang.String-java.lang.String-boolean-">run(String, String, boolean)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
 <dd>
 <div class="block">Runs the conversion</div>
 </dd>

diff --git a/apidoc/index.html b/apidoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>JPageConverter API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;

diff --git a/apidoc/org/primaresearch/dla/page/converter/PageConverter.html b/apidoc/org/primaresearch/dla/page/converter/PageConverter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>PageConverter (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -158,8 +158,9 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#run-java.lang.String-java.lang.String-">run</a></span>(java.lang.String&nbsp;sourceFilename,
-   java.lang.String&nbsp;targetFilename)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#run-java.lang.String-java.lang.String-boolean-">run</a></span>(java.lang.String&nbsp;sourceFilename,
+   java.lang.String&nbsp;targetFilename,
+   boolean&nbsp;json)</code>
 <div class="block">Runs the conversion</div>
 </td>
 </tr>
@@ -243,14 +244,15 @@ <h4>main</h4>
 </dl>
 </li>
 </ul>
-<a name="run-java.lang.String-java.lang.String-">
+<a name="run-java.lang.String-java.lang.String-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
 <pre>public&nbsp;void&nbsp;run(java.lang.String&nbsp;sourceFilename,
-                java.lang.String&nbsp;targetFilename)</pre>
+                java.lang.String&nbsp;targetFilename,
+                boolean&nbsp;json)</pre>
 <div class="block">Runs the conversion</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

diff --git a/apidoc/org/primaresearch/dla/page/converter/class-use/PageConverter.html b/apidoc/org/primaresearch/dla/page/converter/class-use/PageConverter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Uses of Class org.primaresearch.dla.page.converter.PageConverter (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-frame.html b/apidoc/org/primaresearch/dla/page/converter/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-summary.html b/apidoc/org/primaresearch/dla/page/converter/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-tree.html b/apidoc/org/primaresearch/dla/page/converter/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>org.primaresearch.dla.page.converter Class Hierarchy (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-use.html b/apidoc/org/primaresearch/dla/page/converter/package-use.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Uses of Package org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/overview-tree.html b/apidoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Jan 10 16:46:09 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Tue Sep 03 16:49:39 BST 2019 -->
 <title>Class Hierarchy (JPageConverter API)</title>
-<meta name="date" content="2019-01-10">
+<meta name="date" content="2019-09-03">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/src/org/primaresearch/dla/page/converter/PageConverter.java b/src/org/primaresearch/dla/page/converter/PageConverter.java
@@ -18,6 +18,8 @@
 import java.io.File;
 
 import org.primaresearch.dla.page.Page;
+import org.primaresearch.dla.page.io.FileInput;
+import org.primaresearch.dla.page.io.json.GoogleJsonPageReader;
 import org.primaresearch.dla.page.io.xml.PageXmlInputOutput;
 import org.primaresearch.dla.page.layout.physical.ContentObject;
 import org.primaresearch.dla.page.layout.physical.ContentObjectProcessor;
@@ -59,12 +61,19 @@ public static void main(String[] args) {
 
 		//Parse arguments
 		String sourceFilename = null;
+		boolean json = false;
 		String targetFilename = null;
 		String gtsidPattern = null;
 		String textFilterRuleFile = null;
 		for (int i=0; i<args.length; i++) {
 			if ("-source-xml".equals(args[i])) {
 				i++;
+				json = false;
+				sourceFilename = args[i];
+			}
+			else if ("-source-json".equals(args[i])) {
+				i++;
+				json = true;
 				sourceFilename = args[i];
 			}
 			else if ("-target-xml".equals(args[i])) {
@@ -103,7 +112,7 @@ else if ("-text-filter".equals(args[i])) {
 		}
 
 		//Run conversion
-		converter.run(sourceFilename, targetFilename);
+		converter.run(sourceFilename, targetFilename, json);
 	}
 
 	/**
@@ -117,6 +126,8 @@ private static void showUsage() {
 		System.out.println("Arguments:");
 		System.out.println("");
 		System.out.println("  -source-xml <XML file>        PAGE XML file to convert.");
+		System.out.println("     OR");
+		System.out.println("  -source-json <JSON file>      JSON file to convert (e.g. Google Cloud Vision output).");
 		System.out.println("");
 		System.out.println("  -target-xml <XML file>        Output PAGE XML file.");
 		System.out.println("");
@@ -144,11 +155,14 @@ private static void showUsage() {
 	 * @param sourceFilename File path of input PAGE XML
 	 * @param targetFilename File path to output PAGE XML
 	 */
-	public void run(String sourceFilename, String targetFilename) {
+	public void run(String sourceFilename, String targetFilename, boolean json) {
 		//Load
 		Page page = null;
 		try {
-			page = PageXmlInputOutput.readPage(sourceFilename);
+			if (json)
+				page = new GoogleJsonPageReader().read(new FileInput(new File(sourceFilename)));
+			else //XML
+				page = PageXmlInputOutput.readPage(sourceFilename);
 		} catch (Exception e) {
 			System.err.println("Could not load source PAGE XML file: "+sourceFilename);
 			e.printStackTrace();