diff --git a/ols-apps/ols-config-importer/src/main/resources/obo-config.yaml b/ols-apps/ols-config-importer/src/main/resources/obo-config.yaml index 7101883a..cb05fbdc 100644 --- a/ols-apps/ols-config-importer/src/main/resources/obo-config.yaml +++ b/ols-apps/ols-config-importer/src/main/resources/obo-config.yaml @@ -178,7 +178,7 @@ ontologies: license: label: GPL-3.0 url: https://www.gnu.org/licenses/gpl-3.0.en.html - ontology_purl: https://github.com/scdodev/scdo-ontology/blob/master/scdo_fr-t-en.owl + ontology_purl: https://raw.githubusercontent.com/scdodev/scdo-ontology/master/scdo_fr-t-en.owl preferredPrefix: SCDO products: - id: scdo.owl diff --git a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Individual.java b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Individual.java index 4de6ddff..9bb13be4 100644 --- a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Individual.java +++ b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Individual.java @@ -210,10 +210,10 @@ public Map getAnnotationByLang(String lang) { for (String k : localizedAnnotations.keySet()) { - int n = lang.lastIndexOf('-'); + int n = k.lastIndexOf('-'); if(n != -1) { - String annoLang = lang.substring(0, n); + String annoLang = k.substring(0, n); if (annoLang.equalsIgnoreCase(lang)) { res.put(k.substring(n + 1), localizedAnnotations.get(k)); diff --git a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Property.java b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Property.java index 89b1b010..b1976a42 100644 --- a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Property.java +++ b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Property.java @@ -209,10 +209,10 @@ public Map getAnnotationByLang(String lang) { for (String k : localizedAnnotations.keySet()) { - int n = lang.lastIndexOf('-'); + int n = k.lastIndexOf('-'); if(n != -1) { - String annoLang = lang.substring(0, n); + String annoLang = k.substring(0, n); if (annoLang.equalsIgnoreCase(lang)) { res.put(k.substring(n + 1), localizedAnnotations.get(k)); diff --git a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Term.java b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Term.java index 9c0e1167..25e2ed3f 100644 --- a/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Term.java +++ b/ols-neo4j/src/main/java/uk/ac/ebi/spot/ols/neo4j/model/Term.java @@ -292,10 +292,10 @@ public Map getAnnotationByLang(String lang) { for (String k : localizedAnnotations.keySet()) { - int n = lang.lastIndexOf('-'); + int n = k.lastIndexOf('-'); if(n != -1) { - String annoLang = lang.substring(0, n); + String annoLang = k.substring(0, n); if (annoLang.equalsIgnoreCase(lang)) { res.put(k.substring(n + 1), localizedAnnotations.get(k)); diff --git a/ols-web/src/main/resources/static/css/new_ols.css b/ols-web/src/main/resources/static/css/new_ols.css index acdfde15..109e1a8f 100644 --- a/ols-web/src/main/resources/static/css/new_ols.css +++ b/ols-web/src/main/resources/static/css/new_ols.css @@ -450,7 +450,6 @@ button.list-group-item:hover, button.list-group-item:focus { height: 16px; float: left; margin: 3px 4px 0 1px; } - .jstree-anchor.type:before { background: url("../img/instance_of.png") no-repeat; background-size: 16px; @@ -723,4 +722,4 @@ footer { font-size: small; font-family: monospace; } -/*# sourceMappingURL=new_ols.css.map */ \ No newline at end of file +/*# sourceMappingURL=new_ols.css.map */ diff --git a/ols-web/src/main/resources/static/css/new_ols.css.map b/ols-web/src/main/resources/static/css/new_ols.css.map index 6daf6ddc..dd4418d5 100644 --- a/ols-web/src/main/resources/static/css/new_ols.css.map +++ b/ols-web/src/main/resources/static/css/new_ols.css.map @@ -1,10 +1,7 @@ { - "version": 3, - "file": "new_ols.css", - "sources": [ - "../../scss/new_ols.scss", - "../../scss/new_ols.scss/JSASS_CUSTOM.scss" - ], - "names": [], - "mappings": "AAAA,AAAA,KAAK,CAAC;EACJ,YAAY,CAAA,QAAC;EACb,WAAW,CAAA,QAAC,GACb;;AAED,AAAA,kBAAkB,CAAC;EACjB,UAAU,EAAE,IAAI,GASjB;EAVD,AAGE,kBAHgB,CAGhB,IAAI,CAAC;IACH,SAAS,EAAE,KAAK,GACjB;EALH,AAOE,kBAPgB,CAOhB,EAAE,CAAC;IACD,KAAK,EAAE,gBAAgB,GACxB;;AAGH,AAAA,kBAAkB,CAAC;EACjB,MAAM,EAAE,mBAAmB;EAC3B,UAAU,EAAE,OAAO;EACnB,OAAO,EAAE,mBAAmB;EAC5B,aAAa,EAAE,GAAG,GACnB;;AAED;;;;GAIG;AAEH,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,IAAI,GACjB;;AAED,uBAAuB;AACvB,AAAA,aAAa,CAAC;EACZ,WAAW,EAAE,GAAG;EAEhB,aAAa,EAAE,CAAC;EAChB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,GAAG,GACpB;;AAED,sBAAsB;AACtB,AAAA,CAAC,AAAA,aAAa,CAAC;EACb,OAAO,EAAE,YAAY;EACrB,iCAAiC;EACjC,OAAO,EAAE,iBAAiB;EAC1B,gBAAgB,EACR,OAAgB;EACxB,yBAAyB;EAAA,UAAU;EAAA,uBAAuB;EAC1D,KAAK,EAAE,KAAK;EACZ,aAAa,EACL,KAAK;EACb,aAAa,EAAE,IAAI,GACpB;;AAGD,yDAAyD;AACzD,AAAA,yBAAyB,CAAC,WAAW,CAAC,QAAQ,CAAC;EAC7C,OAAO,EAAE,YAAY,GACtB;;AAED,AAAA,yBAAyB,CAAC,CAAC,EAAE,CAAC,AAAA,QAAQ,CAAC;EACrC,mBAAmB,EAAE,CAAC;EACtB,mBAAmB,EAAE,IAAI,GAC1B;;AAED;;;;GAIG;AAEH,AAAA,yBAAyB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;EAClD,UAAU,EAAE,WAAW,GACxB;;AAED,AAAA,gBAAgB,CAAC;EACf,KAAK,EAAE,IAAI,GAKZ;EAND,AAGE,gBAHc,CAGd,EAAE,CAAC;IACD,cAAc,EAAE,cAAc,GAC/B;;AAIH,iBAAiB;AACjB,AAAA,UAAU,CAAC;EACT,UAAU,EACF,GAAG;EACX,aAAa,EACL,GAAG;EACX,WAAW,EACH,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,YAAY,EAAE,IAAI;EAClB,UAAU,EAAE,sBAAqB,GAClC;;AAED,AAAA,iBAAiB,CAAC;EAChB,KAAK,EAAE,OAAgB,GACxB;;AAED,AAAA,OAAO,AAAA,UAAU,AAAA,iBAAiB,EAAE,OAAO,AAAA,UAAU,AAAA,aAAa,CAAC;EACjE,gBAAgB,EAAE,OAAgB;EAClC,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,QAAQ,CAAC;EACP,SAAS,EAAE,CAAC,GACb;;AAED,AAAA,YAAY,CAAC,YAAY,CAAC;EACxB,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,YAAY,CAAC,gBAAgB,CAAC;EAC5B,YAAY,EAAE,IAAI,GACnB;;AAED,AAAA,eAAe,CAAC;EACd,UAAU,EACF,MAAM;EACd,wBAAwB,EAEzB;;AAED,AAAA,eAAe,GAAG,OAAO,CAAC;EACxB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,uBAAuB,CAAC;EACtB,YAAY,EAAE,IAAI,GACnB;;AAED,AAAA,qBAAqB,CAAC;EACpB,UAAU,EAAE,MAAM;EAClB,4BAA4B;EAC5B,OAAO,EAAE,QAAQ,GAClB;;AAED,AAAA,qBAAqB,CAAC,IAAI,CAAC;EACzB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,sBAAsB,CAAC;EACrB,aAAa,EAAE,CAAC,GACjB;;AAED,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,OAAO,GACvB;;AAED,AAAA,6BAA6B,CAAC;EAC5B,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,mBAAmB,CAAC;EAClB,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,GAAG,GACf;;AAED,AAAA,WAAW,CAAC;EACV,cAAc,EAAE,GAAG,GACpB;;AAED,AAAA,IAAI,AAAA,kBAAkB,AAAA,YAAY,CAAC,aAAa,AAAA,UAAU,AAAA,SAAS,CAAC;EAClE,aAAa,EAAE,GAAG,GACnB;;AAED,AAAA,CAAC,AAAA,YAAY,AAAA,cAAc,CAAC;EAC1B,KAAK,EAAE,OAAgB,GACxB;;AAED,AAAA,kBAAkB,CAAC,4BAA4B,CAAC,4BAA4B,CAAC,0BAA0B,CAAC;EACtG,WAAW,EAAE,MAAM,GACpB;;AAED,IAAI;AAEJ,AAAA,kBAAkB,CAAC;EACjB,OAAO,EAAE,MAAM,GAChB;;AAED,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,WAAW,CAAC,aAAa,AAAA,UAAU,CAAC;EAClC,MAAM,EAAE,CAAC,GACV;;AAED,AAAA,eAAe,CAAC;EACd,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,IAAI;EAChB,YAAY,EAAE,GAAG;EACjB,WAAW,EAAE,GAAG,GACjB;;AAID,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,YAAY;EAErB,MAAM,EAAE,QAAQ,GACjB;;AAED,AAAA,SAAS,EAAE,YAAY,CAAC;EACtB,YAAY,EAAE,GAAG,GAClB;;AAGD,2CAA2C;AAC3C,AAAA,6BAA6B,CAAC;EAC5B,OAAO,EAAE,MAAM;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,kBAAkB,CAAC;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,uBAAuB,CAAC;EACtB,SAAS,EAAE,OAAO;EAClB,KAAK,EAAE,IAAI,GACZ;;AAED,AAAA,qBAAqB,CAAC;EACpB,SAAS,EAAE,OAAO,GACnB;;AAGD,iBAAiB;AACjB,AAAA,MAAM,CAAC;EACL,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAA,kBAAkB,CAAC,cAAc,CAAC;EAChC,UAAU,EAAE,OAAO;EACnB,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;EACnC,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,kBAAkB,CAAC,WAAW,CAAC;EAC7B,OAAO,EAAE,mBAAmB,GAC7B;;AAED,AAAA,iBAAiB,CAAC,aAAa,CAAC;EAC9B,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,WAAW,CAAC,kBAAkB,CAAC;EAC7B,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,sBAAsB,CAAC;EACzC,aAAa,EAAE,CAAC,GACjB;;AAED,AACE,oBADkB,CAClB,KAAK,CAAC;EACJ,MAAM,EAAE,IAAI,GAcb;EAhBH,AAII,oBAJgB,CAClB,KAAK,CAGH,EAAE,CAAC;IACD,gBAAgB,EAAE,WAAW,GAU9B;IAfL,AAOM,oBAPc,CAClB,KAAK,CAGH,EAAE,CAGA,EAAE,CAAC;MACD,OAAO,EAAE,YAAY,GAMtB;MAdP,AAUQ,oBAVY,CAClB,KAAK,CAGH,EAAE,CAGA,EAAE,CAGA,CAAC,CAAC;QACA,SAAS,EAAE,QAAQ;QACnB,KAAK,EAAE,OAAO,GACf;;AAMT,eAAe;AACf,AAAA,eAAe,CAAC,cAAc,CAAC;EAC7B,UAAU,EAAE,OAAO;EACnB,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,MAAM;EACpB,cAAc,EAAE,OAAO,GACxB;;AAED,AAAA,cAAc,CAAC,OAAO,CAAC;EACrB,MAAM,EAAE,OAAO;EACf,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,MAAM,GACrB;;AAED,AAAA,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;EAChC,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,eAAe,CAAC,WAAW,CAAC;EAC1B,OAAO,EAAE,mBAAmB,GAC7B;;AAED,AAAA,kBAAkB,CAAC,aAAa,CAAC;EAC/B,UAAU,EAAE,KAAK,GAClB;;AAED,AAAA,kBAAkB,CAAC;EACjB,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,kBAAkB,CAAC,kBAAkB,CAAC;EACpC,KAAK,EAAE,IAAI,GACZ;;AAED;;;GAGG;AAEH,AAAA,kBAAkB,CAAC,OAAO,CAAC;EACzB,cAAc,EAAE,GAAG,GACpB;;AAED,AAAA,WAAW,CAAC;EACV,cAAc,EAAE,QAAQ;EACxB,MAAM,EAAE,OAAO;EACf,WAAW,EAAE,IAAI,GAClB;;AAGD,uCAAuC;AACvC,AAAA,cAAc,CAAC;EACb,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,oBAAoB,CAAC;EACnB,KAAK,EAAE,KAAK;EACZ,WAAW,EAAE,GAAG,GACjB;;AAED,AAAA,oBAAoB,CAAC;EACnB,SAAS,EAAE,KAAK,GACjB;;AAGD,6BAA6B;AAC7B,AAAA,UAAU,CAAC;EACT,UAAU,EAAE,IAAI;EAChB,YAAY,EAAE,IAAI,GACnB;;AAGD,kGAAkG;AAClG,AAAA,qBAAqB,CAAC;EACpB,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,MAAM;EACtB,MAAM,EAAE,UAAU;EAClB,WAAW,EAAE,OAAO;EACpB,OAAO,EAAE,UAAU;EACnB,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,qBAAqB;EAC7B,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,qDAAqD;EACjE,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,CAAC;EACd,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,OAAO;EACf,gBAAgB,EAAE,IAAI;EACtB,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,SAAS,CAAC;EACR,QAAQ,EAAE,QAAQ,GACnB;;AAED,AAAA,iBAAiB,CAAC;EAChB,gBAAgB,EAAE,KAAK;EACvB,WAAW,EAAE,GAAG;EAChB,aAAa,EAAE,GAAG;EAClB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,CAAC,GACT;;AAED,AAAA,iBAAiB,CAAC,OAAO,CAAC;EACxB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,CAAC;EACd,MAAM,EAAE,OAAO;EACf,WAAW,EAAE,IAAI,GAClB;;AAED,AAAA,gBAAgB,CAAC;EACf,OAAO,EAAE,KAAK;EACd,MAAM,EAAE,SAAS;EACjB,KAAK,EAAE,KAAK;EACZ,WAAW,EAAE,OAAO;EACpB,OAAO,EAAE,UAAU;EACnB,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,qBAAqB;EAC7B,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,qDAAqD;EACjE,SAAS,EAAE,MAAM;EACjB,WAAW,EAAE,CAAC;EACd,UAAU,EAAE,MAAM;EAClB,MAAM,EAAE,OAAO;EACf,gBAAgB,EAAE,IAAI;EACtB,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,YAAY,CAAC;EACX,cAAc,EAAE,GAAG;EACnB,KAAK,EAAE,KAAK,GACb;;AAED,yBAAyB;AACzB,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,IAAI;EACb,aAAa,EAAE,IAAI;EACnB,MAAM,EAAE,qBAAqB;EAC7B,aAAa,EAAE,GACjB,GAAC;;AAED,uCAAuC;AACvC,AAAA,QAAQ,CAAC;EACP,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,IAAI,GACnB;;AAED,AAAA,aAAa,AAAA,QAAQ;AACrB,iBAAiB,AAAA,QAAQ,CAAC;EACxB,OAAO,EAAE,CAAC,GACX;;AAED,yBAAyB;AACzB,AAAA,gBAAgB,CAAC;EACf,UAAU,EAAE,KAAK,GAClB;;AAED,AAAA,MAAM,CAAC;EACL,SAAS,EACD,GAAG;EACX,OAAO,EACC,eAAe;EACvB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,CAAC;EACd,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,MAAM;EACtB,gBAAgB,EACR,OAAgB;EACxB,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,WAAW,CAAC;EACV,aAAa,EAAE,IAAI,GACpB;;AAED,AAAA,gBAAgB,CAAC;EACf,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,KAAK;EACd,OAAO,EAAE,SAAS;EAElB,MAAM,EAAE,IAAI;EACZ,gBAAgB,EAAE,IAAI;EACtB,MAAM,EAAE,cAAc;EACtB,KAAK,EACG,IAAI;EACZ,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,MAAM,AAAA,gBAAgB,CAAC;EACrB,MAAM,EAAE,OAAO,GAChB;;AAED,AAAA,MAAM,AAAA,gBAAgB,AAAA,MAAM,EAAE,MAAM,AAAA,gBAAgB,AAAA,MAAM,CAAC;EACzD,gBAAgB,EAAE,sBAAqB,GACxC;;AAED,AAAA,YAAY,CAAC;EACX,cAAc,EAAE,MAAM,GACvB;;AAED,AAAA,YAAY,CAAC,kBAAkB,CAAC;EAC9B,KAAK,EACG,IAAI;EACZ,mBAAmB;EACnB,MAAM,EAAE,iBAAiB,GAC1B;;AAED,AAAA,sBAAsB,CAAC;EACrB,UAAU,EAAE,YAAY,GACzB;;AAED,AAAA,aAAa,CAAC;EACZ,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,IAAI,GACjB;;AAED,AAAA,cAAc,CAAC;EACb,UAAU,EAAE,IAAI;EAChB,aAAa,EACL,CAAC;EACT,yBAAyB,EAC1B;;AAED,AAAA,cAAc,CAAC,kBAAkB,CAAC;EAChC,KAAK,EAAE,GAAG,GACX;;AAGD,gDAAgD;AAChD,AAAA,UAAU,CAAC;EACT,YAAY,EAAE,IAAI;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,IAAI;EAClB,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,IAAI,GACnB;;AAGD,6BAA6B;AAC7B,AAAA,QAAQ,CAAC;EACP,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,QAAQ,CAAC;EACP,KAAK,EAAE,KAAK,GACb;;AAED,AAAA,KAAK,CAAC;EACJ,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,KAAK,CAAC;EACJ,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,MAAM,CAAC;EACL,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,IAAI,CAAC;EACH,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,IAAI,CAAC;EACH,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,QAAQ,CAAC;EACP,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,MAAM,GACnB;;AAED,AAAA,QAAQ,CAAC;EACP,OAAO,EAAE,4BAA4B;EACrC,MAAM,EAAE,cAAc;EACtB,gBAAgB,EAAE,OAAO;EACzB,WAAW,EAAE,+CAA+C;EAC5D,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,OAAO,GACf;;AAED,AAEE,cAFY,AAEX,QAAQ,AAAA,OAAO,CAAC;EACf,UAAU,EAAE,yBAAyB,CAAC,SAAS;EAC/C,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,aAAa,GACtB;;AAXH,AAcE,cAdY,AAcX,KAAK,AAAA,OAAO,CAAC;EACZ,UAAU,EAAE,6BAA6B,CAAC,SAAS;EACnD,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,aAAa,GACtB;;AAIH,wCAAwC;AACxC,AAAA,YAAY,CAAC;EACX,YAAY,EAAE,IAAI;EAClB,SAAS,EAAE,CAAC,GAgBb;EAlBD,AAIE,YAJU,GAIR,CAAC,CAAC;IACF,SAAS,EAAE,IAAI,GAChB;EANH,AAQE,YARU,GAQR,EAAE,CAAC;IACH,MAAM,EAAE,IAAI;IACZ,cAAc,EAAE,MAAM;IACtB,SAAS,EAAE,OAAO;IAClB,cAAc,EAAE,IAAI,GAKrB;IAjBH,AAcI,YAdQ,GAQR,EAAE,AAMD,IAAK,CAAA,WAAW,CAAC,OAAO,CAAC;MACxB,MAAM,EAAE,QAAQ,GACjB;;CAIL,AAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,IAAgB,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,MAAM,CAAC;EACrC,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,IAAI,GACjB;;CAED,AAAA,AAAA,IAAC,CAAK,MAAM,AAAX,CAAY,MAAM,CAAC;EAClB,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,OAAgB;EAClC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,GAC3C;;AA6CD,AAAA,YAAY,CAAC;EA1BT,SAAS,EAAE,IAAI;EAEjB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,MAA0B;EAEtC,YAAY,EAAE,MAA0C;EACxD,aAAa,EAAE,OAA2B;EAG1C,WAAW,EAAE,MAAuD;EACpE,OAAO,EAAE,CAAC,GAgBX;EAFD,AAbE,YAaU,AAbT,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAOY,iBAAiB;IAN7C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAOH,AAAA,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;EA9BjB,SAAS,EAAE,IAAI;EAEjB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,MAA0B;EAEtC,YAAY,EAAE,MAA0C;EACxD,aAAa,EAAE,OAA2B;EAG1C,WAAW,EAAE,OAAuD;EACpE,OAAO,EAAE,CAAC,GAoBX;EAFD,AAjBE,CAiBD,GAAG,CAAC,GAAG,YAAY,AAjBjB,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAWY,iBAAiB;IAV7C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAWH,AAAA,mBAAmB,CAAC;EApChB,SAAS,EAAE,GAAG;EAIhB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,GAA0B;EAEtC,YAAY,EAAE,OAA0C;EACxD,aAAa,EAAE,GAA2B;EAG1C,WAAW,EAAE,OAAuD;EACpE,OAAO,EAAE,CAAC,GAwBX;EAFD,AArBE,mBAqBiB,AArBhB,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAeY,iBAAiB;IAd7C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAeH,AAAA,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC;EAxCxB,SAAS,EAAE,GAAG;EAIhB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,GAA0B;EAEtC,YAAY,EAAE,OAA0C;EACxD,aAAa,EAAE,GAA2B;EAG1C,WAAW,EAAE,GAAuD;EACpE,OAAO,EAAE,CAAC,GA4BX;EAFD,AAzBE,CAyBD,GAAG,CAAC,GAAG,mBAAmB,AAzBxB,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAmBY,iBAAiB;IAlB7C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAmBH,AAAA,gBAAgB,CAAC;EA1Cb,SAAS,EAAE,IAAI;EAEjB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,MAA0B;EAEtC,YAAY,EAAE,MAA0C;EACxD,aAAa,EAAE,OAA2B;EAG1C,WAAW,EAAE,MAAuD;EACpE,OAAO,EAAE,CAAC,GAgCX;EAFD,AA7BE,gBA6Bc,AA7Bb,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAuBY,gBAAgB;IAtB5C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAuBH,AAAA,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;EA9CrB,SAAS,EAAE,IAAI;EAEjB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,MAA0B;EAEtC,YAAY,EAAE,MAA0C;EACxD,aAAa,EAAE,OAA2B;EAG1C,WAAW,EAAE,OAAuD;EACpE,OAAO,EAAE,CAAC,GAoCX;EAFD,AAjCE,CAiCD,GAAG,CAAC,GAAG,gBAAgB,AAjCrB,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EA2BY,gBAAgB;IA1B5C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AA2BH,AAAA,uBAAuB,CAAC;EApDpB,SAAS,EAAE,GAAG;EAIhB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,GAA0B;EAEtC,YAAY,EAAE,OAA0C;EACxD,aAAa,EAAE,GAA2B;EAG1C,WAAW,EAAE,OAAuD;EACpE,OAAO,EAAE,CAAC,GAwCX;EAFD,AArCE,uBAqCqB,AArCpB,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EA+BY,gBAAgB;IA9B5C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AA+BH,AAAA,CAAC,GAAG,CAAC,GAAG,uBAAuB,CAAC;EAxD5B,SAAS,EAAE,GAAG;EAIhB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,GAA0B;EAEtC,YAAY,EAAE,OAA0C;EACxD,aAAa,EAAE,GAA2B;EAG1C,WAAW,EAAE,GAAuD;EACpE,OAAO,EAAE,CAAC,GA4CX;EAFD,AAzCE,CAyCD,GAAG,CAAC,GAAG,uBAAuB,AAzC5B,QAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,OAAoB;IACzB,KAAK,EAAE,QAAqB;IAC5B,MAAM,EAAE,QAAqB;IAC7B,IAAI,EAAE,QAAqB;IAC3B,gBAAgB,EAmCY,gBAAgB;IAlC5C,aAAa,EAAE,KAAkB;IACjC,OAAO,EAAE,EAAE,GACZ;;AAmCH,AAAA,cAAc,CAAC;EACb,WAAW,EAAE,oEAAoE,GAClF;;AAED,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,kBAAkB;EAC9B,UAAU,EAAE,gCAAgC,GAC7C;;AAED,AAAA,eAAe,CAAC;EACd,UAAU,EAAE,kBAAkB;EAC9B,UAAU,EAAE,gCAAgC,GAC7C;;AAED,AAAA,cAAc,CAAC,CAAC,CAAC;EACf,UAAU,EAAE,eAAe,GAC5B;;AAED,AAAA,kBAAkB,GAAG,KAAK,AAAA,YAAY,AAAA,IAAK,CAAA,QAAQ,CAAC,IAAK,CAAA,SAAS,CAAC,MAAM,GAAG,KAAK,AAAA,QAAQ;AACzF,kBAAkB,GAAG,KAAK,AAAA,YAAY,AAAA,IAAK,CAAA,QAAQ,CAAC,IAAK,CAAA,SAAS,CAAC,MAAM,GAAG,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,IAAiB,KAAK,AAAA,QAAQ,CAAC;EAC/G,YAAY,EAAE,kBAAkB,GACjC;;AAED,AAAA,kBAAkB,GAAG,KAAK,AAAA,YAAY,AAAA,QAAQ,GAAG,KAAK,AAAA,QAAQ;AAC9D,kBAAkB,GAAG,KAAK,AAAA,YAAY,AAAA,QAAQ,GAAG,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,IAAiB,KAAK,AAAA,QAAQ,CAAC;EACpF,gBAAgB,EAAE,kBAAkB;EACpC,YAAY,EAAE,kBAAkB,GACjC;;AAED,AAAA,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,AAAA,QAAQ,CAAC;EAC7C,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,gBAAgB,CAAC,CAAC,AAAA,MAAM,CAAC;EACvB,KAAK,EAAE,OAAO,GACf;;AAED,AAAA,aAAa,CAAC;EACZ,QAAQ,EAAE,IAAI,GACf;;AAED,AAAA,YAAY,CAAC;EACX,OAAO,EAAE,IAAI,GACd;;AAED,AAAA,aAAa,CAAC,EAAE,CAAC;EACf,KAAK,EAAE,gBAAgB,GACxB;;AAED,YAAY;AACZ,AACE,SADO,CACP,IAAI,CAAC;EACH,SAAS,EAAE,KAAK,GACjB;;AAGH,YAAY;AACZ,AAAA,MAAM,CAAC;EACL,OAAO,EAAE,WAAW,GA2CrB;EA5CD,AAII,MAJE,CAGJ,iBAAiB,CACf,UAAU,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,MAAM;IAClB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,aAAa,EAAE,CAAC,GAWjB;IArBL,AAYM,MAZA,CAGJ,iBAAiB,CACf,UAAU,CAQR,eAAe,CAAC;MACd,OAAO,EAAE,MAAM;MACf,OAAO,EAAE,YAAY,GAMtB;MApBP,AAgBQ,MAhBF,CAGJ,iBAAiB,CACf,UAAU,CAQR,eAAe,CAIb,CAAC,CAAC;QACA,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE,IAAI,GACtB;EAnBT,AAwBE,MAxBI,CAwBJ,SAAS,CAAC;IACR,UAAU,EAAE,MAAM,GAkBnB;IA3CH,AA2BI,MA3BE,CAwBJ,SAAS,CAGP,CAAC,CAAC;MACA,MAAM,EAAE,IAAI,GAQb;MApCL,AA8BM,MA9BA,CAwBJ,SAAS,CAGP,CAAC,CAGC,GAAG,CAAC;QACF,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,MAAM;QACrB,gBAAgB,EAAE,OAAO,GAC1B;IAnCP,AAsCI,MAtCE,CAwBJ,SAAS,CAcP,YAAY,CAAC;MACX,KAAK,EAAE,IAAI;MACX,SAAS,EAAE,KAAK;MAChB,WAAW,EAAE,SAAS,GACvB" +"version": 3, +"mappings": "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", +"sources": ["../../scss/new_ols.scss"], +"names": [], +"file": "new_ols.css" } \ No newline at end of file diff --git a/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/loader/AbstractOWLOntologyLoader.java b/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/loader/AbstractOWLOntologyLoader.java index 8793014e..963ee66f 100644 --- a/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/loader/AbstractOWLOntologyLoader.java +++ b/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/loader/AbstractOWLOntologyLoader.java @@ -1,6 +1,7 @@ package uk.ac.ebi.spot.ols.loader; import com.google.common.collect.Multimap; +import com.google.common.collect.SetMultimap; import org.mockito.internal.debugging.Localized; import org.semanticweb.owlapi.apibinding.OWLManager; @@ -325,6 +326,27 @@ private void initializeVocabularyToIgnore() throws OntologyLoadingException { owlVocabulary.add(factory.getOWLBottomObjectProperty().getIRI()); } + + private void populateOntologyLanguages(Collection allEntities) { + + for (OWLEntity owlEntity: allEntities) { + for (OWLOntology anOntology : getManager().ontologies().collect(Collectors.toSet())){ + EntitySearcher.getAnnotationAssertionAxioms(owlEntity, anOntology).forEach(annotationAssertionAxiom -> { + + OWLAnnotationValue value = annotationAssertionAxiom.getValue(); + + if(value.isLiteral()) { + if(((OWLLiteral) value).hasLang()) { + ontologyLanguages.add( ((OWLLiteral) value).getLang() ); + } + } + + }); + } + } + } + + @Override public String getShortForm(IRI ontologyTermIRI) { @@ -440,6 +462,8 @@ protected OWLOntology loadOntology() throws OWLOntologyCreationException { ResourceUsage.logUsage(getLogger(), "#### Monitoring ", getOntologyName() + ":After copying of entities", ":"); + populateOntologyLanguages(allEntities); + indexTerms(allEntities); ResourceUsage.logUsage(getLogger(), "#### Monitoring ", getOntologyName() + ":After index terms", ":"); @@ -1242,11 +1266,18 @@ protected Optional evaluateLabelAnnotationValue(OWLEntity entity, OWLAnn private boolean isEnglishLabel(OWLAnnotationValue value) { return value instanceof OWLLiteral && ((OWLLiteral) value).getLang().equalsIgnoreCase("en"); + } + + protected void evaluateAnnotationValue(OWLEntity entity, OWLAnnotationProperty annotationProperty, IRI annotationPropertyIRI, OWLAnnotationValue value, String lang) { + + + } protected void evaluateAllAnnotationsValues(OWLEntity owlEntity) { IRI owlEntityIRI = owlEntity.getIRI(); + Set slims = new HashSet<>(); LocalizedStrings definitions = new LocalizedStrings(); @@ -1261,7 +1292,21 @@ protected void evaluateAllAnnotationsValues(OWLEntity owlEntity) { Collection oboSynonyms = new HashSet<>(); Collection oboEntityXrefs = new HashSet<>(); - // loop through other annotations in the imports closure + Set annotationProperties = new HashSet<>(); + + // pass 1: populate the set of all annotation properties used + for (OWLOntology anOntology : getManager().ontologies().collect(Collectors.toSet())){ + EntitySearcher.getAnnotationAssertionAxioms(owlEntity, anOntology).forEach(annotationAssertionAxiom -> { + + OWLAnnotationProperty annotationProperty = annotationAssertionAxiom.getProperty(); + IRI annotationPropertyIRI = annotationProperty.getIRI(); + + annotationProperties.add(annotationPropertyIRI); + }); + } + + + // pass 2: read the annotations for (OWLOntology anOntology : getManager().ontologies().collect(Collectors.toSet())){ EntitySearcher.getAnnotationAssertionAxioms(owlEntity, anOntology).forEach(annotationAssertionAxiom -> { OWLAnnotationProperty annotationProperty = annotationAssertionAxiom.getProperty(); @@ -1275,11 +1320,9 @@ protected void evaluateAllAnnotationsValues(OWLEntity owlEntity) { if(value.isLiteral()) { if(((OWLLiteral) value).hasLang()) { lang = ((OWLLiteral) value).getLang(); - ontologyLanguages.add(lang); } } - if (getLabelIRI().equals(annotationPropertyIRI)) { classLabels.addString(lang, evaluateLabelAnnotationValue( owlEntity, value).get()); @@ -1390,9 +1433,41 @@ else if (annotationPropertyIRI.equals(Namespaces.OWL.createIRI("deprecated"))) { } oboEntityXrefs.add(oboXrefs); } + }); } + + // cross reference the set of all ontologies properties with the set of + // languages in the ontology. Any missing languages are added with the English strings. + // Otherwise, if you switch language in the webapp to a language into which the ontology + // is not localised, the annotations will not appear! + // + if (termAnnotations.containsKey(owlEntityIRI)) { + + Map annotations = termAnnotations.get(owlEntityIRI); + + for(IRI annotationPropertyIri : annotations.keySet()) { + + LocalizedStrings annos = annotations.get(annotationPropertyIri); + + for(String ontologyLang : ontologyLanguages) { + + if(!annos.getLanguages().contains(ontologyLang)) { + annos.setStrings(ontologyLang, annos.getStrings("", "en", "en-US")); + } + } + + } + } + + for (String ontologyLang : ontologyLanguages) { + if (!classLabels.getLanguages().contains(ontologyLang)) { + classLabels.setStrings(ontologyLang, classLabels.getStrings("", "en", "en-US")); + } + } + + setClassLabels(owlEntityIRI, classLabels); if (definitionCitations.size() > 0) { @@ -1416,6 +1491,7 @@ else if (annotationPropertyIRI.equals(Namespaces.OWL.createIRI("deprecated"))) { if (slims.size() >0) { setSlims(owlEntityIRI, slims); } + } private OBOXref extractOBOXrefs (OWLAnnotation annotation) { diff --git a/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/util/LocalizedStrings.java b/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/util/LocalizedStrings.java index fdadb6ae..b789e321 100644 --- a/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/util/LocalizedStrings.java +++ b/ontology-tools/src/main/java/uk/ac/ebi/spot/ols/util/LocalizedStrings.java @@ -102,6 +102,7 @@ public void addDefaultString(String value) { } + public int size() { int n = 0; for(List values : this.localizations.values()) { @@ -119,5 +120,11 @@ public void addAll(LocalizedStrings other) { } } + + public void setStrings(String language, List strings) { + + localizations.put(language, new ArrayList(strings)); + + } }