Fixes

PRImA-Research-Lab · Mar 13, 2019 · bdc7a6c · bdc7a6c
1 parent fda08a6
commit bdc7a6c
Show file tree

Hide file tree

Showing 10 changed files with 556 additions and 11 deletions.
diff --git a/java/PrimaDla/apidoc/org/primaresearch/dla/page/AlternativeImage.html b/java/PrimaDla/apidoc/org/primaresearch/dla/page/AlternativeImage.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Wed Jan 09 15:54:26 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Wed Mar 13 09:52:55 GMT 2019 -->
 <title>AlternativeImage (PrimaDla API)</title>
-<meta name="date" content="2019-01-09">
+<meta name="date" content="2019-03-13">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -351,6 +351,6 @@ <h4>setConfidence</h4>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><i>Copyright &#169; 2019 PPImA Research Lab. All Rights Reserved.</i></small></p>
+<p class="legalCopy"><small><i>Copyright &#169; 2019 PRImA Research Lab. All Rights Reserved.</i></small></p>
 </body>
 </html>
diff --git a/java/PrimaDla/apidoc/org/primaresearch/dla/page/Page.MeasurementUnit.html b/java/PrimaDla/apidoc/org/primaresearch/dla/page/Page.MeasurementUnit.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Wed Jan 09 15:54:26 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Wed Mar 13 09:52:55 GMT 2019 -->
 <title>Page.MeasurementUnit (PrimaDla API)</title>
-<meta name="date" content="2019-01-09">
+<meta name="date" content="2019-03-13">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -374,6 +374,6 @@ <h4>equals</h4>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><i>Copyright &#169; 2019 PPImA Research Lab. All Rights Reserved.</i></small></p>
+<p class="legalCopy"><small><i>Copyright &#169; 2019 PRImA Research Lab. All Rights Reserved.</i></small></p>
 </body>
 </html>
diff --git a/java/PrimaDla/apidoc/org/primaresearch/dla/page/Page.html b/java/PrimaDla/apidoc/org/primaresearch/dla/page/Page.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Wed Jan 09 15:54:26 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Wed Mar 13 09:52:55 GMT 2019 -->
 <title>Page (PrimaDla API)</title>
-<meta name="date" content="2019-01-09">
+<meta name="date" content="2019-03-13">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -652,6 +652,6 @@ <h4>setLabels</h4>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small><i>Copyright &#169; 2019 PPImA Research Lab. All Rights Reserved.</i></small></p>
+<p class="legalCopy"><small><i>Copyright &#169; 2019 PRImA Research Lab. All Rights Reserved.</i></small></p>
 </body>
 </html>
diff --git a/java/PrimaDla/src/org/primaresearch/dla/page/io/xml/PageXmlModelAndValidatorProvider.java b/java/PrimaDla/src/org/primaresearch/dla/page/io/xml/PageXmlModelAndValidatorProvider.java
@@ -115,6 +115,11 @@ protected void addDefaultSchemas() {
 								new URL("http://www.loc.gov/standards/alto/v3/alto.xsd"),
 								false);
 
+			//ALTO 4.0
+			addSchemaSource(	new XmlFormatVersion("http://www.loc.gov/standards/alto/ns-v4#"), 
+								new URL("http://www.loc.gov/standards/alto/v4/alto-4-0.xsd"),
+								false);
+
 			//HOCR
 			addSchemaSource(	new XmlFormatVersion("HOCR"), 
 								null,

diff --git a/java/PrimaDla/src/org/primaresearch/dla/page/io/xml/sax/SaxPageHandlerFactory.java b/java/PrimaDla/src/org/primaresearch/dla/page/io/xml/sax/SaxPageHandlerFactory.java
@@ -46,6 +46,7 @@ else if (((XmlFormatVersion)schemaVersion).toString().equals("HOCR"))
 				//ALTO
 				else if (((XmlFormatVersion)schemaVersion).toString().equals("http://www.loc.gov/standards/alto/ns-v2#")
 						|| ((XmlFormatVersion)schemaVersion).toString().equals("http://www.loc.gov/standards/alto/ns-v3#")
+						|| ((XmlFormatVersion)schemaVersion).toString().equals("http://www.loc.gov/standards/alto/ns-v4#")
 						|| ((XmlFormatVersion)schemaVersion).toString().equals("http://schema.ccs-gmbh.com/ALTO")) //1.1
 					return new SaxPageHandler_Alto_2_1(validatorProvider, schemaVersion);
 			}
@@ -59,9 +60,11 @@ else if (schemaVersion.isOlderThan(new XmlFormatVersion("2016-07-15")))
 				return new SaxPageHandler_2013_07_15(validatorProvider, schemaVersion);
 			else if (schemaVersion.isOlderThan(new XmlFormatVersion("2017-07-15")))
 				return new SaxPageHandler_2016_07_15(validatorProvider, schemaVersion);
+			else if (schemaVersion.isOlderThan(new XmlFormatVersion("2018-07-15")))
+				return new SaxPageHandler_2017_07_15(validatorProvider, schemaVersion);
 		}
 
 		//Latest schema
-		return new SaxPageHandler_2017_07_15(validatorProvider, schemaVersion);
+		return new SaxPageHandler_2018_07_15(validatorProvider, schemaVersion);
 	}
 }