diff --git a/README.md b/README.md index cee0551..4d97941 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ WIDOCO helps you to publish and create an enriched and customized documentation **Author**: Daniel Garijo Verdejo (@dgarijo) -**Contributors**: María Poveda, Idafen Santana, Almudena Ruiz, Miguel Angel García, Oscar Corcho, Daniel Vila, Sergio Barrio, Martin Scharm, Maxime Lefrancois, Alfredo Serafini, @kartgk, Pat Mc Bennett, Christophe Camel, Jacobus Geluk, Martin Scharm, @rpietzsch, Jonathan Leitschuh, Jodi Schneider, Giacomo Lanza, Alejandra Gonzalez-Beltran, Mario Scrocca, Miguel Angel García, Flores Bakker and @JohnnyMoonlight. +**Contributors**: María Poveda, Idafen Santana, Almudena Ruiz, Miguel Angel García, Oscar Corcho, Daniel Vila, Sergio Barrio, Martin Scharm, Maxime Lefrancois, Alfredo Serafini, @kartgk, Pat Mc Bennett, Christophe Camel, Jacobus Geluk, Martin Scharm, @rpietzsch, Jonathan Leitschuh, Jodi Schneider, Giacomo Lanza, Alejandra Gonzalez-Beltran, Mario Scrocca, Miguel Angel García, Flores Bakker, @JohnnyMoonlight and René Fritze. **Citing WIDOCO**: If you used WIDOCO in your work, please cite the ISWC 2017 paper: https://iswc2017.semanticweb.org/paper-138 diff --git a/src/main/java/oops/OOPSevaluation.java b/src/main/java/oops/OOPSevaluation.java index b5466db..b3aa2cc 100644 --- a/src/main/java/oops/OOPSevaluation.java +++ b/src/main/java/oops/OOPSevaluation.java @@ -71,6 +71,7 @@ public OOPSevaluation(String content) throws IOException { + ""; String uri = Constants.OOPS_SERVICE_URL; URL url = new URL(uri); + System.out.println(request); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setConnectTimeout(Constants.OOPS_TIME_OUT); connection.setRequestMethod("POST"); diff --git a/src/main/java/widoco/Configuration.java b/src/main/java/widoco/Configuration.java index 1d8fc0c..db50573 100644 --- a/src/main/java/widoco/Configuration.java +++ b/src/main/java/widoco/Configuration.java @@ -641,6 +641,11 @@ private void completeOntologyMetadata(OWLAnnotation a, OWLOntology o) { value = a.getValue().asLiteral().get().getLiteral(); mainOntologyMetadata.setReleaseDate(value); break; + case Constants.PROP_SCHEMA_DATE_ISSUED: + case Constants.PROP_DCTERMS_ISSUED: + value = a.getValue().asLiteral().get().getLiteral(); + mainOntologyMetadata.setIssuedDate(value); + break; case Constants.PROP_DCTERMS_BIBLIOGRAPHIC_CIT: case Constants.PROP_SCHEMA_CITATION: value = WidocoUtils.getValueAsLiteralOrURI(a.getValue()); diff --git a/src/main/java/widoco/Constants.java b/src/main/java/widoco/Constants.java index ca3a14a..cc17272 100644 --- a/src/main/java/widoco/Constants.java +++ b/src/main/java/widoco/Constants.java @@ -44,7 +44,7 @@ public class Constants { public static final int LICENSIUS_TIME_OUT = 10000; public static final int OOPS_TIME_OUT = 10000; - public static final String OOPS_SERVICE_URL = "http://oops.linkeddata.es/rest"; + public static final String OOPS_SERVICE_URL = "https://oops.linkeddata.es/rest"; public static final String OOPS_NS = "http://oops.linkeddata.es/def#"; public static final String[] POSSIBLE_VOCAB_SERIALIZATIONS = { "application/rdf+xml", "text/turtle", "text/n3", @@ -93,6 +93,7 @@ public class Constants { public static final String PROP_SCHEMA_EMAIL = NS_SCHEMA + "email"; public static final String PROP_SCHEMA_AFFILIATION = NS_SCHEMA + "affiliation"; public static final String PROP_SCHEMA_IMAGE = NS_SCHEMA + "image"; + public static final String PROP_SCHEMA_DATE_ISSUED = NS_SCHEMA + "dateIssued"; public static final String PROP_OWL_VERSION_INFO = NS_OWL + "versionInfo"; public static final String PROP_OWL_PRIOR_VERSION = NS_OWL + "priorVersion"; @@ -118,6 +119,7 @@ public class Constants { public static final String PROP_DCTERMS_PUBLISHER = NS_DCTERMS + "publisher"; public static final String PROP_DCTERMS_CREATED = NS_DCTERMS + "created"; public static final String PROP_DCTERMS_MODIFIED = NS_DCTERMS + "modified"; + public static final String PROP_DCTERMS_ISSUED = NS_DCTERMS + "issued"; public static final String PROP_DCTERMS_BIBLIOGRAPHIC_CIT = NS_DCTERMS + "bibliographicCitation"; public static final String PROP_BIBO_DOI = NS_BIBO + "doi"; @@ -238,6 +240,7 @@ public class Constants { public static final String LANG_THIS_VERSION = "thisVersion"; public static final String LANG_LATEST_VERSION = "latestVersion"; public static final String LANG_PREVIOUS_VERSION = "previousVersion"; + public static final String LANG_ISSUED = "issued"; public static final String LANG_REVISION = "revision"; public static final String LANG_SERIALIZATION = "serialization"; public static final String LANG_LICENSE_URL_IF_NULL = "licenseURLIfNull"; @@ -245,7 +248,7 @@ public class Constants { public static final String LANG_LICENSE_IF_NULL = "licenseIfNull"; public static final String LANG_VISUALIZATION = "visualization"; public static final String LANG_CITE_AS = "citeAs"; - public static final String LANG_PRPOV_HEAD = "provHead"; + public static final String LANG_PROV_HEAD = "provHead"; public static final String LANG_OVERVIEW_PLACEHOLDER = "overviewPlaceHolder"; public static final String LANG_DESCRIPTION_PLACEHOLDER = "descriptionPlaceHolder"; public static final String LANG_CROSS_REF_TITLE = "crossRefTitle"; @@ -270,7 +273,7 @@ public class Constants { public static final String LANG_NAMED_INDIV = "namedIndiv"; public static final String LANG_TABLE_OF_CONTENTS = "tableOfContents"; public static final String LANG_COMPATIBLE = "compatible"; - public static final String LANG_INCOMPATIBLE = "incompatible"; + public static final String LANG_INCOMPATIBLE = "incompatible"; public static final String LANG_LEGEND = "legend"; // labels for the changelog @@ -869,6 +872,9 @@ public static String getHeadSection(Configuration c, Properties l) { if (c.getMainOntology().getRevision() != null && !"".equals(c.getMainOntology().getRevision())) head += "
" + l.getProperty(LANG_REVISION) + "
\n" + "
" + c.getMainOntology().getRevision() + "
\n"; + if (c.getMainOntology().getIssuedDate() != null && !"".equals(c.getMainOntology().getIssuedDate())) + head += "
" + l.getProperty(LANG_ISSUED) + "
\n" + "
" + c.getMainOntology().getIssuedDate() + + "
\n"; if (!c.getMainOntology().getCreators().isEmpty()) head += getAuthors(c.getMainOntology().getCreators(), l) + "\n"; if (!c.getMainOntology().getContributors().isEmpty()) @@ -951,7 +957,7 @@ public static String getHeadSection(Configuration c, Properties l) { if (c.isPublishProvenance()) { head += "" - + l.getProperty(LANG_PRPOV_HEAD) + ""; + + l.getProperty(LANG_PROV_HEAD) + ""; } head += "
\n" + "\n"; return head; diff --git a/src/main/java/widoco/entities/Ontology.java b/src/main/java/widoco/entities/Ontology.java index b93a6aa..3e48149 100644 --- a/src/main/java/widoco/entities/Ontology.java +++ b/src/main/java/widoco/entities/Ontology.java @@ -132,6 +132,11 @@ public class Ontology { */ private ArrayList images; + /** + * Issued date + */ + private String issuedDate; + public Ontology() { this.images = new ArrayList<>(); } @@ -286,6 +291,10 @@ public String getReleaseDate() { public void setReleaseDate(String releaseDate) { this.releaseDate = releaseDate; } + + public String getIssuedDate(){ return issuedDate;} + + public void setIssuedDate(String issuedDate){ this.issuedDate = issuedDate;} public ArrayList getImportedOntologies() { return importedOntologies; diff --git a/src/main/resources/lode.zip b/src/main/resources/lode.zip index b18645b..0460681 100644 Binary files a/src/main/resources/lode.zip and b/src/main/resources/lode.zip differ diff --git a/src/main/resources/lode/bootstrap-yeti-old.css b/src/main/resources/lode/bootstrap-yeti-old.css index 8ad8a75..3a312c4 100644 --- a/src/main/resources/lode/bootstrap-yeti-old.css +++ b/src/main/resources/lode/bootstrap-yeti-old.css @@ -1,5 +1,5 @@ -@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700,800"); -@import url("//fonts.googleapis.com/css?family=Montserrat:400,700"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700,800"); +@import url("https://fonts.googleapis.com/css?family=Montserrat:400,700"); /*! * Bootswatch v3.1.0+1 @@ -6586,4 +6586,4 @@ label,.control-label,.help-block,.checkbox,.radio { .affix { position: fixed; -} \ No newline at end of file +} diff --git a/src/main/resources/lode/bootstrap-yeti.css b/src/main/resources/lode/bootstrap-yeti.css index 50d3b35..7637801 100644 --- a/src/main/resources/lode/bootstrap-yeti.css +++ b/src/main/resources/lode/bootstrap-yeti.css @@ -1,5 +1,5 @@ -@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700,800"); -@import url("//fonts.googleapis.com/css?family=Montserrat:400,700"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700,800"); +@import url("https://fonts.googleapis.com/css?family=Montserrat:400,700"); /*! * Bootswatch v3.1.0+1 @@ -6633,4 +6633,4 @@ label,.control-label,.help-block,.checkbox,.radio { .status div span { font-family: "Tauri"; font-size: larger; -} \ No newline at end of file +} diff --git a/src/main/resources/widoco/cs.properties b/src/main/resources/widoco/cs.properties index 7896824..4f1a23a 100644 --- a/src/main/resources/widoco/cs.properties +++ b/src/main/resources/widoco/cs.properties @@ -3,6 +3,7 @@ thisVersion=Tato verze: latestVersion=Posledn\u00ed verze: previousVersion=P\u0159edchoz\u00ed verze: revision=Revize: +issued=Vydané dne date=Vyd\u00e1n\u00ed authors=Auto\u0159i: contributors=P\u0159isp\u011bvatel\u00e9: diff --git a/src/main/resources/widoco/de.properties b/src/main/resources/widoco/de.properties index 504d02f..7ec5b96 100644 --- a/src/main/resources/widoco/de.properties +++ b/src/main/resources/widoco/de.properties @@ -3,6 +3,7 @@ thisVersion=Diese Version: latestVersion=Aktuellste Version: previousVersion=Vorherige Version: revision=Revision: +issued=Ausgestellt am date=Release authors= Autoren: contributors=Beteiligte: diff --git a/src/main/resources/widoco/en.properties b/src/main/resources/widoco/en.properties index c7f54fe..97afe0e 100644 --- a/src/main/resources/widoco/en.properties +++ b/src/main/resources/widoco/en.properties @@ -4,12 +4,13 @@ latestVersion=Latest version: previousVersion=Previous version: revision=Revision: date=Release +issued= Issued on: authors= Authors: contributors=Contributors: extended=Extended Ontologies: imported=Imported Ontologies: abstract=Abstract -abstractPlaceHolder=This is a place holder text for the abstract. The abstract should contain a couple of sentences summarizing the ontology and its purpose. +abstractPlaceHolder=This is a placeholder text for the abstract. The abstract should contain a couple of sentences summarizing the ontology and its purpose. license=License: licenseIfNull=license name goes here licenseURLIfNull=http://insertlicenseURIhere.org @@ -23,7 +24,7 @@ overviewTitle=Overview overviewPlaceHolder=Overview back to ToC\n\nThis ontology has the following classes and properties.\n descriptionTitle=Description descriptionPlaceHolder=Description back to ToC\n\nThis is a placeholder text for the description of your ontology. The description should include an explanation and a diagram explaining how the classes are related, examples of usage, etc.\n -crossRefTitle=Cross reference for +crossRefTitle=Cross-reference for crossRefTitle2=classes, object properties and data properties back to ToC crossRefPlaceHolder=This section provides details for each class and property defined by classes=Classes diff --git a/src/main/resources/widoco/es.properties b/src/main/resources/widoco/es.properties index c141e91..edd4c15 100644 --- a/src/main/resources/widoco/es.properties +++ b/src/main/resources/widoco/es.properties @@ -3,6 +3,7 @@ thisVersion=Versión: latestVersion=Última Versión: previousVersion=Versión previa: revision=Revisión número: +issued=Fecha de emisión authors= Autores: date=Fecha de creación: contributors=Colaboradores: diff --git a/src/main/resources/widoco/fr.properties b/src/main/resources/widoco/fr.properties index cb2ae66..70c0ad1 100644 --- a/src/main/resources/widoco/fr.properties +++ b/src/main/resources/widoco/fr.properties @@ -3,6 +3,7 @@ thisVersion=Cette version: latestVersion=Derniè re version: previousVersion=Précédente version: revision=Révision: +issued=Émis le date=Release authors= Auteurs: contributors=Contributeurs: diff --git a/src/main/resources/widoco/it.properties b/src/main/resources/widoco/it.properties index 3b2921f..8043c93 100644 --- a/src/main/resources/widoco/it.properties +++ b/src/main/resources/widoco/it.properties @@ -8,6 +8,7 @@ thisVersion=Questa versione: latestVersion=Ultima versione: previousVersion=Versione precedente: revision=Revisione: +issued=Rilasciato il date=Data di pubblicazione authors= Autori: contributors=Collaboratori: diff --git a/src/main/resources/widoco/nl.properties b/src/main/resources/widoco/nl.properties index 975f87b..7373d0e 100644 --- a/src/main/resources/widoco/nl.properties +++ b/src/main/resources/widoco/nl.properties @@ -3,6 +3,7 @@ thisVersion=Deze versie: latestVersion=Laatste versie: previousVersion=Vorige versie: revision=Revisie: +issued=Afgegeven op date=Release authors= Auteurs: contributors=Bijdragers: diff --git a/src/main/resources/widoco/pt.properties b/src/main/resources/widoco/pt.properties index 1465b93..9d76ce7 100644 --- a/src/main/resources/widoco/pt.properties +++ b/src/main/resources/widoco/pt.properties @@ -3,6 +3,7 @@ thisVersion=Versão: latestVersion=Última versão: previousVersion=Versão anterior: revision=Revisão: +issued=Emitida em date=Data de criaçao authors= Autores: contributors=Contribuintes: