Merge pull request #668 from vChavezB/individual_external_props

Parsing external owl entities (direct/indirect imports) + individual facts with external owl entites
dgarijo · Jan 9, 2024 · 5b9b1de · 5b9b1de
2 parents 29f6a0d + 7064023
commit 5b9b1de
Show file tree

Hide file tree

Showing 17 changed files with 833 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,11 @@
 			<version>3.9.0</version>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.17.2</version>
+		</dependency>
 		<dependency>
 			<groupId>com.github.VisualDataWeb</groupId>
 			<artifactId>OWL2VOWL</artifactId>

diff --git a/src/main/java/widoco/Constants.java b/src/main/java/widoco/Constants.java
@@ -25,6 +25,7 @@
 
 import widoco.entities.Agent;
 import widoco.entities.Ontology;
+import widoco.ExternalPropertyParser;
 
 /**
  *
@@ -337,6 +338,7 @@ public class Constants {
 	public static final String LANG_CLASSES = "classes";
 	public static final String LANG_OBJ_PROP = "objProp";
 	public static final String LANG_DATA_PROP = "dataProp";
+	public static final String LANG_EXT_PROP = "extProp";
 	public static final String LANG_ANN_PROP = "annProp";
 	public static final String LANG_NAMED_INDIV = "namedIndiv";
 	public static final String LANG_TABLE_OF_CONTENTS = "tableOfContents";
@@ -1510,25 +1512,30 @@ public static String getLegend(
 				+ " <span class=\"backlink\"> " + lang.getProperty(Constants.LANG_BACK)
 				+ " <a href=\"#toc\">ToC</a></span></h2>\n"
 				+ "<div   class=\"entity\">\n"
-				+ (includesClass ?
+				+ (includesClass || ExternalPropertyParser.hasClasses()?
 				  "<sup class=\"type-c\" title=\""
 				  + lang.getProperty(Constants.LANG_CLASSES)
 				  + "\">c</sup>: " + lang.getProperty(Constants.LANG_CLASSES) + " <br/>\n"
 				  : "")
-				+ (includesProperty ?
+				+ (includesProperty || ExternalPropertyParser.hasObjProps()?
 				  "<sup class=\"type-op\" title=\""
 				  + lang.getProperty(Constants.LANG_OBJ_PROP) + "\">op</sup>: "
 				  + lang.getProperty(Constants.LANG_OBJ_PROP) + " <br/>\n"
 				  : "")
-				+ (includesDatatypeProperty ?
+				+ (includesDatatypeProperty  || ExternalPropertyParser.hasDataProps()?
 				  "<sup class=\"type-dp\" title=\""
 				  + lang.getProperty(Constants.LANG_DATA_PROP) + "\">dp</sup>: "
 				  + lang.getProperty(Constants.LANG_DATA_PROP) + " <br/>\n"
 				  : "")
-				+ (includesNamedIndividual ?
+				+ (includesNamedIndividual || ExternalPropertyParser.hasNamedIndiv() ?
 				  "<sup class=\"type-ni\" title=\""
 				  + lang.getProperty(Constants.LANG_NAMED_INDIV) + "\">ni</sup>: "
-				  + lang.getProperty(Constants.LANG_NAMED_INDIV) + "\n"
+				  + lang.getProperty(Constants.LANG_NAMED_INDIV) + " <br/>\n"
+				: "")
+				+ (ExternalPropertyParser.hasExternalProps() ?
+				"<sup class=\"type-ep\" title=\""
+						+ lang.getProperty(Constants.LANG_EXT_PROP) + "\">ep</sup>: "
+						+ lang.getProperty(Constants.LANG_EXT_PROP) + "\n"
 				: "")
 				+ "</div>\n" + "</div>"
 				+ "\n";

diff --git a/src/main/java/widoco/CreateResources.java b/src/main/java/widoco/CreateResources.java
@@ -70,7 +70,7 @@ public static void generateDocumentation(String outFolder, Configuration c, File
 		logger.info("- ontology IRI: " + c.getOntologyURI());
 		lodeContent = LODEGeneration.getLODEhtml(c, lodeResources);
 		LODEParser lode = new LODEParser(lodeContent, c, languageFile);
-                
+
 		if (c.isCreateHTACCESS()) {
                         File fOut = new File(folderOut);
                         if (!fOut.exists()) {