Commit 1d8f4f3c authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

bug in propertychainof

parent aaa3c205

src/main/java/fr/emse/gitlab/saref/Constants.java

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ public class Constants { 
	public static final String REGEX_VERSION = "v(?<major>[1-9][0-9]*)\\.(?<minor>[0-9]+)\\.(?<patch>[0-9]+)";



	public static final String REGEX_ONTO_SERIES_URI = "^" + BASE + REGEX_EXT + "/$";

	public static final String REGEX_ONTO_URI = "^" + BASE + "(?<ext>core|saref4[a-z]{4})/(example/[^/]+[#/])?$";

	

	// output

src/main/java/fr/emse/gitlab/saref/jobs/ReadExamples.java

+3 −3
Original line number Diff line number Diff line
@@ -136,10 +136,10 @@ public class ReadExamples extends JobRunner { 
			String s = entry.getKey();

			String l = entry.getValue();

			if (l.contains("saref")) {

				if (!l.matches(Constants.REGEX_ONTO_SERIES_URI)) {

				if (!l.matches(Constants.REGEX_ONTO_URI)) {

					logger.warn(String.format(

							"Prefix `%s:` in the example file contains string \"saref\", but does not seem to match the official SAREF ontologies namespaces: `\\\\%s\\\\`. Got: `<%s>`",

							s, Constants.REGEX_ONTO_SERIES_URI, l));

							"Prefix `%s:` in the example file contains string \"saref\", but does not seem to match a SAREF ontologies namespace: `\\\\%s\\\\`. Got: `<%s>`",

							s, Constants.REGEX_ONTO_URI, l));

				}

			}

		}

src/main/resources/documentation/term/objectProperty.rqg

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ TEMPLATE <term/objectProperty.rqg>( ?op ) { 
  TEMPLATE {

    before = "\n<dt>{ fun:property(<en.properties>, 'hassubpropertychains') }</dt><dd>" ;

    TEMPLATE <term/propertyDescription.rqg>( ?op1 ) .

    TEMPLATE <subSubPropertyChain.rqg>( ?c1 ) .

    TEMPLATE <term/subSubPropertyChain.rqg>( ?c1 ) .

    ; separator = "<br/> "

    ; after = "</dd>"

  }