diff --git a/.gitignore b/.gitignore index bc6cbb7..69c3c06 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,7 @@ var/ .DS_Store # Tests -test/virtuoso-test-data/ -test/virtuoso-meta-data/database/virtuoso.lck -test/virtuoso-meta-data/database/virtuoso.log -test/virtuoso-meta-data/index_entities.txt -test/qlever-index-data/oc-index-test.server-log.txt +test/qlever-data/oc-test.server-log.txt .coverage # uv diff --git a/Dockerfile b/Dockerfile index 0fc0977..fe80f45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim ENV BASE_URL="api.opencitations.net" \ LOG_DIR="/mnt/log_dir/oc_api" \ SPARQL_ENDPOINT_INDEX="http://qlever-service.default.svc.cluster.local:7011" \ - SPARQL_ENDPOINT_META="http://virtuoso-service.default.svc.cluster.local:8890/sparql" \ + SPARQL_ENDPOINT_META="http://meta-qlever-service.default.svc.cluster.local:7011" \ SYNC_ENABLED="true" # Ensure Python output is unbuffered diff --git a/README.md b/README.md index fa796b3..df20f23 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ For instance: BASE_URL=api.opencitations.net LOG_DIR=/home/dir/log/ SPARQL_ENDPOINT_INDEX=http://qlever-service.default.svc.cluster.local:7011 -SPARQL_ENDPOINT_META=http://virtuoso-service.default.svc.cluster.local:8890/sparql +SPARQL_ENDPOINT_META=http://meta-qlever-service.default.svc.cluster.local:7011 SYNC_ENABLED=true # Redis Configuration @@ -127,7 +127,7 @@ VERSION=$(grep -m1 '^version' pyproject.toml | cut -d'"' -f2) docker build -t opencitations/oc_api:$VERSION . docker run -p 8080:8080 \ -e SPARQL_ENDPOINT_INDEX=http://qlever:7011 \ - -e SPARQL_ENDPOINT_META=http://virtuoso:8890/sparql \ + -e SPARQL_ENDPOINT_META=http://meta-qlever:7011 \ opencitations/oc_api:$VERSION ``` @@ -141,7 +141,7 @@ You can customize the Gunicorn server configuration by modifying the `gunicorn.c ### Running Tests Locally -The tests require Docker. Pytest fixtures in `test/conftest.py` automatically start and stop the QLever and Virtuoso containers. +The tests require Docker. Pytest fixtures in `test/conftest.py` automatically start and stop the QLever container. 1. Install dependencies: ```bash diff --git a/api_oc.py b/api_oc.py index f1affaa..cef8f5b 100644 --- a/api_oc.py +++ b/api_oc.py @@ -108,11 +108,12 @@ skgif_api_manager = APIManager( c["api_skgif"], endpoint_override=env_config["sparql_endpoint_meta"] ) -for config in skgif_api_manager.all_conf.values(): - config["sources_map"] = { - "meta": env_config["sparql_endpoint_meta"], - "index": env_config["sparql_endpoint_index"], - } +for manager in (index_api_manager, index_api_manager_v2, skgif_api_manager): + for config in manager.all_conf.values(): + config["sources_map"] = { + "meta": env_config["sparql_endpoint_meta"], + "index": env_config["sparql_endpoint_index"], + } skgif_doc_manager = HTMLDocumentationHandler(skgif_api_manager) skgif_openapi_manager = OpenAPIDocumentationHandler(skgif_api_manager) diff --git a/conf.json b/conf.json index 0158bfd..8347274 100644 --- a/conf.json +++ b/conf.json @@ -4,7 +4,7 @@ "oc_services_templates": "https://github.com/opencitations/oc_services_templates", "base_url": " api.opencitations.net", "sparql_endpoint_index": "http://qlever-service.default.svc.cluster.local:7011", - "sparql_endpoint_meta": "http://virtuoso-service.default.svc.cluster.local:8890/sparql", + "sparql_endpoint_meta": "http://meta-qlever-service.default.svc.cluster.local:7011", "api_index": [ "src/api/index_v1.hf" ], "api_index_v2": [ "src/api/index_v2.hf" ], "api_meta": ["src/api/meta_v1.hf"], diff --git a/pyproject.toml b/pyproject.toml index c18030b..bb466e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [project] name = "oc-api" -version = "4.0.1" +version = "4.2.0" description = "OpenCitations API" authors = [ {name = "Mario Petrella", email = "mario.petrella@unibo.it"}, @@ -20,7 +20,7 @@ dependencies = [ "gunicorn>=22.0.0", "idna>=3.15", "python-dateutil>=2.9.0.post0", - "ramose>=2.9.1", + "ramose>=2.10.1", "rdflib>=6.1.1", "redis>=7.0.1", "requests>=2.32.4", diff --git a/src/api/index_v1.hf b/src/api/index_v1.hf index 20a88f6..a093f6f 100644 --- a/src/api/index_v1.hf +++ b/src/api/index_v1.hf @@ -26,13 +26,15 @@ get(API_CALL, headers=HTTP_HEADERS) #contacts [contact@opencitations.net](mailto:contact@opencitations.net) #license This document is licensed with a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/legalcode), while the REST API itself has been created using [RAMOSE](https://github.com/opencitations/ramose), the *Restful API Manager Over SPARQL Endpoints* created by [Silvio Peroni](https://orcid.org/0000-0003-0530-4305), which is licensed with an [ISC license](https://opensource.org/licenses/ISC). #endpoint http://qlever-service.default.svc.cluster.local:7011 +#sources meta=http://meta-qlever-service.default.svc.cluster.local:7011;index=http://qlever-service.default.svc.cluster.local:7011 #method post #addon indexapi_v1 #url /citation/{oci} #type operation #oci str([0-9]+-[0-9]+) -#postprocess citations_info(oci,citing,cited) +#preprocess oci_search(oci) +#postprocess citations_info() #method get #description This operation retrieves the citation metadata for the citation identified by the input Open Citation Identifier (OCI). @@ -63,21 +65,89 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea "author_sc": "no" } ] -#field_type str(oci) str(citing) str(cited) +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) #sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?oci {} . - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +SELECT ?oci ?citing_br ?cited_br WHERE { + [[oci]] + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) +} +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?cited_br ?journal WHERE { + [[oci]] + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?cited_br ?author WHERE { + [[oci]] + ?cited_br pro:isDocumentContextFor ?cited_role . + ?cited_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?citing_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?citing_br pro:isDocumentContextFor ?citing_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) } -LIMIT 50000 #url /citation-count/{doi} #type operation #doi str(10\..+) -#preprocess lower(doi) --> id2omids(doi) -#postprocess count_unique_cits(oci,citing,cited) +#preprocess lower(doi) --> cited_search(doi) +#postprocess count_groups(citing) #method get #description This operation retrieves the number of incoming citations to the bibliographic entity identified by the input DOI. @@ -91,20 +161,41 @@ The field returned by this operation is: "count": "32" } ] -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?cited {[[doi]]} - ?oci cito:hasCitedEntity ?cited . - ?oci cito:hasCitingEntity ?citing . +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?cited_br WHERE { + [[doi]] +} +@@with index +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX cito: +SELECT DISTINCT ?citing_br ?cited_br WHERE { + ?citation cito:hasCitedEntity ?cited_br ; + cito:hasCitingEntity ?citing_br . } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) +} +GROUP BY ?citing_br #url /reference-count/{doi} #type operation #doi str(10\..+) -#preprocess lower(doi) --> id2omids(doi) -#postprocess count_unique_cits(oci,citing,cited) +#preprocess lower(doi) --> citing_search(doi) +#postprocess count_groups(cited) #method get #description This operation retrieves the number of outgoing citations from the bibliographic entity identified by the input DOI. @@ -118,22 +209,41 @@ The field returned by this operation is: "count": "75" } ] -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?citing {[[doi]]} - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?citing_br WHERE { + [[doi]] +} +@@with index +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX cito: +SELECT DISTINCT ?citing_br ?cited_br WHERE { + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . } LIMIT 200000 - - +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) +} +GROUP BY ?cited_br #url /citations/{doi} #type operation #doi str(10\..+) -#preprocess lower(doi) --> id2omids(doi) -#postprocess citations_info(oci,citing,cited) +#preprocess lower(doi) --> cited_search(doi) +#postprocess citations_info() #method get #description This operation retrieves the citation data for all the references appearing in the reference lists of other citing works to the bibliographic entity identified by the input DOI, that constitute the incoming citations of that identified bibliographic entity. @@ -179,21 +289,100 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea }, ... ] -#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(?journal_sc) str(?author_sc) -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?cited {[[doi]]} - ?oci cito:hasCitedEntity ?cited . - ?oci cito:hasCitingEntity ?citing . +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?cited_br WHERE { + [[doi]] +} +@@with index +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX cito: +SELECT ?oci ?citing_br ?cited_br WHERE { + ?citation cito:hasCitedEntity ?cited_br ; + cito:hasCitingEntity ?citing_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?cited_br ?journal WHERE { + [[doi]] + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?cited_br ?author WHERE { + [[doi]] + ?cited_br pro:isDocumentContextFor ?cited_role . + ?cited_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?citing_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?citing_br pro:isDocumentContextFor ?citing_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} #url /references/{doi} #type operation #doi str(10\..+) -#preprocess lower(doi) --> id2omids(doi) -#postprocess citations_info(oci,citing,cited) +#preprocess lower(doi) --> citing_search(doi) +#postprocess citations_info() #method get #description This operation retrieves the citation data for all the outgoing references to other cited works appearing in the reference list of the bibliographic entity identified by the input DOI. @@ -239,12 +428,91 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea }, ... ] -#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(?journal_sc) str(?author_sc) -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?citing {[[doi]]} - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?citing_br WHERE { + [[doi]] +} +@@with index +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX cito: +SELECT ?oci ?citing_br ?cited_br WHERE { + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?citing_br ?journal WHERE { + [[doi]] + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?citing_br ?author WHERE { + [[doi]] + ?citing_br pro:isDocumentContextFor ?citing_role . + ?citing_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?cited_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?cited_br pro:isDocumentContextFor ?cited_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} diff --git a/src/api/index_v2.hf b/src/api/index_v2.hf index e1165c0..9d13006 100644 --- a/src/api/index_v2.hf +++ b/src/api/index_v2.hf @@ -2,7 +2,7 @@ #type api #base https://api.opencitations.net #title The REST API for OpenCitations Index -#html_meta_description OpenCitations Index REST API: retrieve citation data, bibliographic references, citation counts using DOI, PMID, OMID identifiers. Free access. +#html_meta_description OpenCitations Index REST API: retrieve citation data, bibliographic references, citation counts using DOI, PMID, ISSN, ISBN, or OMID identifiers. Free access. #description This document describe the REST API for accessing the data stored in the [OpenCitations Index](https://w3id.org/oc/index) hosted by [OpenCitations](http://opencitations.net). This API implements operations to retrieve the citation data for all the references to other works appearing in a particular bibliographic entity, or the citation data for all the references appearing in other works to a particular bibliographic entity, given the identifier of a bibliographic entity, or to retrieve citation data about a particular citation identified by means of its [Open Citation Identifier (OCI)](https://opencitations.wordpress.com/2018/03/12/citations-as-first-class-data-entities-open-citation-identifiers/). All the present operations return either a JSON document (default) or a CSV document according to the mimetype specified in the `Accept` header of the request. If you would like to suggest an additional operation to be included in this API, please use the [issue tracker](https://github.com/opencitations/api/issues) of the OpenCitations APIs available on GitHub. @@ -24,13 +24,15 @@ get(API_CALL, headers=HTTP_HEADERS) #contacts [contact@opencitations.net](mailto:contact@opencitations.net) #license This document is licensed with a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/legalcode), while the REST API itself has been created using [RAMOSE](https://github.com/opencitations/ramose), the *Restful API Manager Over SPARQL Endpoints* created by [Silvio Peroni](https://orcid.org/0000-0003-0530-4305), which is licensed with an [ISC license](https://opensource.org/licenses/ISC). #endpoint http://qlever-service.default.svc.cluster.local:7011 +#sources meta=http://meta-qlever-service.default.svc.cluster.local:7011;index=http://qlever-service.default.svc.cluster.local:7011 #method post #addon indexapi_v2 #url /citation/{oci} #type operation #oci str([0-9]+-[0-9]+) -#postprocess citations_info(oci,citing,cited) +#preprocess oci_search(oci) +#postprocess citations_info() #method get #description This operation retrieves the citation metadata for the citation identified by the input Open Citation Identifier (OCI). @@ -61,23 +63,91 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea "author_sc": "no" } ] -#field_type str(oci) str(citing) str(cited) +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) #sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?oci {} . - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +SELECT ?oci ?citing_br ?cited_br WHERE { + [[oci]] + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) +} +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?cited_br ?journal WHERE { + [[oci]] + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?cited_br ?author WHERE { + [[oci]] + ?cited_br pro:isDocumentContextFor ?cited_role . + ?cited_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?citing_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?citing_br pro:isDocumentContextFor ?citing_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) } -LIMIT 50000 #url /citation-count/{id} #type operation -#id str((omid|doi|pmid):(.+)) -#preprocess lower(id) --> id2omids(id) -#postprocess count_unique_cits(oci,citing,cited) +#id str((omid|doi|pmid|issn|isbn):(.+)) +#preprocess lower(id) --> cited_search(id) +#postprocess count_groups(citing) #method get -#description This operation retrieves the number of incoming citations to the bibliographic entity identified by the input PID (DOI, PMID, OMID).. +#description This operation retrieves the number of incoming citations to the bibliographic entity identified by the input PID (DOI, PMID, ISSN, ISBN, OMID).. The field returned by this operation is: @@ -89,20 +159,41 @@ The field returned by this operation is: "count": "34" } ] -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?cited {[[id]]} - ?oci cito:hasCitedEntity ?cited . - ?oci cito:hasCitingEntity ?citing . +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?cited_br WHERE { + [[id]] +} +@@with index +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX cito: +SELECT DISTINCT ?citing_br ?cited_br WHERE { + ?citation cito:hasCitedEntity ?cited_br ; + cito:hasCitingEntity ?citing_br . } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) +} +GROUP BY ?citing_br #url /venue-citation-count/{id} #type operation #id str((issn):(.+)) -#preprocess lower(id) --> id2omids(id) -#postprocess sum_all(count) +#preprocess lower(id) --> issn_value(id) +#postprocess venue_count() #method get #description This operation retrieves the number of incoming citations to all the bibliographic entities published into aspecific journal identified by the input ISSN. @@ -116,21 +207,36 @@ The field returned by this operation is: "count": "64352" } ] -#sparql PREFIX cito: -SELECT (count(DISTINCT(?citing)) as ?count) -WHERE { - VALUES ?cited {[[id]]} - ?oci cito:hasCitedEntity ?cited . - ?oci cito:hasCitingEntity ?citing . +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?issn ?cited_br WHERE { + VALUES ?issn { "[[id]]" } + ?venue_identifier literal:hasLiteralValue ?issn . + ?venue datacite:hasIdentifier ?venue_identifier . + ?cited_br frbr:partOf+ ?venue ; + a fabio:JournalArticle . } +@@with index +@@join ?issn ?issn +@@values ?cited_br +PREFIX cito: +SELECT ?issn (COUNT(DISTINCT ?citing_br) AS ?count) WHERE { + ?citation cito:hasCitedEntity ?cited_br ; + cito:hasCitingEntity ?citing_br . + BIND("[[id]]" AS ?issn) +} +GROUP BY ?issn #url /reference-count/{id} #type operation -#id str((omid|doi|pmid|issn):(.+)) -#preprocess lower(id) --> id2omids(id) -#postprocess count_unique_cits(oci,citing,cited) +#id str((omid|doi|pmid|issn|isbn):(.+)) +#preprocess lower(id) --> citing_search(id) +#postprocess count_unique_cits() #method get -#description This operation retrieves the number of outgoing citations from the bibliographic entity identified by the input PID (DOI, PMID, OMID). +#description This operation retrieves the number of outgoing citations from the bibliographic entity identified by the input PID (DOI, PMID, ISSN, ISBN, OMID). The field returned by this operation is: @@ -142,22 +248,55 @@ The field returned by this operation is: "count": "35" } ] -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?citing {[[id]]} - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?citing_br WHERE { + [[id]] +} +@@with index +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX cito: +SELECT DISTINCT ?citing_br ?cited_br WHERE { + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX datacite: +PREFIX literal: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) +} +GROUP BY ?cited_br #url /citations/{id} #type operation -#id str((omid|doi|pmid):(.+)) -#preprocess lower(id) --> id2omids(id) -#postprocess citations_info(oci,citing,cited) +#id str((omid|doi|pmid|issn|isbn):(.+)) +#preprocess lower(id) --> cited_search(id) +#postprocess citations_info() #method get -#description This operation retrieves the citation data for all the references appearing in the reference lists of other citing works to the bibliographic entity identified by the input PID (DOI, PMID, OMID), that constitute the incoming citations of that identified bibliographic entity. +#description This operation retrieves the citation data for all the references appearing in the reference lists of other citing works to the bibliographic entity identified by the input PID (DOI, PMID, ISSN, ISBN, OMID), that constitute the incoming citations of that identified bibliographic entity. The fields returned by this operation are: @@ -201,23 +340,102 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea }, ... ] -#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(?journal_sc) str(?author_sc) -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?cited {[[id]]} - ?oci cito:hasCitedEntity ?cited . - ?oci cito:hasCitingEntity ?citing . +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?cited_br WHERE { + [[id]] +} +@@with index +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX cito: +SELECT ?oci ?citing_br ?cited_br WHERE { + ?citation cito:hasCitedEntity ?cited_br ; + cito:hasCitingEntity ?citing_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?cited_br ?journal WHERE { + [[id]] + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?citing_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?cited_br ?author WHERE { + [[id]] + ?cited_br pro:isDocumentContextFor ?cited_role . + ?cited_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?citing_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?citing_br pro:isDocumentContextFor ?citing_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} #url /references/{id} #type operation -#id str((omid|doi|pmid):(.+)) -#preprocess lower(id) --> id2omids(id) -#postprocess citations_info(oci,citing,cited) +#id str((omid|doi|pmid|issn|isbn):(.+)) +#preprocess lower(id) --> citing_search(id) +#postprocess citations_info() #method get -#description This operation retrieves the citation data for all the outgoing references to other cited works appearing in the reference list of the bibliographic entity identified by the input PID (DOI, PMID, OMID).. +#description This operation retrieves the citation data for all the outgoing references to other cited works appearing in the reference list of the bibliographic entity identified by the input PID (DOI, PMID, ISSN, ISBN, OMID).. The fields returned by this operation are: @@ -232,7 +450,6 @@ The fields returned by this operation are: The values of all the fields are prefixed with `[index name] => `, so as to cleary identify from where the related data is coming, and can contain one or more information, separated by `; `. This is particularly useful when a citation is actually contained in two or more OpenCitations Indexes. In this case, only one row will be returned, and the prefix used in the various data allows one to understand the source Index of such data. #call /references/doi:10.7717/peerj-cs.421 #output_json [ -[ { "oci": "06101801781-06101802023", "citing": "omid:br/06101801781 doi:10.7717/peerj-cs.421 pmid:33817056", @@ -262,12 +479,91 @@ The values of all the fields are prefixed with `[index name] => `, so as to clea }, ... ] -#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(?journal_sc) str(?author_sc) -#sparql PREFIX cito: -SELECT ?oci ?citing ?cited -WHERE { - VALUES ?citing {[[id]]} - ?oci cito:hasCitingEntity ?citing . - ?oci cito:hasCitedEntity ?cited . +#field_type str(oci) str(citing) str(cited) datetime(creation) duration(timespan) str(journal_sc) str(author_sc) +#sparql @@with meta +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +SELECT DISTINCT ?citing_br WHERE { + [[id]] +} +@@with index +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX cito: +SELECT ?oci ?citing_br ?cited_br WHERE { + ?citation cito:hasCitingEntity ?citing_br ; + cito:hasCitedEntity ?cited_br . + BIND(STRAFTER(STR(?citation), "https://w3id.org/oc/index/ci/") AS ?oci) } LIMIT 200000 +@@with meta +@@join ?citing_br ?citing_br +@@values ?citing_br +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?citing_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?citing_ids) (MIN(STR(?date)) AS ?citing_date) WHERE { + ?citing_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?citing_br prism:publicationDate ?date } +} +GROUP BY ?citing_br +@@with meta +@@join ?cited_br ?cited_br +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX prism: +SELECT ?cited_br (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=" __ ") AS ?cited_ids) (MIN(STR(?date)) AS ?cited_date) WHERE { + ?cited_br datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?scheme ; + literal:hasLiteralValue ?value . + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?value) AS ?id) + OPTIONAL { ?cited_br prism:publicationDate ?date } +} +GROUP BY ?cited_br +@@join ?oci ?oci type=left +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_journal) WHERE { + { + SELECT ?citing_br ?journal WHERE { + [[id]] + ?citing_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + ?journal a fabio:Journal . + } + } + ?cited_br a fabio:JournalArticle ; + frbr:partOf+ ?journal . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} +@@join ?oci ?oci type=left +@@values ?cited_br batch_size=10000 workers=8 +PREFIX datacite: +PREFIX literal: +PREFIX frbr: +PREFIX fabio: +PREFIX pro: +SELECT DISTINCT ?oci ("yes" AS ?same_author) WHERE { + { + SELECT ?citing_br ?author WHERE { + [[id]] + ?citing_br pro:isDocumentContextFor ?citing_role . + ?citing_role pro:withRole pro:author ; + pro:isHeldBy ?author . + } + } + ?cited_role pro:isHeldBy ?author ; + pro:withRole pro:author . + ?cited_br pro:isDocumentContextFor ?cited_role . + BIND(CONCAT(STRAFTER(STR(?citing_br), "https://w3id.org/oc/meta/br/"), "-", STRAFTER(STR(?cited_br), "https://w3id.org/oc/meta/br/")) AS ?oci) +} diff --git a/src/api/indexapi_common.py b/src/api/indexapi_common.py index 2427ed3..3d288ea 100644 --- a/src/api/indexapi_common.py +++ b/src/api/indexapi_common.py @@ -1,187 +1,66 @@ -import json -import os -from requests import RequestException, post -from json import loads from datetime import datetime from dateutil.relativedelta import relativedelta -with open("conf.json") as f: - c = json.load(f) - -env_config = { - "base_url": os.getenv("BASE_URL", c["base_url"]), - "sparql_endpoint_index": os.getenv( - "SPARQL_ENDPOINT_INDEX", c["sparql_endpoint_index"] - ), - "sparql_endpoint_meta": os.getenv( - "SPARQL_ENDPOINT_META", c["sparql_endpoint_meta"] - ), - "sync_enabled": os.getenv("SYNC_ENABLED", "false").lower() == "true", -} - def lower(s): return (s.lower(),) -def br_meta_metadata(values): - sparql_endpoint = env_config["sparql_endpoint_meta"] - - sparql_query = ( - """ - PREFIX pro: - PREFIX frbr: - PREFIX fabio: - PREFIX datacite: - PREFIX literal: - PREFIX prism: - SELECT DISTINCT ?val ?pubDate (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=' __ ') AS ?ids) (GROUP_CONCAT(?venue; separator="; ") as ?source) (GROUP_CONCAT(?raAuthor; separator="; ") as ?author) - WHERE { - VALUES ?val { """ - + " ".join(values) - + """ } - OPTIONAL { ?val prism:publicationDate ?pubDate. } - OPTIONAL { - ?val datacite:hasIdentifier ?identifier. - ?identifier datacite:usesIdentifierScheme ?scheme; - literal:hasLiteralValue ?literalValue. - BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literalValue) AS ?id) - } - OPTIONAL { - ?val a fabio:JournalArticle; - frbr:partOf+ ?venue. - ?venue a fabio:Journal. - } - OPTIONAL { - ?val frbr:partOf ?venue. - } - OPTIONAL { - ?val pro:isDocumentContextFor ?arAuthor. - ?arAuthor pro:withRole pro:author; - pro:isHeldBy ?raAuthor. - } - } GROUP BY ?val ?pubDate - """ +def oci_search(oci): + citing, cited = oci.split("-") + return ( + f"VALUES ?citation {{ }} " + f"VALUES ?citing_br {{ }} " + f"VALUES ?cited_br {{ }}", ) - headers = { - "Accept": "application/sparql-results+json", - "Content-Type": "application/sparql-query", - } - - try: - response = post(sparql_endpoint, headers=headers, data=sparql_query) - response.raise_for_status() - except RequestException: - return {}, [] - r = loads(response.text) - results = r["results"]["bindings"] - res_json = {elem["val"]["value"]: elem for elem in results} - return res_json, ["val", "pubDate", "ids", "source", "author"] - - -def br_meta_anyids(values): - sparql_endpoint = env_config["sparql_endpoint_meta"] - - sparql_query = ( - """ - PREFIX datacite: - PREFIX literal: - SELECT DISTINCT ?val (GROUP_CONCAT(DISTINCT ?id; SEPARATOR=' __ ') AS ?ids) - WHERE { - VALUES ?val { """ - + " ".join(values) - + """ } - OPTIONAL { - ?val datacite:hasIdentifier ?identifier. - ?identifier datacite:usesIdentifierScheme ?scheme; - literal:hasLiteralValue ?literalValue. - BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literalValue) AS ?id) - } - } GROUP BY ?val - """ - ) - - headers = { - "Accept": "application/sparql-results+json", - "Content-Type": "application/sparql-query", - } - - try: - response = post(sparql_endpoint, headers=headers, data=sparql_query) - response.raise_for_status() - except RequestException: - return {}, [] - r = loads(response.text) - results = r["results"]["bindings"] - res_json = {elem["val"]["value"]: elem for elem in results} - return res_json, ["val", "ids"] +def literal_search(value, variable): + return ( + f'?resolved_identifier literal:hasLiteralValue "{value}" . ' + f"?{variable} datacite:hasIdentifier ?resolved_identifier ." + ) -def get_unique_brs_metadata(l_url_brs, ids_only=False): - res: list[list[str]] = [] - l_brs = ["<" + _url_br + ">" for _url_br in l_url_brs] - - fetch = br_meta_anyids if ids_only else br_meta_metadata - i = 0 - chunk_size = 3000 - brs_meta: dict[str, dict[str, dict[str, str]]] = {} - while i < len(l_brs): - chunk = l_brs[i : i + chunk_size] - m_br = fetch(chunk) - brs_meta.update(m_br[0]) - if i == 0: - res.append(m_br[1]) - i += chunk_size - - unique_brs_anyid: list[set[str]] = [] - for k_val in brs_meta.values(): - br_ids = k_val["ids"]["value"] - if br_ids: - s = set(br_ids.split(" __ ")) - _c_intersection = 0 - for __unique in unique_brs_anyid: - _c_intersection += len(__unique.intersection(s)) - if _c_intersection == 0: - unique_brs_anyid.append(s) - br_values = [k_val[k]["value"] if k in k_val else "" for k in res[0]] - res.append(br_values) - - f_res = {} - for row in res[1:]: - f_res[row[0]] = {k_val: row[i] for i, k_val in enumerate(res[0])} - return f_res +def unique_citations(res): + citing_groups: dict[str, str] = {} + cited_groups: dict[str, str] = {} + citations: dict[tuple[str, str], dict[str, str]] = {} + for row in sorted(__rows(res), key=lambda row: (row["citing_br"], row["cited_br"])): + key = ( + __group(row["citing_br"], row["citing_ids"], citing_groups), + __group(row["cited_br"], row["cited_ids"], cited_groups), + ) + citations.setdefault(key, row) + return list(citations.values()) -def get_pub_date(elem): - return elem["pubDate"] +def count_unique_cits(res): + return [["count"], [len(unique_citations(res))]], True -def get_source(elem): - return elem["source"].split("; ") +def count_groups(res, side): + entities = sorted({(row[f"{side}_br"], row[f"{side}_ids"]) for row in __rows(res)}) + groups: dict[str, str] = {} + return [["count"], [len({__group(*entity, groups) for entity in entities})]], True -def get_author(elem): - return elem["author"].split("; ") +def citation_row(citation, citing, cited): + return [ + citation["oci"], + citing, + cited, + citation["citing_date"], + cit_duration(citation["citing_date"], citation["cited_date"]), + __yes_no(citation, "same_journal"), + __yes_no(citation, "same_author"), + ] def get_id_val(val): return val.replace("https://w3id.org/oc/meta/br/", "") -def cit_journal_sc(citing_source_ids, cited_source_ids): - if len(set(citing_source_ids).intersection(set(cited_source_ids))) > 0: - return "yes" - return "no" - - -def cit_author_sc(citing_authors, cited_authors): - if len(set(citing_authors).intersection(set(cited_authors))) > 0: - return "yes" - return "no" - - def cit_duration(citing_complete_pub_date, cited_complete_pub_date): def _contains_years(date): @@ -230,3 +109,25 @@ def _contains_days(date): result += "%sD" % abs(delta.days) return result + + +def __rows(res): + header = res[0] + return [ + {field: value for field, (_, value) in zip(header, typed_row)} + for typed_row in res[1:] + ] + + +def __group(br, ids, groups): + identifiers = ids.split(" __ ") + for identifier in identifiers: + if identifier in groups: + return groups[identifier] + for identifier in identifiers: + groups[identifier] = br + return br + + +def __yes_no(citation, column): + return "yes" if citation.get(column) == "yes" else "no" diff --git a/src/api/indexapi_v1.py b/src/api/indexapi_v1.py index b421392..b137003 100644 --- a/src/api/indexapi_v1.py +++ b/src/api/indexapi_v1.py @@ -16,151 +16,41 @@ __author__ = "Arcangelo Massari & Ivan Heibi" -from requests import RequestException, post -from json import loads from indexapi_common import ( lower, # noqa: F401 - used by ramose via getattr - env_config, - get_unique_brs_metadata, - get_pub_date, - get_source, - get_author, - get_id_val, - cit_journal_sc, - cit_author_sc, - cit_duration, + count_unique_cits, # noqa: F401 - used by ramose via getattr + count_groups, # noqa: F401 - used by ramose via getattr + oci_search, # noqa: F401 - used by ramose via getattr + literal_search, + unique_citations, + citation_row, ) -def id2omids(s): - MULTI_VAL_MAX = 9000 - sparql_endpoint = env_config["sparql_endpoint_meta"] - - sparql_query = ( - """ - PREFIX datacite: - PREFIX literal: - SELECT ?br { - { ?identifier literal:hasLiteralValue '""" - + s - + """'^^. } - UNION - { ?identifier literal:hasLiteralValue '""" - + s - + """'. } - ?br datacite:hasIdentifier ?identifier - } - """ - ) - - headers = { - "Accept": "application/sparql-results+json", - "Content-Type": "application/sparql-query", - } - try: - response = post(sparql_endpoint, headers=headers, data=sparql_query, timeout=45) - response.raise_for_status() - except RequestException: - return ("",) - r = loads(response.text) - results = r["results"]["bindings"] - omid_l = [elem["br"]["value"].split("meta/br/")[1] for elem in results] - - if len(omid_l) == 0: - return ("",) - - sparql_values = [] - for i in range(0, len(omid_l), MULTI_VAL_MAX): - sparql_values.append( - " ".join( - [ - "" - for e in omid_l[i : i + MULTI_VAL_MAX] - ] - ) - ) - return (sparql_values,) - - -def count_unique_cits(res, *args): - header = res[0] - citing_idx = header.index(args[1]) - cited_idx = header.index(args[2]) - set_oci = set() - - # build - if len(res) > 1: - citing_to_dedup = [] - cited_to_dedup = [] - for row in res[1:]: - citing_to_dedup.extend(row[citing_idx]) - cited_to_dedup.extend(row[cited_idx]) - - citing_to_dedup_meta = get_unique_brs_metadata( - list(set(citing_to_dedup)), ids_only=True - ) - cited_to_dedup_meta = get_unique_brs_metadata( - list(set(cited_to_dedup)), ids_only=True - ) - for _k_citing in citing_to_dedup_meta.keys(): - for _k_cited in cited_to_dedup_meta.keys(): - set_oci.add((_k_citing, _k_cited)) - return [["count"], [len(set_oci)]], True +def cited_search(doi): + return (literal_search(doi, "cited_br"),) -# args must contain the and -def citations_info(res, *args): +def citing_search(doi): + return (literal_search(doi, "citing_br"),) - header = res[0] - citing_idx = header.index(args[1]) - cited_idx = header.index(args[2]) - # build +def citations_info(res): f_res = [ ["oci", "citing", "cited", "creation", "timespan", "journal_sc", "author_sc"] ] - - if len(res) > 1: - citing_to_dedup = [] - cited_to_dedup = [] - for row in res[1:]: - citing_to_dedup.extend(row[citing_idx]) - cited_to_dedup.extend(row[cited_idx]) - - citing_to_dedup_meta = get_unique_brs_metadata(list(set(citing_to_dedup))) - cited_to_dedup_meta = get_unique_brs_metadata(list(set(cited_to_dedup))) - - for citing_entity in citing_to_dedup_meta: - for cited_entity in cited_to_dedup_meta: - _citing = citing_to_dedup_meta[citing_entity] - _cited = cited_to_dedup_meta[cited_entity] - - res_row = [ - # oci value - get_id_val(citing_entity) + "-" + get_id_val(cited_entity), - # citing - __get_doi(_citing), - # cited - __get_doi(_cited), - # creation = citing[pub_date] - get_pub_date(_citing), - # timespan = citing[pub_date] - cited[pub_date] - cit_duration(get_pub_date(_citing), get_pub_date(_cited)), - # journal_sc = compare citing[source_id] and cited[source_id] - cit_journal_sc(get_source(_citing), get_source(_cited)), - # author_sc = compare citing[source_id] and cited[source_id] - cit_author_sc(get_author(_citing), get_author(_cited)), - ] - f_res.append(res_row) - + for citation in unique_citations(res): + f_res.append( + citation_row( + citation, + __get_doi(citation["citing_ids"]), + __get_doi(citation["cited_ids"]), + ) + ) return f_res, True -def __get_doi(elem): - str_ids = [] - if "ids" in elem: - for id in elem["ids"].split(" __ "): - if id.startswith("doi:"): - str_ids.append(id.split("doi:")[1]) - - return " ".join(str_ids) +def __get_doi(ids): + return " ".join( + id.removeprefix("doi:") for id in ids.split(" __ ") if id.startswith("doi:") + ) diff --git a/src/api/indexapi_v2.py b/src/api/indexapi_v2.py index a9c8bc6..04ac76a 100644 --- a/src/api/indexapi_v2.py +++ b/src/api/indexapi_v2.py @@ -16,224 +16,74 @@ __author__ = "Arcangelo Massari & Ivan Heibi" -from requests import RequestException, post -from json import loads +import re + from indexapi_common import ( lower, # noqa: F401 - used by ramose via getattr - env_config, - get_unique_brs_metadata, - get_pub_date, - get_source, - get_author, + count_unique_cits, # noqa: F401 - used by ramose via getattr + count_groups, # noqa: F401 - used by ramose via getattr + oci_search, # noqa: F401 - used by ramose via getattr + literal_search, + unique_citations, + citation_row, get_id_val, - cit_journal_sc, - cit_author_sc, - cit_duration, ) -def id2omids(s): - if "omid" in s: - return (s.replace("omid:br/", "",) - return (__get_omid_of(s),) +def cited_search(s): + return (__br_search(s, "cited_br"),) -def count_unique_cits(res, *args): - header = res[0] - citing_idx = header.index(args[1]) - cited_idx = header.index(args[2]) - set_oci = set() - - # build - if len(res) > 1: - citing_to_dedup = [] - cited_to_dedup = [] - for row in res[1:]: - citing_to_dedup.extend(row[citing_idx]) - cited_to_dedup.extend(row[cited_idx]) - - citing_to_dedup_meta = get_unique_brs_metadata( - list(set(citing_to_dedup)), ids_only=True - ) - cited_to_dedup_meta = get_unique_brs_metadata( - list(set(cited_to_dedup)), ids_only=True - ) - for _k_citing in citing_to_dedup_meta.keys(): - for _k_cited in cited_to_dedup_meta.keys(): - set_oci.add((_k_citing, _k_cited)) +def citing_search(s): + return (__br_search(s, "citing_br"),) - return [["count"], [len(set_oci)]], True +def issn_value(s): + value = re.sub("[^X0-9]", "", s.removeprefix("issn:").upper()) + return (f"{value[:4]}-{value[4:8]}",) -# args must contain the and -def citations_info(res, *args): - header = res[0] - citing_idx = header.index(args[1]) - cited_idx = header.index(args[2]) +def isbn_value(s): + value = re.sub("[^X0-9]", "", s.removeprefix("isbn:").upper()) + return (value,) + - # build +def citations_info(res): f_res = [ ["oci", "citing", "cited", "creation", "timespan", "journal_sc", "author_sc"] ] - - if len(res) > 1: - citing_to_dedup = [] - cited_to_dedup = [] - for row in res[1:]: - citing_to_dedup.extend(row[citing_idx]) - cited_to_dedup.extend(row[cited_idx]) - - citing_to_dedup_meta = get_unique_brs_metadata(list(set(citing_to_dedup))) - cited_to_dedup_meta = get_unique_brs_metadata(list(set(cited_to_dedup))) - - for citing_entity in citing_to_dedup_meta: - for cited_entity in cited_to_dedup_meta: - _citing = citing_to_dedup_meta[citing_entity] - _cited = cited_to_dedup_meta[cited_entity] - - res_row = [ - # oci value - get_id_val(citing_entity) + "-" + get_id_val(cited_entity), - # citing - __get_all_pids(_citing, citing_entity), - # cited - __get_all_pids(_cited, cited_entity), - # creation = citing[pub_date] - get_pub_date(_citing), - # timespan = citing[pub_date] - cited[pub_date] - cit_duration(get_pub_date(_citing), get_pub_date(_cited)), - # journal_sc = compare citing[source_id] and cited[source_id] - cit_journal_sc(get_source(_citing), get_source(_cited)), - # author_sc = compare citing[source_id] and cited[source_id] - cit_author_sc(get_author(_citing), get_author(_cited)), - ] - f_res.append(res_row) - + for citation in unique_citations(res): + f_res.append( + citation_row( + citation, + __get_all_pids(citation["citing_br"], citation["citing_ids"]), + __get_all_pids(citation["cited_br"], citation["cited_ids"]), + ) + ) return f_res, True -# args must contain the -def sum_all(res, *args): - +def venue_count(res): header = res[0] - count_idx = header.index(args[0]) - - tot_count = 0 - for row in res[1:]: - tot_count += int(row[count_idx][1]) - - res = [header, [str(tot_count)]] - return res, True - - -# --- -# Local methods -# --- - - -def __get_omid_of(s): - MULTI_VAL_MAX = 9000 - sparql_endpoint = env_config["sparql_endpoint_meta"] - - # SPARQL query - is_journal = False - br_pre_l = [ - "doi", - "issn", - "isbn", - "pmid", - "pmcid", - "url", - "wikidata", - "wikipedia", - "jid", - "arxiv", - ] - for br_pre in br_pre_l: - if s.startswith(br_pre + ":"): - s = s.replace(br_pre + ":", "") - # check if is journal - is_journal = br_pre in ["issn"] - break - - sparql_query = ( - """ - PREFIX datacite: - PREFIX literal: - SELECT ?br { - { ?identifier literal:hasLiteralValue '""" - + s - + """'^^. } - UNION - {?identifier literal:hasLiteralValue '""" - + s - + """'.} - ?br datacite:hasIdentifier ?identifier - } - """ - ) - - # in case is a journal the SAPRQL query retrieves all associated BRs - if is_journal: - sparql_query = ( - """ - PREFIX datacite: - PREFIX literal: - PREFIX ns1: - PREFIX fabio: - SELECT ?br { - { ?identifier literal:hasLiteralValue '""" - + s - + """'^^. } - UNION - {?identifier literal:hasLiteralValue '""" - + s - + """'.} - ?venue datacite:hasIdentifier ?identifier . - {?br ns1:partOf ?venue .} - UNION { ?br ns1:partOf/ns1:partOf ?venue . } - UNION { ?br ns1:partOf/ns1:partOf/ns1:partOf ?venue . } - UNION { ?br ns1:partOf/ns1:partOf/ns1:partOf/ns1:partOf ?venue .} - ?br a fabio:JournalArticle . - } - """ + count = res[1][header.index("count")][1] if len(res) > 1 else "0" + return [["count"], [count]], True + + +def __br_search(s, variable): + scheme, value = s.split(":", 1) + if scheme == "omid": + return f"VALUES ?{variable} {{ }}" + if scheme == "issn": + value = issn_value(s)[0] + elif scheme == "isbn": + value = isbn_value(s)[0] + if scheme in {"issn", "isbn"}: + return ( + literal_search(value, variable) + + f" ?resolved_identifier datacite:usesIdentifierScheme datacite:{scheme} ." ) + return literal_search(value, variable) - headers = { - "Accept": "application/sparql-results+json", - "Content-Type": "application/sparql-query", - } - try: - response = post(sparql_endpoint, headers=headers, data=sparql_query, timeout=45) - response.raise_for_status() - except RequestException: - return "" - r = loads(response.text) - results = r["results"]["bindings"] - omid_l = [elem["br"]["value"].split("meta/br/")[1] for elem in results] - - if len(omid_l) == 0: - return "" - - sparql_values = [] - for i in range(0, len(omid_l), MULTI_VAL_MAX): - sparql_values.append( - " ".join( - [ - "" - for e in omid_l[i : i + MULTI_VAL_MAX] - ] - ) - ) - return sparql_values - - -def __get_all_pids(elem, uri_omid): - str_omid = "omid:br/" + get_id_val(uri_omid) - str_ids = [str_omid] - if "ids" in elem: - for id in elem["ids"].split(" __ "): - str_ids.append(id) - return " ".join(str_ids) +def __get_all_pids(br, ids): + return " ".join(["omid:br/" + get_id_val(br), *ids.split(" __ ")]) diff --git a/src/api/meta_v1.hf b/src/api/meta_v1.hf index 740b90f..a3028e3 100644 --- a/src/api/meta_v1.hf +++ b/src/api/meta_v1.hf @@ -21,7 +21,7 @@ get(API_CALL, headers=HTTP_HEADERS) #version Version 1.1.1 (2022-12-22) #contacts [contact@opencitations.net](mailto:contact@opencitations.net) #license This document is licensed with a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/legalcode), while the REST API itself has been created using [RAMOSE](https://github.com/opencitations/ramose), the *Restful API Manager Over SPARQL Endpoints* created by [Silvio Peroni](https://orcid.org/0000-0003-0530-4305), which is licensed with an [ISC license](https://opensource.org/licenses/ISC). -#endpoint http://virtuoso-service.default.svc.cluster.local:8890/sparql +#endpoint http://meta-qlever-service.default.svc.cluster.local:7011 #method post #addon metaapi @@ -65,247 +65,243 @@ It is possible to specify one or more IDs as input of this operation. In this ca "editor": "Allan, Catherine [orcid:0000-0003-2098-4759 omid:ra/069012996]; Stankey, George H. [omid:ra/061808486861]" } ] -#sparql PREFIX foaf: -PREFIX pro: +#sparql PREFIX datacite: +PREFIX fabio: PREFIX literal: + +SELECT DISTINCT ?res +WHERE { + [[ids]] +} + +@@join ?res ?res type=left +@@values ?res PREFIX datacite: PREFIX dcterm: -PREFIX frbr: +PREFIX literal: +PREFIX prism: + +SELECT ?res ?title ?pub_date +(CONCAT(COALESCE(GROUP_CONCAT(DISTINCT ?external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) +WHERE { + OPTIONAL { ?res dcterm:title ?title } + OPTIONAL { ?res prism:publicationDate ?pub_date } + OPTIONAL { ?res datacite:hasIdentifier ?identifier } + BIND(COALESCE(?identifier, ) AS ?identifier_node) + OPTIONAL { ?identifier_node datacite:usesIdentifierScheme ?scheme } + OPTIONAL { ?identifier_node literal:hasLiteralValue ?literal_value } + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literal_value, " ") AS ?external_id) +} +GROUP BY ?res ?title ?pub_date + +@@join ?res ?res type=left +@@values ?res PREFIX fabio: + +SELECT DISTINCT ?res ?type +WHERE { + ?res a ?type. + FILTER(?type != fabio:Expression) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX frbr: PREFIX prism: + +SELECT DISTINCT ?res ?page +WHERE { + ?res frbr:embodiment ?embodiment. + ?embodiment prism:startingPage ?starting_page; + prism:endingPage ?ending_page. + BIND(IF(STR(?starting_page) = STR(?ending_page), STR(?starting_page), CONCAT(?starting_page, "-", ?ending_page)) AS ?page) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?issue +WHERE { + ?res frbr:partOf ?journal_issue. + ?journal_issue a fabio:JournalIssue; + fabio:hasSequenceIdentifier ?issue. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?volume +WHERE { + ?res frbr:partOf+ ?journal_volume. + ?journal_volume a fabio:JournalVolume; + fabio:hasSequenceIdentifier ?volume. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX dcterm: +PREFIX fabio: +PREFIX frbr: +PREFIX literal: + +SELECT ?res +(CONCAT(?venue_name, " [", COALESCE(GROUP_CONCAT(DISTINCT ?venue_external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?venue_resource), "/br/"), "]") AS ?venue) +WHERE { + ?res frbr:partOf ?direct_container; + frbr:partOf+ ?venue_resource. + ?venue_resource dcterm:title ?venue_name. + FILTER(?venue_resource = ?direct_container || (EXISTS { ?res a fabio:JournalArticle } && EXISTS { ?venue_resource a fabio:Journal })) + OPTIONAL { ?venue_resource datacite:hasIdentifier ?venue_identifier } + BIND(COALESCE(?venue_identifier, ) AS ?venue_identifier_node) + OPTIONAL { ?venue_identifier_node datacite:usesIdentifierScheme ?venue_scheme } + OPTIONAL { ?venue_identifier_node literal:hasLiteralValue ?venue_literal_value } + BIND(CONCAT(STRAFTER(STR(?venue_scheme), "http://purl.org/spar/datacite/"), ":", ?venue_literal_value, " ") AS ?venue_external_id) +} +GROUP BY ?res ?venue_resource ?venue_name + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: PREFIX oco: +PREFIX pro: -SELECT DISTINCT -?id -(STR(?title) AS ?title) -(GROUP_CONCAT(DISTINCT ?author_info; SEPARATOR="|") AS ?author) -(STR(?pub_date) AS ?pub_date) -(STR(?issue) AS ?issue) -(STR(?volume) AS ?volume) -?venue -?type -?page -(GROUP_CONCAT(DISTINCT ?publisher_info; SEPARATOR="|") AS ?publisher) -(GROUP_CONCAT(DISTINCT ?combined_editor_info; SEPARATOR="|") AS ?editor) +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?author) WHERE { - { - SELECT ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?pub_date ?page ?issue ?volume ?venueName ?venueMetaid - (GROUP_CONCAT(DISTINCT ?id ; SEPARATOR=" ") AS ?ids) - (GROUP_CONCAT(DISTINCT ?venue_ids_; SEPARATOR=' ') AS ?venue_ids) - WHERE { - [[ids]] - OPTIONAL { - ?res datacite:hasIdentifier ?allIdentifiers. - ?allIdentifiers datacite:usesIdentifierScheme ?allSchemes; - literal:hasLiteralValue ?allLiteralValues. - BIND(CONCAT(STRAFTER(STR(?allSchemes), "http://purl.org/spar/datacite/"), ":", ?allLiteralValues) AS ?id) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arAuthor. - ?arAuthor pro:withRole pro:author; - pro:isHeldBy ?raAuthor. - OPTIONAL { - ?arAuthor oco:hasNext ?nextAuthorRole . - } - BIND(STRAFTER(STR(?arAuthor), "https://w3id.org/oc/meta/ar/") AS ?roleUri) - BIND(STRAFTER(STR(?nextAuthorRole), "https://w3id.org/oc/meta/ar/") AS ?nextRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raAuthor), "/ra/")) AS ?author_metaid) - OPTIONAL {?raAuthor foaf:familyName ?familyName.} - OPTIONAL {?raAuthor foaf:givenName ?givenName.} - OPTIONAL {?raAuthor foaf:name ?name.} - OPTIONAL { - ?raAuthor datacite:hasIdentifier ?authorIdentifier. - ?authorIdentifier datacite:usesIdentifierScheme ?authorIdSchema; - literal:hasLiteralValue ?authorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?authorIdSchema), "http://purl.org/spar/datacite/"), ":", ?authorIdLiteralValue) AS ?author_id) - } - BIND( - IF( - STRLEN(STR(?familyName)) > 0 && STRLEN(STR(?givenName)) > 0, - CONCAT(?familyName, ", ", ?givenName), - IF( - STRLEN(STR(?familyName)) > 0, - CONCAT(?familyName, ","), - ?name - ) - ) - AS ?authorName) - BIND( - IF( - STRLEN(STR(?author_id)) > 0, - CONCAT(?authorName, " [", ?author_id, " ", ?author_metaid, "]"), - CONCAT(?authorName, " [", ?author_metaid, "]") - ) - AS ?author_) - BIND(CONCAT(?author_, ":", ?roleUri, ":", COALESCE(?nextRoleUri, "")) AS ?author_info) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arEditor. - ?arEditor pro:withRole pro:editor; - pro:isHeldBy ?raEditor. - OPTIONAL { - ?arEditor oco:hasNext ?nextEditorRole . - } - BIND(STRAFTER(STR(?arEditor), "https://w3id.org/oc/meta/ar/") AS ?editorRoleUri) - BIND(STRAFTER(STR(?nextEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raEditor), "/ra/")) AS ?editor_metaid) - OPTIONAL {?raEditor foaf:familyName ?editorFamilyName.} - OPTIONAL {?raEditor foaf:givenName ?editorGivenName.} - OPTIONAL {?raEditor foaf:name ?editor_name.} - OPTIONAL { - ?raEditor datacite:hasIdentifier ?editorIdentifier. - ?editorIdentifier datacite:usesIdentifierScheme ?editorIdSchema; - literal:hasLiteralValue ?editorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?editorIdSchema), "http://purl.org/spar/datacite/"), ":", ?editorIdLiteralValue) AS ?editor_id) - } - BIND( - IF( - STRLEN(STR(?editorFamilyName)) > 0 && STRLEN(STR(?editorGivenName)) > 0, - CONCAT(?editorFamilyName, ", ", ?editorGivenName), - IF( - STRLEN(STR(?editorFamilyName)) > 0, - CONCAT(?editorFamilyName, ","), - ?editor_name - ) - ) - AS ?editorName) - BIND( - IF( - STRLEN(STR(?editor_id)) > 0, - CONCAT(?editorName, " [", ?editor_id, " ", ?editor_metaid, "]"), - CONCAT(?editorName, " [", ?editor_metaid, "]") - ) - AS ?editor_) - BIND(CONCAT(?editor_, ":", ?editorRoleUri, ":", COALESCE(?nextEditorRoleUri, "")) AS ?editor_info) - } - OPTIONAL { - ?res frbr:partOf ?container. - ?container pro:isDocumentContextFor ?arContainerEditor. - ?arContainerEditor pro:withRole pro:editor; - pro:isHeldBy ?raContainerEditor. - OPTIONAL { - ?arContainerEditor oco:hasNext ?nextContainerEditorRole . - } - BIND(STRAFTER(STR(?arContainerEditor), "https://w3id.org/oc/meta/ar/") AS ?containerEditorRoleUri) - BIND(STRAFTER(STR(?nextContainerEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextContainerEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raContainerEditor), "/ra/")) AS ?container_editor_metaid) - OPTIONAL {?raContainerEditor foaf:familyName ?containerEditorFamilyName.} - OPTIONAL {?raContainerEditor foaf:givenName ?containerEditorGivenName.} - OPTIONAL {?raContainerEditor foaf:name ?container_editor_name.} - OPTIONAL { - ?raContainerEditor datacite:hasIdentifier ?containerEditorIdentifier. - ?containerEditorIdentifier datacite:usesIdentifierScheme ?containerEditorIdSchema; - literal:hasLiteralValue ?containerEditorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?containerEditorIdSchema), "http://purl.org/spar/datacite/"), ":", ?containerEditorIdLiteralValue) AS ?container_editor_id) - } - BIND( - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0 && STRLEN(STR(?containerEditorGivenName)) > 0, - CONCAT(?containerEditorFamilyName, ", ", ?containerEditorGivenName), - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0, - CONCAT(?containerEditorFamilyName, ","), - ?container_editor_name - ) - ) - AS ?containerEditorName) - BIND( - IF( - STRLEN(STR(?container_editor_id)) > 0, - CONCAT(?containerEditorName, " [", ?container_editor_id, " ", ?container_editor_metaid, "]"), - CONCAT(?containerEditorName, " [", ?container_editor_metaid, "]") - ) - AS ?container_editor_) - BIND(CONCAT(?container_editor_, ":", ?containerEditorRoleUri, ":", COALESCE(?nextContainerEditorRoleUri, "")) AS ?container_editor_info) - } - BIND( - IF(BOUND(?editor_info), - IF(BOUND(?container_editor_info), - CONCAT(?editor_info, "|", ?container_editor_info), - ?editor_info), - IF(BOUND(?container_editor_info), - ?container_editor_info, - "") - ) - AS ?combined_editor_info) - OPTIONAL { - ?res pro:isDocumentContextFor ?arPublisher. - ?arPublisher pro:withRole pro:publisher; - pro:isHeldBy ?raPublisher. - OPTIONAL { - ?arPublisher oco:hasNext ?nextPublisherRole . - } - BIND(STRAFTER(STR(?arPublisher), "https://w3id.org/oc/meta/ar/") AS ?publisherRoleUri) - BIND(STRAFTER(STR(?nextPublisherRole), "https://w3id.org/oc/meta/ar/") AS ?nextPublisherRoleUri) - ?raPublisher foaf:name ?publisherName_. - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raPublisher), "/ra/")) AS ?publisher_metaid) - ?raPublisher foaf:name ?publisher_name. - OPTIONAL { - ?raPublisher datacite:hasIdentifier ?publisherIdentifier__. - ?publisherIdentifier__ datacite:usesIdentifierScheme ?publisherIdSchema; - literal:hasLiteralValue ?publisherIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?publisherIdSchema), "http://purl.org/spar/datacite/"), ":", ?publisherIdLiteralValue) AS ?publisher_id) - } - BIND( - IF( - STRLEN(STR(?publisher_id)) > 0, - CONCAT(?publisher_name, " [", ?publisher_id, " ", ?publisher_metaid, "]"), - CONCAT(?publisher_name, " [", ?publisher_metaid, "]") - ) - AS ?publisher_) - BIND(CONCAT(?publisher_, ":", ?publisherRoleUri, ":", COALESCE(?nextPublisherRoleUri, "")) AS ?publisher_info) - } - OPTIONAL { - { - ?res a fabio:JournalArticle; - frbr:partOf+ ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - ?journal a fabio:Journal. - } UNION { - ?res frbr:partOf ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - } - ?journal dcterm:title ?venueName. - OPTIONAL { - ?journal datacite:hasIdentifier ?journalIdentifier__. - ?journalIdentifier__ datacite:usesIdentifierScheme ?journalIdScheme; - literal:hasLiteralValue ?journalIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?journalIdScheme), "http://purl.org/spar/datacite/"), ":", ?journalIdLiteralValue) AS ?venue_ids_) - } - } - OPTIONAL {?res a ?type. FILTER (?type != fabio:Expression)} - OPTIONAL {?res dcterm:title ?title.} - OPTIONAL {?res prism:publicationDate ?pub_date.} - OPTIONAL { - ?res frbr:embodiment ?re. - ?re prism:startingPage ?startingPage; - prism:endingPage ?endingPage. - BIND(IF(STR(?startingPage) = STR(?endingPage), STR(?startingPage), CONCAT(?startingPage, '-', ?endingPage)) AS ?page) - } - OPTIONAL { - ?res frbr:partOf ?resIssue. - ?resIssue a fabio:JournalIssue; - fabio:hasSequenceIdentifier ?issue. - } - OPTIONAL { - ?res frbr:partOf+ ?resVolume. - ?resVolume a fabio:JournalVolume; - fabio:hasSequenceIdentifier ?volume. - } - } GROUP BY ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?issue ?volume ?pub_date ?page ?venueName ?venueMetaid - } - BIND(CONCAT(?ids, IF(STR(?ids) != "", " ", ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:author; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX frbr: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?editor) +WHERE { + OPTIONAL { ?res frbr:partOf ?container } + VALUES ?of_container { false true } + BIND(IF(?of_container, COALESCE(?container, ), ?res) AS ?context) + ?context pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:editor; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) BIND( - IF(BOUND(?venueMetaid), - IF(STR(?venue_ids) != "", - CONCAT(" [", ?venue_ids, " ", ?venueMetaid, "]"), - CONCAT(" [", ?venueMetaid, "]") - ), - "" + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) ) - AS ?venueIdentifiers) - BIND(CONCAT(?venueName, ?venueIdentifiers) AS ?venue) -} GROUP BY ?id ?title ?type ?issue ?volume ?venue ?pub_date ?page + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?publisher) +WHERE { + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:publisher; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res #url /author/{id} #type operation @@ -371,254 +367,248 @@ The fields returned by this operation are: "editor": "" } ] -#sparql PREFIX foaf: -PREFIX pro: +#sparql PREFIX datacite: +PREFIX fabio: PREFIX literal: +PREFIX pro: + +SELECT DISTINCT ?res +WHERE { + [[id]] + ?knownRole pro:withRole pro:author. + ?res pro:isDocumentContextFor ?knownRole; + a fabio:Expression. +} +LIMIT 1000 + +@@join ?res ?res type=left +@@values ?res PREFIX datacite: PREFIX dcterm: -PREFIX frbr: +PREFIX literal: +PREFIX prism: + +SELECT ?res ?title ?pub_date +(CONCAT(COALESCE(GROUP_CONCAT(DISTINCT ?external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) +WHERE { + OPTIONAL { ?res dcterm:title ?title } + OPTIONAL { ?res prism:publicationDate ?pub_date } + OPTIONAL { ?res datacite:hasIdentifier ?identifier } + BIND(COALESCE(?identifier, ) AS ?identifier_node) + OPTIONAL { ?identifier_node datacite:usesIdentifierScheme ?scheme } + OPTIONAL { ?identifier_node literal:hasLiteralValue ?literal_value } + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literal_value, " ") AS ?external_id) +} +GROUP BY ?res ?title ?pub_date + +@@join ?res ?res type=left +@@values ?res PREFIX fabio: + +SELECT DISTINCT ?res ?type +WHERE { + ?res a ?type. + FILTER(?type != fabio:Expression) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX frbr: PREFIX prism: + +SELECT DISTINCT ?res ?page +WHERE { + ?res frbr:embodiment ?embodiment. + ?embodiment prism:startingPage ?starting_page; + prism:endingPage ?ending_page. + BIND(IF(STR(?starting_page) = STR(?ending_page), STR(?starting_page), CONCAT(?starting_page, "-", ?ending_page)) AS ?page) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?issue +WHERE { + ?res frbr:partOf ?journal_issue. + ?journal_issue a fabio:JournalIssue; + fabio:hasSequenceIdentifier ?issue. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?volume +WHERE { + ?res frbr:partOf+ ?journal_volume. + ?journal_volume a fabio:JournalVolume; + fabio:hasSequenceIdentifier ?volume. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX dcterm: +PREFIX fabio: +PREFIX frbr: +PREFIX literal: + +SELECT ?res +(CONCAT(?venue_name, " [", COALESCE(GROUP_CONCAT(DISTINCT ?venue_external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?venue_resource), "/br/"), "]") AS ?venue) +WHERE { + ?res frbr:partOf ?direct_container; + frbr:partOf+ ?venue_resource. + ?venue_resource dcterm:title ?venue_name. + FILTER(?venue_resource = ?direct_container || (EXISTS { ?res a fabio:JournalArticle } && EXISTS { ?venue_resource a fabio:Journal })) + OPTIONAL { ?venue_resource datacite:hasIdentifier ?venue_identifier } + BIND(COALESCE(?venue_identifier, ) AS ?venue_identifier_node) + OPTIONAL { ?venue_identifier_node datacite:usesIdentifierScheme ?venue_scheme } + OPTIONAL { ?venue_identifier_node literal:hasLiteralValue ?venue_literal_value } + BIND(CONCAT(STRAFTER(STR(?venue_scheme), "http://purl.org/spar/datacite/"), ":", ?venue_literal_value, " ") AS ?venue_external_id) +} +GROUP BY ?res ?venue_resource ?venue_name + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: PREFIX oco: +PREFIX pro: -SELECT DISTINCT -?id -(STR(?title) AS ?title) -(GROUP_CONCAT(DISTINCT ?author_info; SEPARATOR="|") AS ?author) -(STR(?pub_date) AS ?pub_date) -(STR(?issue) AS ?issue) -(STR(?volume) AS ?volume) -?venue -?type -?page -(GROUP_CONCAT(DISTINCT ?publisher_info; SEPARATOR="|") AS ?publisher) -(GROUP_CONCAT(DISTINCT ?combined_editor_info; SEPARATOR="|") AS ?editor) +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?author) WHERE { - { - SELECT ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?pub_date ?page ?issue ?volume ?venueName ?venueMetaid - (GROUP_CONCAT(DISTINCT ?id ; SEPARATOR=" ") AS ?ids) - (GROUP_CONCAT(DISTINCT ?venue_ids_; SEPARATOR=' ') AS ?venue_ids) - WHERE { - { - SELECT DISTINCT ?res - WHERE { - [[id]] - ?knownRole pro:withRole pro:author. - ?res pro:isDocumentContextFor ?knownRole; - a fabio:Expression. - } LIMIT 1000 - } - OPTIONAL { - ?res datacite:hasIdentifier ?identifier. - ?identifier datacite:usesIdentifierScheme ?scheme; - literal:hasLiteralValue ?literalValue. - BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literalValue) AS ?id) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arAuthor. - ?arAuthor pro:withRole pro:author; - pro:isHeldBy ?raAuthor. - OPTIONAL { - ?arAuthor oco:hasNext ?nextAuthorRole . - } - BIND(STRAFTER(STR(?arAuthor), "https://w3id.org/oc/meta/ar/") AS ?roleUri) - BIND(STRAFTER(STR(?nextAuthorRole), "https://w3id.org/oc/meta/ar/") AS ?nextRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raAuthor), "/ra/")) AS ?author_metaid) - OPTIONAL {?raAuthor foaf:familyName ?familyName.} - OPTIONAL {?raAuthor foaf:givenName ?givenName.} - OPTIONAL {?raAuthor foaf:name ?name.} - OPTIONAL { - ?raAuthor datacite:hasIdentifier ?authorIdentifier. - ?authorIdentifier datacite:usesIdentifierScheme ?authorIdSchema; - literal:hasLiteralValue ?authorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?authorIdSchema), "http://purl.org/spar/datacite/"), ":", ?authorIdLiteralValue) AS ?author_id) - } - BIND( - IF( - STRLEN(STR(?familyName)) > 0 && STRLEN(STR(?givenName)) > 0, - CONCAT(?familyName, ", ", ?givenName), - IF( - STRLEN(STR(?familyName)) > 0, - CONCAT(?familyName, ","), - ?name - ) - ) - AS ?authorName) - BIND( - IF( - STRLEN(STR(?author_id)) > 0, - CONCAT(?authorName, " [", ?author_id, " ", ?author_metaid, "]"), - CONCAT(?authorName, " [", ?author_metaid, "]") - ) - AS ?author_) - BIND(CONCAT(?author_, ":", ?roleUri, ":", COALESCE(?nextRoleUri, "")) AS ?author_info) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arEditor. - ?arEditor pro:withRole pro:editor; - pro:isHeldBy ?raEditor. - OPTIONAL { - ?arEditor oco:hasNext ?nextEditorRole . - } - BIND(STRAFTER(STR(?arEditor), "https://w3id.org/oc/meta/ar/") AS ?editorRoleUri) - BIND(STRAFTER(STR(?nextEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raEditor), "/ra/")) AS ?editor_metaid) - OPTIONAL {?raEditor foaf:familyName ?editorFamilyName.} - OPTIONAL {?raEditor foaf:givenName ?editorGivenName.} - OPTIONAL {?raEditor foaf:name ?editor_name.} - OPTIONAL { - ?raEditor datacite:hasIdentifier ?editorIdentifier. - ?editorIdentifier datacite:usesIdentifierScheme ?editorIdSchema; - literal:hasLiteralValue ?editorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?editorIdSchema), "http://purl.org/spar/datacite/"), ":", ?editorIdLiteralValue) AS ?editor_id) - } - BIND( - IF( - STRLEN(STR(?editorFamilyName)) > 0 && STRLEN(STR(?editorGivenName)) > 0, - CONCAT(?editorFamilyName, ", ", ?editorGivenName), - IF( - STRLEN(STR(?editorFamilyName)) > 0, - CONCAT(?editorFamilyName, ","), - ?editor_name - ) - ) - AS ?editorName) - BIND( - IF( - STRLEN(STR(?editor_id)) > 0, - CONCAT(?editorName, " [", ?editor_id, " ", ?editor_metaid, "]"), - CONCAT(?editorName, " [", ?editor_metaid, "]") - ) - AS ?editor_) - BIND(CONCAT(?editor_, ":", ?editorRoleUri, ":", COALESCE(?nextEditorRoleUri, "")) AS ?editor_info) - } - OPTIONAL { - ?res frbr:partOf ?container. - ?container pro:isDocumentContextFor ?arContainerEditor. - ?arContainerEditor pro:withRole pro:editor; - pro:isHeldBy ?raContainerEditor. - OPTIONAL { - ?arContainerEditor oco:hasNext ?nextContainerEditorRole . - } - BIND(STRAFTER(STR(?arContainerEditor), "https://w3id.org/oc/meta/ar/") AS ?containerEditorRoleUri) - BIND(STRAFTER(STR(?nextContainerEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextContainerEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raContainerEditor), "/ra/")) AS ?container_editor_metaid) - OPTIONAL {?raContainerEditor foaf:familyName ?containerEditorFamilyName.} - OPTIONAL {?raContainerEditor foaf:givenName ?containerEditorGivenName.} - OPTIONAL {?raContainerEditor foaf:name ?container_editor_name.} - OPTIONAL { - ?raContainerEditor datacite:hasIdentifier ?containerEditorIdentifier. - ?containerEditorIdentifier datacite:usesIdentifierScheme ?containerEditorIdSchema; - literal:hasLiteralValue ?containerEditorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?containerEditorIdSchema), "http://purl.org/spar/datacite/"), ":", ?containerEditorIdLiteralValue) AS ?container_editor_id) - } - BIND( - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0 && STRLEN(STR(?containerEditorGivenName)) > 0, - CONCAT(?containerEditorFamilyName, ", ", ?containerEditorGivenName), - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0, - CONCAT(?containerEditorFamilyName, ","), - ?container_editor_name - ) - ) - AS ?containerEditorName) - BIND( - IF( - STRLEN(STR(?container_editor_id)) > 0, - CONCAT(?containerEditorName, " [", ?container_editor_id, " ", ?container_editor_metaid, "]"), - CONCAT(?containerEditorName, " [", ?container_editor_metaid, "]") - ) - AS ?container_editor_) - BIND(CONCAT(?container_editor_, ":", ?containerEditorRoleUri, ":", COALESCE(?nextContainerEditorRoleUri, "")) AS ?container_editor_info) - } - BIND( - IF(BOUND(?editor_info), - IF(BOUND(?container_editor_info), - CONCAT(?editor_info, "|", ?container_editor_info), - ?editor_info), - IF(BOUND(?container_editor_info), - ?container_editor_info, - "") - ) - AS ?combined_editor_info) - OPTIONAL { - ?res pro:isDocumentContextFor ?arPublisher. - ?arPublisher pro:withRole pro:publisher; - pro:isHeldBy ?raPublisher. - OPTIONAL { - ?arPublisher oco:hasNext ?nextPublisherRole . - } - BIND(STRAFTER(STR(?arPublisher), "https://w3id.org/oc/meta/ar/") AS ?publisherRoleUri) - BIND(STRAFTER(STR(?nextPublisherRole), "https://w3id.org/oc/meta/ar/") AS ?nextPublisherRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raPublisher), "/ra/")) AS ?publisher_metaid) - ?raPublisher foaf:name ?publisher_name. - OPTIONAL { - ?raPublisher datacite:hasIdentifier ?publisherIdentifier__. - ?publisherIdentifier__ datacite:usesIdentifierScheme ?publisherIdSchema; - literal:hasLiteralValue ?publisherIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?publisherIdSchema), "http://purl.org/spar/datacite/"), ":", ?publisherIdLiteralValue) AS ?publisher_id) - } - BIND( - IF( - STRLEN(STR(?publisher_id)) > 0, - CONCAT(?publisher_name, " [", ?publisher_id, " ", ?publisher_metaid, "]"), - CONCAT(?publisher_name, " [", ?publisher_metaid, "]") - ) - AS ?publisher_) - BIND(CONCAT(?publisher_, ":", ?publisherRoleUri, ":", COALESCE(?nextPublisherRoleUri, "")) AS ?publisher_info) - } - OPTIONAL { - { - ?res a fabio:JournalArticle; - frbr:partOf+ ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - ?journal a fabio:Journal. - } UNION { - ?res frbr:partOf ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - } - ?journal dcterm:title ?venueName. - OPTIONAL { - ?journal datacite:hasIdentifier ?journalIdentifier__. - ?journalIdentifier__ datacite:usesIdentifierScheme ?journalIdScheme; - literal:hasLiteralValue ?journalIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?journalIdScheme), "http://purl.org/spar/datacite/"), ":", ?journalIdLiteralValue) AS ?venue_ids_) - } - } - OPTIONAL {?res a ?type. FILTER (?type != fabio:Expression)} - OPTIONAL {?res dcterm:title ?title.} - OPTIONAL {?res prism:publicationDate ?pub_date.} - OPTIONAL { - ?res frbr:embodiment ?re. - ?re prism:startingPage ?startingPage; - prism:endingPage ?endingPage. - BIND(IF(STR(?startingPage) = STR(?endingPage), STR(?startingPage), CONCAT(?startingPage, '-', ?endingPage)) AS ?page) - } - OPTIONAL { - ?res frbr:partOf ?resIssue. - ?resIssue a fabio:JournalIssue; - fabio:hasSequenceIdentifier ?issue. - } - OPTIONAL { - ?res frbr:partOf+ ?resVolume. - ?resVolume a fabio:JournalVolume; - fabio:hasSequenceIdentifier ?volume. - } - } GROUP BY ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?issue ?volume ?pub_date ?page ?venueName ?venueMetaid - } - BIND(CONCAT(?ids, IF(STR(?ids) != "", " ", ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:author; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX frbr: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?editor) +WHERE { + OPTIONAL { ?res frbr:partOf ?container } + VALUES ?of_container { false true } + BIND(IF(?of_container, COALESCE(?container, ), ?res) AS ?context) + ?context pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:editor; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?publisher) +WHERE { + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:publisher; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) BIND( - IF(BOUND(?venueMetaid), - IF(STR(?venue_ids) != "", - CONCAT(" [", ?venue_ids, " ", ?venueMetaid, "]"), - CONCAT(" [", ?venueMetaid, "]") - ), - "" + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) ) - AS ?venueIdentifiers) - BIND(CONCAT(?venueName, ?venueIdentifiers) AS ?venue) -} GROUP BY ?id ?title ?type ?issue ?volume ?venue ?pub_date ?page + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res #url /editor/{id} #type operation @@ -658,251 +648,245 @@ The fields returned by this operation are: "editor": "Allan, Catherine [orcid:0000-0003-2098-4759 omid:ra/069012996]; Stankey, George H. [omid:ra/061808486861]" } ] -#sparql PREFIX foaf: -PREFIX pro: +#sparql PREFIX datacite: +PREFIX fabio: PREFIX literal: +PREFIX pro: + +SELECT DISTINCT ?res +WHERE { + [[id]] + ?knownRole pro:withRole pro:editor. + ?res pro:isDocumentContextFor ?knownRole; + a fabio:Expression. +} +LIMIT 1000 + +@@join ?res ?res type=left +@@values ?res PREFIX datacite: PREFIX dcterm: -PREFIX frbr: +PREFIX literal: +PREFIX prism: + +SELECT ?res ?title ?pub_date +(CONCAT(COALESCE(GROUP_CONCAT(DISTINCT ?external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) +WHERE { + OPTIONAL { ?res dcterm:title ?title } + OPTIONAL { ?res prism:publicationDate ?pub_date } + OPTIONAL { ?res datacite:hasIdentifier ?identifier } + BIND(COALESCE(?identifier, ) AS ?identifier_node) + OPTIONAL { ?identifier_node datacite:usesIdentifierScheme ?scheme } + OPTIONAL { ?identifier_node literal:hasLiteralValue ?literal_value } + BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literal_value, " ") AS ?external_id) +} +GROUP BY ?res ?title ?pub_date + +@@join ?res ?res type=left +@@values ?res PREFIX fabio: + +SELECT DISTINCT ?res ?type +WHERE { + ?res a ?type. + FILTER(?type != fabio:Expression) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX frbr: PREFIX prism: + +SELECT DISTINCT ?res ?page +WHERE { + ?res frbr:embodiment ?embodiment. + ?embodiment prism:startingPage ?starting_page; + prism:endingPage ?ending_page. + BIND(IF(STR(?starting_page) = STR(?ending_page), STR(?starting_page), CONCAT(?starting_page, "-", ?ending_page)) AS ?page) +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?issue +WHERE { + ?res frbr:partOf ?journal_issue. + ?journal_issue a fabio:JournalIssue; + fabio:hasSequenceIdentifier ?issue. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX fabio: +PREFIX frbr: + +SELECT DISTINCT ?res ?volume +WHERE { + ?res frbr:partOf+ ?journal_volume. + ?journal_volume a fabio:JournalVolume; + fabio:hasSequenceIdentifier ?volume. +} + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX dcterm: +PREFIX fabio: +PREFIX frbr: +PREFIX literal: + +SELECT ?res +(CONCAT(?venue_name, " [", COALESCE(GROUP_CONCAT(DISTINCT ?venue_external_id; SEPARATOR=""), ""), "omid:br/", STRAFTER(STR(?venue_resource), "/br/"), "]") AS ?venue) +WHERE { + ?res frbr:partOf ?direct_container; + frbr:partOf+ ?venue_resource. + ?venue_resource dcterm:title ?venue_name. + FILTER(?venue_resource = ?direct_container || (EXISTS { ?res a fabio:JournalArticle } && EXISTS { ?venue_resource a fabio:Journal })) + OPTIONAL { ?venue_resource datacite:hasIdentifier ?venue_identifier } + BIND(COALESCE(?venue_identifier, ) AS ?venue_identifier_node) + OPTIONAL { ?venue_identifier_node datacite:usesIdentifierScheme ?venue_scheme } + OPTIONAL { ?venue_identifier_node literal:hasLiteralValue ?venue_literal_value } + BIND(CONCAT(STRAFTER(STR(?venue_scheme), "http://purl.org/spar/datacite/"), ":", ?venue_literal_value, " ") AS ?venue_external_id) +} +GROUP BY ?res ?venue_resource ?venue_name + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: PREFIX oco: +PREFIX pro: -SELECT DISTINCT -?id -(STR(?title) AS ?title) -(GROUP_CONCAT(DISTINCT ?author_info; SEPARATOR="|") AS ?author) -(STR(?pub_date) AS ?pub_date) -(STR(?issue) AS ?issue) -(STR(?volume) AS ?volume) -?venue -?type -?page -(GROUP_CONCAT(DISTINCT ?publisher_info; SEPARATOR="|") AS ?publisher) -(GROUP_CONCAT(DISTINCT ?combined_editor_info; SEPARATOR="|") AS ?editor) +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?author) WHERE { - { - SELECT ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?pub_date ?page ?issue ?volume ?venueName ?venueMetaid - (GROUP_CONCAT(DISTINCT ?id ; SEPARATOR=" ") AS ?ids) - (GROUP_CONCAT(DISTINCT ?venue_ids_; SEPARATOR=' ') AS ?venue_ids) - WHERE { - { - SELECT DISTINCT ?res - WHERE { - [[id]] - ?knownRole pro:withRole pro:editor. - ?res pro:isDocumentContextFor ?knownRole; - a fabio:Expression. - } LIMIT 1000 - } - OPTIONAL { - ?res datacite:hasIdentifier ?identifier. - ?identifier datacite:usesIdentifierScheme ?scheme; - literal:hasLiteralValue ?literalValue. - BIND(CONCAT(STRAFTER(STR(?scheme), "http://purl.org/spar/datacite/"), ":", ?literalValue) AS ?id) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arAuthor. - ?arAuthor pro:withRole pro:author; - pro:isHeldBy ?raAuthor. - OPTIONAL { - ?arAuthor oco:hasNext ?nextAuthorRole . - } - BIND(STRAFTER(STR(?arAuthor), "https://w3id.org/oc/meta/ar/") AS ?roleUri) - BIND(STRAFTER(STR(?nextAuthorRole), "https://w3id.org/oc/meta/ar/") AS ?nextRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raAuthor), "/ra/")) AS ?author_metaid) - OPTIONAL {?raAuthor foaf:familyName ?familyName.} - OPTIONAL {?raAuthor foaf:givenName ?givenName.} - OPTIONAL {?raAuthor foaf:name ?name.} - OPTIONAL { - ?raAuthor datacite:hasIdentifier ?authorIdentifier. - ?authorIdentifier datacite:usesIdentifierScheme ?authorIdSchema; - literal:hasLiteralValue ?authorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?authorIdSchema), "http://purl.org/spar/datacite/"), ":", ?authorIdLiteralValue) AS ?author_id) - } - BIND( - IF( - STRLEN(STR(?familyName)) > 0 && STRLEN(STR(?givenName)) > 0, - CONCAT(?familyName, ", ", ?givenName), - IF( - STRLEN(STR(?familyName)) > 0, - CONCAT(?familyName, ","), - ?name - ) - ) - AS ?authorName) - BIND( - IF( - STRLEN(STR(?author_id)) > 0, - CONCAT(?authorName, " [", ?author_id, " ", ?author_metaid, "]"), - CONCAT(?authorName, " [", ?author_metaid, "]") - ) - AS ?author_) - BIND(CONCAT(?author_, ":", ?roleUri, ":", COALESCE(?nextRoleUri, "")) AS ?author_info) - } - OPTIONAL { - ?res pro:isDocumentContextFor ?arEditor. - ?arEditor pro:withRole pro:editor; - pro:isHeldBy ?raEditor. - OPTIONAL { - ?arEditor oco:hasNext ?nextEditorRole . - } - BIND(STRAFTER(STR(?arEditor), "https://w3id.org/oc/meta/ar/") AS ?editorRoleUri) - BIND(STRAFTER(STR(?nextEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raEditor), "/ra/")) AS ?editor_metaid) - OPTIONAL {?raEditor foaf:familyName ?editorFamilyName.} - OPTIONAL {?raEditor foaf:givenName ?editorGivenName.} - OPTIONAL {?raEditor foaf:name ?editor_name.} - OPTIONAL { - ?raEditor datacite:hasIdentifier ?editorIdentifier. - ?editorIdentifier datacite:usesIdentifierScheme ?editorIdSchema; - literal:hasLiteralValue ?editorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?editorIdSchema), "http://purl.org/spar/datacite/"), ":", ?editorIdLiteralValue) AS ?editor_id) - } - BIND( - IF( - STRLEN(STR(?editorFamilyName)) > 0 && STRLEN(STR(?editorGivenName)) > 0, - CONCAT(?editorFamilyName, ", ", ?editorGivenName), - IF( - STRLEN(STR(?editorFamilyName)) > 0, - CONCAT(?editorFamilyName, ","), - ?editor_name - ) - ) - AS ?editorName) - BIND( - IF( - STRLEN(STR(?editor_id)) > 0, - CONCAT(?editorName, " [", ?editor_id, " ", ?editor_metaid, "]"), - CONCAT(?editorName, " [", ?editor_metaid, "]") - ) - AS ?editor_) - BIND(CONCAT(?editor_, ":", ?editorRoleUri, ":", COALESCE(?nextEditorRoleUri, "")) AS ?editor_info) - } - OPTIONAL { - ?res frbr:partOf ?container. - ?container pro:isDocumentContextFor ?arContainerEditor. - ?arContainerEditor pro:withRole pro:editor; - pro:isHeldBy ?raContainerEditor. - OPTIONAL { - ?arContainerEditor oco:hasNext ?nextContainerEditorRole . - } - BIND(STRAFTER(STR(?arContainerEditor), "https://w3id.org/oc/meta/ar/") AS ?containerEditorRoleUri) - BIND(STRAFTER(STR(?nextContainerEditorRole), "https://w3id.org/oc/meta/ar/") AS ?nextContainerEditorRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raContainerEditor), "/ra/")) AS ?container_editor_metaid) - OPTIONAL {?raContainerEditor foaf:familyName ?containerEditorFamilyName.} - OPTIONAL {?raContainerEditor foaf:givenName ?containerEditorGivenName.} - OPTIONAL {?raContainerEditor foaf:name ?container_editor_name.} - OPTIONAL { - ?raContainerEditor datacite:hasIdentifier ?containerEditorIdentifier. - ?containerEditorIdentifier datacite:usesIdentifierScheme ?containerEditorIdSchema; - literal:hasLiteralValue ?containerEditorIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?containerEditorIdSchema), "http://purl.org/spar/datacite/"), ":", ?containerEditorIdLiteralValue) AS ?container_editor_id) - } - BIND( - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0 && STRLEN(STR(?containerEditorGivenName)) > 0, - CONCAT(?containerEditorFamilyName, ", ", ?containerEditorGivenName), - IF( - STRLEN(STR(?containerEditorFamilyName)) > 0, - CONCAT(?containerEditorFamilyName, ","), - ?container_editor_name - ) - ) - AS ?containerEditorName) - BIND( - IF( - STRLEN(STR(?container_editor_id)) > 0, - CONCAT(?containerEditorName, " [", ?container_editor_id, " ", ?container_editor_metaid, "]"), - CONCAT(?containerEditorName, " [", ?container_editor_metaid, "]") - ) - AS ?container_editor_) - BIND(CONCAT(?container_editor_, ":", ?containerEditorRoleUri, ":", COALESCE(?nextContainerEditorRoleUri, "")) AS ?container_editor_info) - } - BIND( - IF(BOUND(?editor_info), - IF(BOUND(?container_editor_info), - CONCAT(?editor_info, "|", ?container_editor_info), - ?editor_info), - IF(BOUND(?container_editor_info), - ?container_editor_info, - "") - ) - AS ?combined_editor_info) - OPTIONAL { - ?res pro:isDocumentContextFor ?arPublisher. - ?arPublisher pro:withRole pro:publisher; - pro:isHeldBy ?raPublisher. - OPTIONAL { - ?arPublisher oco:hasNext ?nextPublisherRole . - } - BIND(STRAFTER(STR(?arPublisher), "https://w3id.org/oc/meta/ar/") AS ?publisherRoleUri) - BIND(STRAFTER(STR(?nextPublisherRole), "https://w3id.org/oc/meta/ar/") AS ?nextPublisherRoleUri) - BIND(CONCAT("omid:ra/", STRAFTER(STR(?raPublisher), "/ra/")) AS ?publisher_metaid) - ?raPublisher foaf:name ?publisher_name. - OPTIONAL { - ?raPublisher datacite:hasIdentifier ?publisherIdentifier__. - ?publisherIdentifier__ datacite:usesIdentifierScheme ?publisherIdSchema; - literal:hasLiteralValue ?publisherIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?publisherIdSchema), "http://purl.org/spar/datacite/"), ":", ?publisherIdLiteralValue) AS ?publisher_id) - } - BIND( - IF( - STRLEN(STR(?publisher_id)) > 0, - CONCAT(?publisher_name, " [", ?publisher_id, " ", ?publisher_metaid, "]"), - CONCAT(?publisher_name, " [", ?publisher_metaid, "]") - ) - AS ?publisher_) - BIND(CONCAT(?publisher_, ":", ?publisherRoleUri, ":", COALESCE(?nextPublisherRoleUri, "")) AS ?publisher_info) - } - OPTIONAL { - { - ?res a fabio:JournalArticle; - frbr:partOf+ ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - ?journal a fabio:Journal. - } UNION { - ?res frbr:partOf ?journal. - BIND(CONCAT("omid:br/", STRAFTER(STR(?journal), "/br/")) AS ?venueMetaid) - } - ?journal dcterm:title ?venueName. - OPTIONAL { - ?journal datacite:hasIdentifier ?journalIdentifier__. - ?journalIdentifier__ datacite:usesIdentifierScheme ?journalIdScheme; - literal:hasLiteralValue ?journalIdLiteralValue. - BIND(CONCAT(STRAFTER(STR(?journalIdScheme), "http://purl.org/spar/datacite/"), ":", ?journalIdLiteralValue) AS ?venue_ids_) - } - } - OPTIONAL {?res a ?type. FILTER (?type != fabio:Expression)} - OPTIONAL {?res dcterm:title ?title.} - OPTIONAL {?res prism:publicationDate ?pub_date.} - OPTIONAL { - ?res frbr:embodiment ?re. - ?re prism:startingPage ?startingPage; - prism:endingPage ?endingPage. - BIND(IF(STR(?startingPage) = STR(?endingPage), STR(?startingPage), CONCAT(?startingPage, '-', ?endingPage)) AS ?page) - } - OPTIONAL { - ?res frbr:partOf ?resIssue. - ?resIssue a fabio:JournalIssue; - fabio:hasSequenceIdentifier ?issue. - } - OPTIONAL { - ?res frbr:partOf+ ?resVolume. - ?resVolume a fabio:JournalVolume; - fabio:hasSequenceIdentifier ?volume. - } - } GROUP BY ?res ?title ?author_info ?combined_editor_info ?publisher_info ?type ?issue ?volume ?pub_date ?page ?venueName ?venueMetaid - } - BIND(CONCAT(?ids, IF(STR(?ids) != "", " ", ""), "omid:br/", STRAFTER(STR(?res), "/br/")) AS ?id) + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:author; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX frbr: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?editor) +WHERE { + OPTIONAL { ?res frbr:partOf ?container } + VALUES ?of_container { false true } + BIND(IF(?of_container, COALESCE(?container, ), ?res) AS ?context) + ?context pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:editor; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) + BIND( + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") + ) + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res + +@@join ?res ?res type=left +@@values ?res +PREFIX datacite: +PREFIX foaf: +PREFIX literal: +PREFIX oco: +PREFIX pro: + +SELECT ?res (GROUP_CONCAT(DISTINCT ?agent_info; SEPARATOR="|") AS ?publisher) +WHERE { + ?res pro:isDocumentContextFor ?agent_role. + ?agent_role pro:withRole pro:publisher; + pro:isHeldBy ?agent. + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + OPTIONAL { ?agent foaf:familyName ?family_name } + OPTIONAL { ?agent foaf:givenName ?given_name } + OPTIONAL { ?agent foaf:name ?name } + OPTIONAL { ?agent datacite:hasIdentifier ?agent_identifier } + BIND(COALESCE(?agent_identifier, ) AS ?agent_identifier_node) + OPTIONAL { ?agent_identifier_node datacite:usesIdentifierScheme ?agent_scheme } + OPTIONAL { ?agent_identifier_node literal:hasLiteralValue ?agent_literal_value } + BIND(CONCAT(STRAFTER(STR(?agent_scheme), "http://purl.org/spar/datacite/"), ":", ?agent_literal_value) AS ?agent_id) + BIND(CONCAT("omid:ra/", STRAFTER(STR(?agent), "/ra/")) AS ?agent_omid) + BIND( + IF( + BOUND(?family_name) && BOUND(?given_name), + CONCAT(?family_name, ", ", ?given_name), + IF( + BOUND(?family_name), + CONCAT(?family_name, ","), + ?name + ) + ) + AS ?agent_name) BIND( - IF(BOUND(?venueMetaid), - IF(STR(?venue_ids) != "", - CONCAT(" [", ?venue_ids, " ", ?venueMetaid, "]"), - CONCAT(" [", ?venueMetaid, "]") - ), - "" + IF( + BOUND(?agent_id), + CONCAT(?agent_name, " [", ?agent_id, " ", ?agent_omid, "]"), + CONCAT(?agent_name, " [", ?agent_omid, "]") ) - AS ?venueIdentifiers) - BIND(CONCAT(?venueName, ?venueIdentifiers) AS ?venue) -} GROUP BY ?id ?title ?type ?issue ?volume ?venue ?pub_date ?page + AS ?agent_label) + BIND(CONCAT(?agent_label, ":", STRAFTER(STR(?agent_role), "/ar/"), ":", COALESCE(STRAFTER(STR(?next_agent_role), "/ar/"), "")) AS ?agent_info) +} +GROUP BY ?res diff --git a/src/api/metaapi.py b/src/api/metaapi.py index 3f1d1d9..20ccca5 100644 --- a/src/api/metaapi.py +++ b/src/api/metaapi.py @@ -85,18 +85,10 @@ def generate_id_search(ids: str) -> Tuple[str]: other_values.append( ''' {{ - { - ?identifier literal:hasLiteralValue "''' + ?identifier literal:hasLiteralValue "''' + literal_value - + '''" - } - UNION - { - ?identifier literal:hasLiteralValue "''' - + literal_value - + """"^^ - } - ?identifier datacite:usesIdentifierScheme datacite:""" + + """"; + datacite:usesIdentifierScheme datacite:""" + scheme + """; ^datacite:hasIdentifier ?res. @@ -132,21 +124,13 @@ def generate_ra_search(identifier: str) -> Tuple[str]: else: return ( ''' - { - ?knownPersonIdentifier literal:hasLiteralValue "''' - + literal_value - + '''" - } - UNION - { - ?knownPersonIdentifier literal:hasLiteralValue "''' + ?knownPersonIdentifier literal:hasLiteralValue "''' + literal_value - + """"^^ - } - ?knownPersonIdentifier datacite:usesIdentifierScheme datacite:""" + + """"; + datacite:usesIdentifierScheme datacite:""" + scheme + """; - ^datacite:hasIdentifier ?knownPerson. + ^datacite:hasIdentifier ?knownPerson. ?knownPerson ^pro:isHeldBy ?knownRole. """, ) @@ -158,7 +142,13 @@ def create_metadata_output(results): for result in results[1:]: output_result = list() for i, data in enumerate(result): - if i == header.index("type"): + if i == header.index("id"): + sorted_ids = __sort_ids(data[1]) + output_result.append((sorted_ids, sorted_ids)) + elif i == header.index("venue"): + sorted_venue = __sort_venue_ids(data[1]) + output_result.append((sorted_venue, sorted_venue)) + elif i == header.index("type"): beautiful_type = __postprocess_type(data[1]) output_result.append((data[0], beautiful_type)) elif ( @@ -174,6 +164,18 @@ def create_metadata_output(results): return output_results, True +def __sort_ids(ids: str) -> str: + *external_ids, omid = ids.split(" ") + return " ".join(sorted(external_ids) + [omid]) + + +def __sort_venue_ids(venue: str) -> str: + if not venue: + return venue + name, ids = venue.rsplit(" [", 1) + return f"{name} [{__sort_ids(ids.removesuffix(']'))}]" + + def __postprocess_type(type_uri: str) -> str: if type_uri: type_string = URI_TYPE_DICT[type_uri] diff --git a/src/api/skgif_filters.ocdm.yaml b/src/api/skgif_filters.ocdm.yaml index 6f2f32b..0a70494 100644 --- a/src/api/skgif_filters.ocdm.yaml +++ b/src/api/skgif_filters.ocdm.yaml @@ -3,13 +3,7 @@ # SPDX-License-Identifier: CC0-1.0 identifiers.id: - filter: |- - ?local_identifier datacite:hasIdentifier ?_filter_identifier . - { - ?_filter_identifier literal:hasLiteralValue "{{value}}" . - } UNION { - ?_filter_identifier literal:hasLiteralValue "{{value}}"^^ . - } + filter: '?local_identifier datacite:hasIdentifier [ literal:hasLiteralValue "{{value}}"^^ ] .' identifiers.scheme: filter: "?local_identifier datacite:hasIdentifier [ datacite:usesIdentifierScheme datacite:{{value}} ] ." contributions.by.local_identifier: @@ -17,7 +11,7 @@ contributions.by.local_identifier: cf.search.title: filter: |- ?local_identifier dcterm:title ?title . - ?title bif:contains "'{{value}}'" . + { SELECT DISTINCT ?title WHERE { ?title ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } contributions.by.family_name: filter: |- ?local_identifier pro:isDocumentContextFor [ pro:isHeldBy ?_filter_agent ] . @@ -33,12 +27,7 @@ contributions.by.name: contributions.by.identifiers.id: filter: |- ?local_identifier pro:isDocumentContextFor [ pro:isHeldBy ?_filter_agent ] . - ?_filter_agent datacite:hasIdentifier ?_filter_agent_identifier . - { - ?_filter_agent_identifier literal:hasLiteralValue "{{value}}" . - } UNION { - ?_filter_agent_identifier literal:hasLiteralValue "{{value}}"^^ . - } + ?_filter_agent datacite:hasIdentifier [ literal:hasLiteralValue "{{value}}"^^ ] . contributions.by.identifiers.scheme: filter: |- ?local_identifier pro:isDocumentContextFor [ pro:isHeldBy ?_filter_agent ] . @@ -46,13 +35,7 @@ contributions.by.identifiers.scheme: cf.contributions_orcid: filter: |- ?local_identifier pro:isDocumentContextFor [ pro:isHeldBy ?_filter_agent ] . - ?_filter_agent datacite:hasIdentifier ?_filter_agent_identifier . - ?_filter_agent_identifier datacite:usesIdentifierScheme datacite:orcid . - { - ?_filter_agent_identifier literal:hasLiteralValue "{{value}}" . - } UNION { - ?_filter_agent_identifier literal:hasLiteralValue "{{value}}"^^ . - } + ?_filter_agent datacite:hasIdentifier [ literal:hasLiteralValue "{{value}}"^^ ; datacite:usesIdentifierScheme datacite:orcid ] . product_type: filter: literature: |- @@ -88,14 +71,9 @@ cf.cites_doi: filter_preamble: |- PREFIX datacite: PREFIX literal: - SELECT DISTINCT ?_target WHERE { + SELECT ?_target WHERE { ?_target datacite:hasIdentifier ?_id_node . - ?_id_node datacite:usesIdentifierScheme datacite:doi . - { - ?_id_node literal:hasLiteralValue "{{value}}" . - } UNION { - ?_id_node literal:hasLiteralValue "{{value}}"^^ . - } + ?_id_node datacite:usesIdentifierScheme datacite:doi ; literal:hasLiteralValue "{{value}}"^^ . } @@values ?_target @@join ?_target ?_target type=inner @@ -111,14 +89,9 @@ cf.cited_by_doi: filter_preamble: |- PREFIX datacite: PREFIX literal: - SELECT DISTINCT ?_target WHERE { + SELECT ?_target WHERE { ?_target datacite:hasIdentifier ?_id_node . - ?_id_node datacite:usesIdentifierScheme datacite:doi . - { - ?_id_node literal:hasLiteralValue "{{value}}" . - } UNION { - ?_id_node literal:hasLiteralValue "{{value}}"^^ . - } + ?_id_node datacite:usesIdentifierScheme datacite:doi ; literal:hasLiteralValue "{{value}}"^^ . } @@values ?_target @@join ?_target ?_target type=inner diff --git a/src/api/skgif_filters.organisations.yaml b/src/api/skgif_filters.organisations.yaml index 01af5e9..7ba16ee 100644 --- a/src/api/skgif_filters.organisations.yaml +++ b/src/api/skgif_filters.organisations.yaml @@ -10,5 +10,4 @@ name: filter: "?local_identifier foaf:name '{{value}}'. " cf.search.name: filter: |- - ?local_identifier foaf:name ?name . - ?name bif:contains "'{{value}}'" . + { SELECT DISTINCT ?name WHERE { ?name ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } diff --git a/src/api/skgif_filters.persons.yaml b/src/api/skgif_filters.persons.yaml index 199a8a5..99a252d 100644 --- a/src/api/skgif_filters.persons.yaml +++ b/src/api/skgif_filters.persons.yaml @@ -15,12 +15,12 @@ name: cf.search.family_name: filter: |- ?local_identifier foaf:familyName ?familyName . - ?familyName bif:contains "'{{value}}'" . + { SELECT DISTINCT ?familyName WHERE { ?familyName ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } cf.search.given_name: filter: |- ?local_identifier foaf:givenName ?givenName . - ?givenName bif:contains "'{{value}}'" . + { SELECT DISTINCT ?givenName WHERE { ?givenName ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } cf.search.name: filter: |- ?local_identifier foaf:name ?name . - ?name bif:contains "'{{value}}'" . + { SELECT DISTINCT ?name WHERE { ?name ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } diff --git a/src/api/skgif_filters.venues.yaml b/src/api/skgif_filters.venues.yaml index 470e05d..0898452 100644 --- a/src/api/skgif_filters.venues.yaml +++ b/src/api/skgif_filters.venues.yaml @@ -5,14 +5,16 @@ type: filter: journal: |- - FILTER(?type = "journal") + ?local_identifier a fabio:Journal . conference: |- - FILTER(?type = "conference") + ?local_identifier a fabio:AcademicProceedings . book: |- - FILTER(?type = "book") + VALUES ?_book_type { fabio:Book fabio:ReferenceBook } + ?local_identifier a ?_book_type . repository: "FILTER(false)" other: |- - FILTER(?type = "other") + ?local_identifier a ?_other_type . + FILTER(?_other_type NOT IN (fabio:Expression, fabio:Journal, fabio:AcademicProceedings, fabio:Book, fabio:ReferenceBook)) unknown: "FILTER(false)" identifiers.value: filter: '?local_identifier datacite:hasIdentifier [ literal:hasLiteralValue "{{value}}"^^ ] .' @@ -23,4 +25,4 @@ name: cf.search.name: filter: |- ?local_identifier dcterms:title ?name . - ?name bif:contains "'{{value}}'" . + { SELECT DISTINCT ?name WHERE { ?name ?_word . FILTER STRSTARTS(?_word, "{{value}}") } } diff --git a/src/api/skgif_v1.hf b/src/api/skgif_v1.hf index c4e94a0..c2463b7 100644 --- a/src/api/skgif_v1.hf +++ b/src/api/skgif_v1.hf @@ -7,9 +7,9 @@ #version 1.0.0 #contacts [contact@opencitations.net](mailto:contact@opencitations.net) #license [ISC](https://opensource.org/licenses/ISC) -#endpoint http://virtuoso-service.default.svc.cluster.local:8890/sparql +#endpoint http://meta-qlever-service.default.svc.cluster.local:7011 #method post -#sources meta=http://virtuoso-service.default.svc.cluster.local:8890/sparql;index=http://qlever-service.default.svc.cluster.local:7011 +#sources meta=http://meta-qlever-service.default.svc.cluster.local:7011;index=http://qlever-service.default.svc.cluster.local:7011 #addon ramose.skg_if #disable_params require,filter,sort,format,json @@ -165,13 +165,13 @@ "entity_type": "venue", "local_identifier": "venues/br/062501778099", "identifiers": [ - { - "value": "S4210195326", - "scheme": "openalex" - }, { "value": "2641-3337", "scheme": "issn" + }, + { + "value": "S4210195326", + "scheme": "openalex" } ] } @@ -240,107 +240,172 @@ #sparql PREFIX fabio: PREFIX dcterm: PREFIX prism: -PREFIX frbr: -PREFIX datacite: -PREFIX literal: -SELECT ?local_identifier ?identifier_scheme ?identifier_value - ?title ?product_type - ?manifestation_type_class ?manifestation_type_label ?manifestation_type_label_lang - ?manifestation_type_defined_in - ?manifestation_dates_type ?manifestation_dates_value - ?manifestation_biblio_volume ?manifestation_biblio_issue - ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last - ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier - ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value +SELECT ?local_identifier ?title ?product_type + ?manifestation_dates_type ?manifestation_dates_value ?manifestation_type_class + ?manifestation_type_label ?manifestation_type_label_lang ?manifestation_type_defined_in + ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last ?manifestation_biblio_issue + ?manifestation_biblio_volume ?identifier_scheme ?identifier_value + ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme + ?manifestation_biblio_in_identifier_value ?contribution_by_family_name ?contribution_by_given_name + ?contribution_by_name ?contribution_by_local_identifier ?contribution_role + ?_contribution_key ?_contribution_next_key ?contribution_by_identifier_scheme + ?contribution_by_identifier_value WHERE { - BIND(<[[local_identifier]]> AS ?local_identifier) + VALUES ?local_identifier { <[[local_identifier]]> } ?local_identifier a fabio:Expression . OPTIONAL { ?local_identifier dcterm:title ?title } - OPTIONAL { ?local_identifier a ?manifestation_type_class . FILTER(?manifestation_type_class != fabio:Expression) } - BIND(IF(!BOUND(?manifestation_type_class), "literature", IF(?manifestation_type_class IN (, ), "research data", IF(?manifestation_type_class = , "research software", "literature"))) AS ?product_type) - BIND(IF(BOUND(?manifestation_type_class), LCASE(REPLACE(REPLACE(STR(?manifestation_type_class), "^.*[/#]", ""), "([a-z])([A-Z])", "$1 $2")), "") AS ?manifestation_type_label) - BIND(IF(BOUND(?manifestation_type_class), "en", "") AS ?manifestation_type_label_lang) - BIND(IF(BOUND(?manifestation_type_class), REPLACE(STR(?manifestation_type_class), "[/#][^/#]+$", ""), "") AS ?manifestation_type_defined_in) + OPTIONAL { ?local_identifier prism:publicationDate ?manifestation_dates_value } + BIND(IF(BOUND(?manifestation_dates_value), "publication", ?_unbound) AS ?manifestation_dates_type) OPTIONAL { - ?local_identifier prism:publicationDate ?manifestation_dates_value . - BIND("publication" AS ?manifestation_dates_type) - } - OPTIONAL { - ?local_identifier frbr:embodiment ?resource_embodiment . - ?resource_embodiment prism:startingPage ?manifestation_biblio_pages_first ; - prism:endingPage ?manifestation_biblio_pages_last . - } - OPTIONAL { - ?local_identifier frbr:partOf ?journal_issue . - ?journal_issue a fabio:JournalIssue ; - fabio:hasSequenceIdentifier ?manifestation_biblio_issue . - } - OPTIONAL { - ?local_identifier frbr:partOf+ ?journal_volume . - ?journal_volume a fabio:JournalVolume ; - fabio:hasSequenceIdentifier ?manifestation_biblio_volume . - } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier_node . - ?identifier_node datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } - OPTIONAL { - { - ?local_identifier a fabio:JournalArticle ; - frbr:partOf+ ?venue_resource . - ?venue_resource a fabio:Journal . - } UNION { - ?local_identifier frbr:partOf ?venue_resource . - FILTER NOT EXISTS { ?venue_resource a fabio:JournalIssue } - FILTER NOT EXISTS { ?venue_resource a fabio:JournalVolume } - } - ?venue_resource dcterm:title ?manifestation_biblio_in_name . - BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) - OPTIONAL { - ?venue_resource datacite:hasIdentifier ?venue_identifier_node . - ?venue_identifier_node datacite:usesIdentifierScheme ?venue_identifier_scheme_uri ; - literal:hasLiteralValue ?manifestation_biblio_in_identifier_value . - BIND(STRAFTER(STR(?venue_identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?manifestation_biblio_in_identifier_scheme) - } + VALUES ?_special_type { fabio:DataFile fabio:DataManagementPlan fabio:ComputerProgram } + ?local_identifier a ?_special_type . } + BIND(IF(!BOUND(?_special_type), "literature", IF(?_special_type = fabio:ComputerProgram, "research software", "research data")) AS ?product_type) } +ORDER BY ?local_identifier @@join ?local_identifier ?local_identifier type=left -PREFIX pro: -PREFIX foaf: +PREFIX fabio: + +SELECT ?local_identifier ?manifestation_type_class ?manifestation_type_label ?manifestation_type_label_lang ?manifestation_type_defined_in +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier a ?manifestation_type_class . + FILTER(?manifestation_type_class != fabio:Expression) + BIND(LCASE(REPLACE(REPLACE(STR(?manifestation_type_class), "^.*[/#]", ""), "([a-z])([A-Z])", "$1 $2")) AS ?manifestation_type_label) + BIND("en" AS ?manifestation_type_label_lang) + BIND(REPLACE(STR(?manifestation_type_class), "[/#][^/#]+$", "") AS ?manifestation_type_defined_in) +} +ORDER BY ?local_identifier ?manifestation_type_class + +@@join ?local_identifier ?local_identifier type=left +PREFIX prism: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier frbr:embodiment ?resource_embodiment . + ?resource_embodiment prism:startingPage ?manifestation_biblio_pages_first ; + prism:endingPage ?manifestation_biblio_pages_last . +} + +@@join ?local_identifier ?local_identifier type=left +PREFIX fabio: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_issue +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier frbr:partOf ?journal_issue . + ?journal_issue a fabio:JournalIssue ; + fabio:hasSequenceIdentifier ?manifestation_biblio_issue . +} + +@@join ?local_identifier ?local_identifier type=left +PREFIX fabio: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_volume +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier frbr:partOf+ ?journal_volume . + ?journal_volume a fabio:JournalVolume ; + fabio:hasSequenceIdentifier ?manifestation_biblio_volume . +} + +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier datacite:hasIdentifier ?identifier_node . + ?identifier_node datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value + +@@join ?local_identifier ?local_identifier type=left +PREFIX fabio: +PREFIX dcterm: +PREFIX frbr: + +SELECT DISTINCT ?local_identifier ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier frbr:partOf ?direct_container ; + frbr:partOf+ ?venue_resource . + ?venue_resource dcterm:title ?manifestation_biblio_in_name . + FILTER( + (?venue_resource = ?direct_container + && NOT EXISTS { ?venue_resource a fabio:JournalIssue } + && NOT EXISTS { ?venue_resource a fabio:JournalVolume }) + || (EXISTS { ?local_identifier a fabio:JournalArticle } && EXISTS { ?venue_resource a fabio:Journal }) + ) + BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) +} +ORDER BY ?local_identifier ?manifestation_biblio_in_local_identifier + +@@join ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_local_identifier type=left +PREFIX frbr: PREFIX datacite: PREFIX literal: + +SELECT DISTINCT ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier frbr:partOf+ ?venue_resource . + ?venue_resource datacite:hasIdentifier ?venue_identifier_node . + ?venue_identifier_node datacite:usesIdentifierScheme ?venue_identifier_scheme_uri ; + literal:hasLiteralValue ?manifestation_biblio_in_identifier_value . + BIND(STRAFTER(STR(?venue_identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?manifestation_biblio_in_identifier_scheme) + BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) +} +ORDER BY ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value + +@@join ?local_identifier ?local_identifier type=left +PREFIX pro: +PREFIX foaf: PREFIX oco: SELECT ?local_identifier ?contribution_by_family_name ?contribution_by_given_name - ?contribution_by_name ?contribution_by_identifier_scheme ?contribution_by_identifier_value - ?contribution_by_local_identifier + ?contribution_by_name ?contribution_by_local_identifier ?contribution_role ?_contribution_key ?_contribution_next_key WHERE { - BIND(<[[local_identifier]]> AS ?local_identifier) + VALUES ?local_identifier { <[[local_identifier]]> } ?local_identifier pro:isDocumentContextFor ?agent_role . ?agent_role pro:withRole ?role_type ; pro:isHeldBy ?responsible_agent . - FILTER(?role_type IN (pro:author, pro:editor, pro:publisher)) - BIND(IF(?role_type = pro:author, "author", IF(?role_type = pro:editor, "editor", "publisher")) AS ?contribution_role) + BIND(IF(?role_type = pro:author, "author", IF(?role_type = pro:editor, "editor", IF(?role_type = pro:publisher, "publisher", ?_unbound))) AS ?contribution_role) + FILTER(BOUND(?contribution_role)) BIND(STR(?agent_role) AS ?_contribution_key) - OPTIONAL { - ?agent_role oco:hasNext ?next_agent_role . - BIND(STR(?next_agent_role) AS ?_contribution_next_key) - } + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + BIND(STR(?next_agent_role) AS ?_contribution_next_key) OPTIONAL { ?responsible_agent foaf:familyName ?contribution_by_family_name } OPTIONAL { ?responsible_agent foaf:givenName ?contribution_by_given_name } OPTIONAL { ?responsible_agent foaf:name ?contribution_by_name } BIND(STR(?responsible_agent) AS ?contribution_by_local_identifier) - OPTIONAL { - ?responsible_agent datacite:hasIdentifier ?orcid_node . - ?orcid_node datacite:usesIdentifierScheme datacite:orcid ; - literal:hasLiteralValue ?contribution_by_identifier_value . - BIND("orcid" AS ?contribution_by_identifier_scheme) - } +} + +@@join ?contribution_by_local_identifier ?contribution_by_local_identifier type=left +PREFIX datacite: +PREFIX literal: +PREFIX pro: + +SELECT DISTINCT ?contribution_by_local_identifier ?contribution_by_identifier_scheme ?contribution_by_identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier pro:isDocumentContextFor ?agent_role . + ?agent_role pro:isHeldBy ?responsible_agent . + ?responsible_agent datacite:hasIdentifier ?orcid_node . + ?orcid_node datacite:usesIdentifierScheme datacite:orcid ; + literal:hasLiteralValue ?contribution_by_identifier_value . + BIND("orcid" AS ?contribution_by_identifier_scheme) + BIND(STR(?responsible_agent) AS ?contribution_by_local_identifier) } @@join ?local_identifier ?local_identifier type=left @@ -420,13 +485,13 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te ] }, "identifiers": [ - { - "value": "W4285173206", - "scheme": "openalex" - }, { "value": "10.1007/978-3-031-06981-9_18", "scheme": "doi" + }, + { + "value": "W4285173206", + "scheme": "openalex" } ], "contributions": [ @@ -684,13 +749,13 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te ] }, "identifiers": [ - { - "value": "W3106215946", - "scheme": "openalex" - }, { "value": "10.1162/qss_a_00023", "scheme": "doi" + }, + { + "value": "W3106215946", + "scheme": "openalex" } ], "contributions": [ @@ -764,13 +829,13 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/062501778099", "identifiers": [ - { - "value": "S4210195326", - "scheme": "openalex" - }, { "value": "2641-3337", "scheme": "issn" + }, + { + "value": "S4210195326", + "scheme": "openalex" } ] } @@ -788,13 +853,13 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te ] }, "identifiers": [ - { - "value": "W2938946739", - "scheme": "openalex" - }, { "value": "10.1007/s11192-019-03217-6", "scheme": "doi" + }, + { + "value": "W2938946739", + "scheme": "openalex" } ], "contributions": [ @@ -886,16 +951,16 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ { - "value": "S148561398", - "scheme": "openalex" + "value": "0138-9130", + "scheme": "issn" }, { "value": "1588-2861", "scheme": "issn" }, { - "value": "0138-9130", - "scheme": "issn" + "value": "S148561398", + "scheme": "openalex" } ] } @@ -1181,11 +1246,11 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ { - "value": "1588-2861", + "value": "0138-9130", "scheme": "issn" }, { - "value": "0138-9130", + "value": "1588-2861", "scheme": "issn" }, { @@ -1286,16 +1351,16 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te "local_identifier": "https://w3id.org/oc/meta/br/06160781188", "identifiers": [ { - "value": "S110615584", - "scheme": "openalex" + "value": "1432-1300", + "scheme": "issn" }, { "value": "1432-5012", "scheme": "issn" }, { - "value": "1432-1300", - "scheme": "issn" + "value": "S110615584", + "scheme": "openalex" } ] } @@ -1331,109 +1396,180 @@ ORDER BY ?local_identifier PREFIX fabio: PREFIX dcterm: PREFIX prism: -PREFIX frbr: -PREFIX datacite: -PREFIX literal: -PREFIX pro: -PREFIX foaf: -SELECT ?local_identifier ?identifier_scheme ?identifier_value - ?title ?product_type - ?manifestation_type_class ?manifestation_type_label ?manifestation_type_label_lang - ?manifestation_type_defined_in - ?manifestation_dates_type ?manifestation_dates_value - ?manifestation_biblio_volume ?manifestation_biblio_issue - ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last - ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier - ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value +SELECT ?local_identifier ?title ?product_type + ?manifestation_dates_type ?manifestation_dates_value ?manifestation_type_class + ?manifestation_type_label ?manifestation_type_label_lang ?manifestation_type_defined_in + ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last ?manifestation_biblio_issue + ?manifestation_biblio_volume ?identifier_scheme ?identifier_value + ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme + ?manifestation_biblio_in_identifier_value ?contribution_by_family_name ?contribution_by_given_name + ?contribution_by_name ?contribution_by_local_identifier ?contribution_role + ?_contribution_key ?_contribution_next_key ?contribution_by_identifier_scheme + ?contribution_by_identifier_value WHERE { ?local_identifier a fabio:Expression . - OPTIONAL { ?local_identifier dcterm:title ?title . } - OPTIONAL { ?local_identifier a ?manifestation_type_class . FILTER(?manifestation_type_class != fabio:Expression) } - BIND(IF(!BOUND(?manifestation_type_class), "literature", IF(?manifestation_type_class IN (, ), "research data", IF(?manifestation_type_class = , "research software", "literature"))) AS ?product_type) - BIND(IF(BOUND(?manifestation_type_class), LCASE(REPLACE(REPLACE(STR(?manifestation_type_class), "^.*[/#]", ""), "([a-z])([A-Z])", "$1 $2")), "") AS ?manifestation_type_label) - BIND(IF(BOUND(?manifestation_type_class), "en", "") AS ?manifestation_type_label_lang) - BIND(IF(BOUND(?manifestation_type_class), REPLACE(STR(?manifestation_type_class), "[/#][^/#]+$", ""), "") AS ?manifestation_type_defined_in) - OPTIONAL { - ?local_identifier prism:publicationDate ?manifestation_dates_value . - BIND("publication" AS ?manifestation_dates_type) - } - OPTIONAL { - ?local_identifier frbr:embodiment ?resource_embodiment . - ?resource_embodiment prism:startingPage ?manifestation_biblio_pages_first ; - prism:endingPage ?manifestation_biblio_pages_last . - } - OPTIONAL { - ?local_identifier frbr:partOf ?journal_issue . - ?journal_issue a fabio:JournalIssue ; - fabio:hasSequenceIdentifier ?manifestation_biblio_issue . - } - OPTIONAL { - ?local_identifier frbr:partOf+ ?journal_volume . - ?journal_volume a fabio:JournalVolume ; - fabio:hasSequenceIdentifier ?manifestation_biblio_volume . - } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier_node . - ?identifier_node datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } + OPTIONAL { ?local_identifier dcterm:title ?title } + OPTIONAL { ?local_identifier prism:publicationDate ?manifestation_dates_value } + BIND(IF(BOUND(?manifestation_dates_value), "publication", ?_unbound) AS ?manifestation_dates_type) OPTIONAL { - { - ?local_identifier a fabio:JournalArticle ; - frbr:partOf+ ?venue_resource . - ?venue_resource a fabio:Journal . - } UNION { - ?local_identifier frbr:partOf ?venue_resource . - FILTER NOT EXISTS { ?venue_resource a fabio:JournalIssue } - FILTER NOT EXISTS { ?venue_resource a fabio:JournalVolume } - } - ?venue_resource dcterm:title ?manifestation_biblio_in_name . - BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) - OPTIONAL { - ?venue_resource datacite:hasIdentifier ?venue_identifier_node . - ?venue_identifier_node datacite:usesIdentifierScheme ?venue_identifier_scheme_uri ; - literal:hasLiteralValue ?manifestation_biblio_in_identifier_value . - BIND(STRAFTER(STR(?venue_identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?manifestation_biblio_in_identifier_scheme) - } + VALUES ?_special_type { fabio:DataFile fabio:DataManagementPlan fabio:ComputerProgram } + ?local_identifier a ?_special_type . } + BIND(IF(!BOUND(?_special_type), "literature", IF(?_special_type = fabio:ComputerProgram, "research software", "research data")) AS ?product_type) } ORDER BY ?local_identifier @@values ?local_identifier @@join ?local_identifier ?local_identifier type=left -PREFIX pro: -PREFIX foaf: +@@with source=meta +PREFIX fabio: + +SELECT ?local_identifier ?manifestation_type_class ?manifestation_type_label ?manifestation_type_label_lang ?manifestation_type_defined_in +WHERE { + ?local_identifier a ?manifestation_type_class . + FILTER(?manifestation_type_class != fabio:Expression) + BIND(LCASE(REPLACE(REPLACE(STR(?manifestation_type_class), "^.*[/#]", ""), "([a-z])([A-Z])", "$1 $2")) AS ?manifestation_type_label) + BIND("en" AS ?manifestation_type_label_lang) + BIND(REPLACE(STR(?manifestation_type_class), "[/#][^/#]+$", "") AS ?manifestation_type_defined_in) +} +ORDER BY ?local_identifier ?manifestation_type_class + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX prism: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_pages_first ?manifestation_biblio_pages_last +WHERE { + ?local_identifier frbr:embodiment ?resource_embodiment . + ?resource_embodiment prism:startingPage ?manifestation_biblio_pages_first ; + prism:endingPage ?manifestation_biblio_pages_last . +} + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX fabio: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_issue +WHERE { + ?local_identifier frbr:partOf ?journal_issue . + ?journal_issue a fabio:JournalIssue ; + fabio:hasSequenceIdentifier ?manifestation_biblio_issue . +} + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX fabio: +PREFIX frbr: + +SELECT ?local_identifier ?manifestation_biblio_volume +WHERE { + ?local_identifier frbr:partOf+ ?journal_volume . + ?journal_volume a fabio:JournalVolume ; + fabio:hasSequenceIdentifier ?manifestation_biblio_volume . +} + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + ?local_identifier datacite:hasIdentifier ?identifier_node . + ?identifier_node datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX fabio: +PREFIX dcterm: +PREFIX frbr: + +SELECT DISTINCT ?local_identifier ?manifestation_biblio_in_name ?manifestation_biblio_in_local_identifier +WHERE { + ?local_identifier frbr:partOf ?direct_container ; + frbr:partOf+ ?venue_resource . + ?venue_resource dcterm:title ?manifestation_biblio_in_name . + FILTER( + (?venue_resource = ?direct_container + && NOT EXISTS { ?venue_resource a fabio:JournalIssue } + && NOT EXISTS { ?venue_resource a fabio:JournalVolume }) + || (EXISTS { ?local_identifier a fabio:JournalArticle } && EXISTS { ?venue_resource a fabio:Journal }) + ) + BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) +} +ORDER BY ?local_identifier ?manifestation_biblio_in_local_identifier + +@@values ?local_identifier +@@join ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_local_identifier type=left +@@with source=meta +PREFIX frbr: PREFIX datacite: PREFIX literal: + +SELECT DISTINCT ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value +WHERE { + ?local_identifier frbr:partOf+ ?venue_resource . + ?venue_resource datacite:hasIdentifier ?venue_identifier_node . + ?venue_identifier_node datacite:usesIdentifierScheme ?venue_identifier_scheme_uri ; + literal:hasLiteralValue ?manifestation_biblio_in_identifier_value . + BIND(STRAFTER(STR(?venue_identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?manifestation_biblio_in_identifier_scheme) + BIND(STR(?venue_resource) AS ?manifestation_biblio_in_local_identifier) +} +ORDER BY ?manifestation_biblio_in_local_identifier ?manifestation_biblio_in_identifier_scheme ?manifestation_biblio_in_identifier_value + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +@@with source=meta +PREFIX pro: +PREFIX foaf: PREFIX oco: SELECT ?local_identifier ?contribution_by_family_name ?contribution_by_given_name - ?contribution_by_name ?contribution_by_identifier_scheme ?contribution_by_identifier_value - ?contribution_by_local_identifier + ?contribution_by_name ?contribution_by_local_identifier ?contribution_role ?_contribution_key ?_contribution_next_key WHERE { ?local_identifier pro:isDocumentContextFor ?agent_role . ?agent_role pro:withRole ?role_type ; pro:isHeldBy ?responsible_agent . - FILTER(?role_type IN (pro:author, pro:editor, pro:publisher)) - BIND(IF(?role_type = pro:author, "author", IF(?role_type = pro:editor, "editor", "publisher")) AS ?contribution_role) + BIND(IF(?role_type = pro:author, "author", IF(?role_type = pro:editor, "editor", IF(?role_type = pro:publisher, "publisher", ?_unbound))) AS ?contribution_role) + FILTER(BOUND(?contribution_role)) BIND(STR(?agent_role) AS ?_contribution_key) - OPTIONAL { - ?agent_role oco:hasNext ?next_agent_role . - BIND(STR(?next_agent_role) AS ?_contribution_next_key) - } + OPTIONAL { ?agent_role oco:hasNext ?next_agent_role } + BIND(STR(?next_agent_role) AS ?_contribution_next_key) OPTIONAL { ?responsible_agent foaf:familyName ?contribution_by_family_name } OPTIONAL { ?responsible_agent foaf:givenName ?contribution_by_given_name } OPTIONAL { ?responsible_agent foaf:name ?contribution_by_name } BIND(STR(?responsible_agent) AS ?contribution_by_local_identifier) - OPTIONAL { - ?responsible_agent datacite:hasIdentifier ?orcid_node . - ?orcid_node datacite:usesIdentifierScheme datacite:orcid ; - literal:hasLiteralValue ?contribution_by_identifier_value . - BIND("orcid" AS ?contribution_by_identifier_scheme) - } +} + +@@values ?local_identifier +@@join ?contribution_by_local_identifier ?contribution_by_local_identifier type=left +@@with source=meta +PREFIX datacite: +PREFIX literal: +PREFIX pro: + +SELECT DISTINCT ?contribution_by_local_identifier ?contribution_by_identifier_scheme ?contribution_by_identifier_value +WHERE { + ?local_identifier pro:isDocumentContextFor ?agent_role . + ?agent_role pro:isHeldBy ?responsible_agent . + ?responsible_agent datacite:hasIdentifier ?orcid_node . + ?orcid_node datacite:usesIdentifierScheme datacite:orcid ; + literal:hasLiteralValue ?contribution_by_identifier_value . + BIND("orcid" AS ?contribution_by_identifier_scheme) + BIND(STR(?responsible_agent) AS ?contribution_by_local_identifier) } @@values ?local_identifier @@ -1481,25 +1617,33 @@ WHERE { } #format skg_if,to_skg_if,application/json #default_format skg_if -#sparql PREFIX datacite: -PREFIX literal: -PREFIX foaf: +#sparql PREFIX foaf: -SELECT ?local_identifier ?name ?family_name ?given_name ?identifier_scheme ?identifier_value +SELECT ?local_identifier ?name ?family_name + ?given_name ?identifier_scheme ?identifier_value WHERE { - BIND(<[[local_identifier]]> AS ?local_identifier) - ?local_identifier a foaf:Agent. - OPTIONAL { ?local_identifier foaf:familyName ?family_name . } - OPTIONAL { ?local_identifier foaf:givenName ?given_name . } - OPTIONAL { ?local_identifier foaf:name ?name. } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri; - literal:hasLiteralValue ?identifier_value. - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier a foaf:Agent . + OPTIONAL { ?local_identifier foaf:familyName ?family_name } + OPTIONAL { ?local_identifier foaf:givenName ?given_name } + OPTIONAL { ?local_identifier foaf:name ?name } FILTER(BOUND(?family_name) || BOUND(?given_name)) } +ORDER BY ?local_identifier + +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value #url /persons #type operation @@ -1558,29 +1702,49 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te } ] } -#sparql PREFIX datacite: +#sparql @@values ?local_identifier +PREFIX datacite: PREFIX literal: PREFIX foaf: -SELECT ?local_identifier ?name ?family_name ?given_name ?identifier_scheme ?identifier_value +SELECT DISTINCT ?local_identifier WHERE { - ?local_identifier a foaf:Agent. - OPTIONAL { ?local_identifier foaf:familyName ?family_name . } - OPTIONAL { ?local_identifier foaf:givenName ?given_name . } - OPTIONAL { ?local_identifier foaf:name ?name. } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri; - literal:hasLiteralValue ?identifier_value. - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } - FILTER(BOUND(?family_name) || BOUND(?given_name)) + ?local_identifier a foaf:Agent . + { ?local_identifier foaf:familyName ?family_name } UNION { ?local_identifier foaf:givenName ?given_name } [[filter]] } ORDER BY ?local_identifier @@page ?local_identifier default_size=10 max_size=100 +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX foaf: + +SELECT ?local_identifier ?name ?family_name + ?given_name ?identifier_scheme ?identifier_value +WHERE { + ?local_identifier a foaf:Agent . + OPTIONAL { ?local_identifier foaf:familyName ?family_name } + OPTIONAL { ?local_identifier foaf:givenName ?given_name } + OPTIONAL { ?local_identifier foaf:name ?name } +} +ORDER BY ?local_identifier + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value + #url /organisations/{local_identifier} #type operation #local_identifier str(https:/{1,2}w3id\.org/oc/meta/.+) @@ -1612,24 +1776,32 @@ ORDER BY ?local_identifier } ] } -#sparql PREFIX datacite: -PREFIX literal: -PREFIX foaf: -SELECT ?local_identifier ?name ?identifier_scheme ?identifier_value +#sparql PREFIX foaf: + +SELECT ?local_identifier ?name ?identifier_scheme + ?identifier_value WHERE { - BIND(<[[local_identifier]]> AS ?local_identifier) + VALUES ?local_identifier { <[[local_identifier]]> } ?local_identifier a foaf:Agent ; foaf:name ?name . - FILTER NOT EXISTS { ?local_identifier foaf:givenName ?givenName . } - FILTER NOT EXISTS { ?local_identifier foaf:familyName ?familyName . } + FILTER NOT EXISTS { ?local_identifier foaf:givenName ?given_name } + FILTER NOT EXISTS { ?local_identifier foaf:familyName ?family_name } +} +ORDER BY ?local_identifier - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) } +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value #url /organisations #type operation @@ -1682,28 +1854,51 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te } ] } -#sparql PREFIX datacite: +#sparql @@values ?local_identifier +PREFIX datacite: PREFIX literal: PREFIX foaf: -SELECT ?local_identifier ?name ?identifier_scheme ?identifier_value + +SELECT DISTINCT ?local_identifier WHERE { ?local_identifier a foaf:Agent ; foaf:name ?name . - FILTER NOT EXISTS { ?local_identifier foaf:givenName ?givenName . } - FILTER NOT EXISTS { ?local_identifier foaf:familyName ?familyName . } - - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } + FILTER NOT EXISTS { ?local_identifier foaf:givenName ?givenName } + FILTER NOT EXISTS { ?local_identifier foaf:familyName ?familyName } [[filter]] } ORDER BY ?local_identifier @@page ?local_identifier default_size=10 max_size=100 +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX foaf: + +SELECT ?local_identifier ?name ?identifier_scheme + ?identifier_value +WHERE { + ?local_identifier a foaf:Agent ; + foaf:name ?name . + FILTER NOT EXISTS { ?local_identifier foaf:givenName ?given_name } + FILTER NOT EXISTS { ?local_identifier foaf:familyName ?family_name } +} +ORDER BY ?local_identifier + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value + #url /venues/{local_identifier} #type operation #local_identifier str(https:/{1,2}w3id\.org/oc/meta/.+) @@ -1740,35 +1935,40 @@ ORDER BY ?local_identifier } ] } -#sparql PREFIX datacite: +#sparql PREFIX fabio: PREFIX dcterms: -PREFIX literal: PREFIX frbr: -PREFIX fabio: -SELECT ?local_identifier ?name ?identifier_scheme ?identifier_value ?type +SELECT ?local_identifier ?name ?type + ?identifier_scheme ?identifier_value WHERE { - BIND(<[[local_identifier]]> AS ?local_identifier) - ?br frbr:partOf+ ?local_identifier . - FILTER NOT EXISTS { ?local_identifier frbr:partOf ?parent. } + VALUES ?local_identifier { <[[local_identifier]]> } + FILTER EXISTS { ?br frbr:partOf ?local_identifier } + FILTER NOT EXISTS { ?local_identifier frbr:partOf ?parent } ?local_identifier a ?type_uri . FILTER(?type_uri != fabio:Expression) - OPTIONAL { - ?local_identifier dcterms:title ?name . - } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } + OPTIONAL { ?local_identifier dcterms:title ?name } BIND( - IF(!BOUND(?type_uri), "unknown", IF(?type_uri = fabio:Journal, "journal", IF(?type_uri = fabio:AcademicProceedings, "conference", IF(?type_uri = fabio:Book || ?type_uri = fabio:ReferenceBook, "book", "other"))) - ) AS ?type) + AS ?type) +} +ORDER BY ?local_identifier ?type + +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + VALUES ?local_identifier { <[[local_identifier]]> } + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) } +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value #url /venues #type operation @@ -1827,38 +2027,60 @@ Filters in the first group use exact matching. For `cf.search.*`, matching is te } ] } -#sparql PREFIX datacite: -PREFIX dcterms: +#sparql @@values ?local_identifier +PREFIX datacite: PREFIX literal: +PREFIX dcterms: PREFIX frbr: PREFIX fabio: -SELECT ?local_identifier ?name ?identifier_scheme ?identifier_value ?type +SELECT DISTINCT ?local_identifier WHERE { - ?br frbr:partOf+ ?local_identifier . - FILTER NOT EXISTS { ?local_identifier frbr:partOf ?parent. } + FILTER EXISTS { ?br frbr:partOf ?local_identifier } + FILTER NOT EXISTS { ?local_identifier frbr:partOf ?parent } ?local_identifier a ?type_uri . FILTER(?type_uri != fabio:Expression) - OPTIONAL { - ?local_identifier dcterms:title ?name . - } - OPTIONAL { - ?local_identifier datacite:hasIdentifier ?identifier . - ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; - literal:hasLiteralValue ?identifier_value . - BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) - } + [[filter]] +} +ORDER BY ?local_identifier + +@@page ?local_identifier default_size=10 max_size=100 + +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX fabio: +PREFIX dcterms: +PREFIX frbr: + +SELECT ?local_identifier ?name ?type + ?identifier_scheme ?identifier_value +WHERE { + FILTER EXISTS { ?br frbr:partOf ?local_identifier } + FILTER NOT EXISTS { ?local_identifier frbr:partOf ?parent } + ?local_identifier a ?type_uri . + FILTER(?type_uri != fabio:Expression) + OPTIONAL { ?local_identifier dcterms:title ?name } BIND( - IF(!BOUND(?type_uri), "unknown", IF(?type_uri = fabio:Journal, "journal", IF(?type_uri = fabio:AcademicProceedings, "conference", IF(?type_uri = fabio:Book || ?type_uri = fabio:ReferenceBook, "book", "other"))) - ) AS ?type) - [[filter]] + AS ?type) } -ORDER BY ?local_identifier +ORDER BY ?local_identifier ?type -@@page ?local_identifier default_size=10 max_size=100 +@@values ?local_identifier +@@join ?local_identifier ?local_identifier type=left +PREFIX datacite: +PREFIX literal: + +SELECT ?local_identifier ?identifier_scheme ?identifier_value +WHERE { + ?local_identifier datacite:hasIdentifier ?identifier . + ?identifier datacite:usesIdentifierScheme ?identifier_scheme_uri ; + literal:hasLiteralValue ?identifier_value . + BIND(STRAFTER(STR(?identifier_scheme_uri), "http://purl.org/spar/datacite/") AS ?identifier_scheme) +} +ORDER BY ?local_identifier ?identifier_scheme ?identifier_value #url /grants/{local_identifier} #type operation diff --git a/test/conftest.py b/test/conftest.py index 2a9746f..59ba7a9 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,5 +1,4 @@ import os -import shutil import subprocess import tempfile import time @@ -9,23 +8,15 @@ from ramose import APIManager, Operation -# v0.5.45 -QLEVER_IMAGE = "adfreiburg/qlever@sha256:4672a53f0ff4e55ac921d25832a21ec0bb3ca08f54d7c1950d04ebf6af7b8c21" +# v0.6.0 +QLEVER_IMAGE = "adfreiburg/qlever@sha256:37d5ede193f1bffb6aebf734d15d2a4c2a3228ee102858b0c6c2e65c149a78ec" QLEVER_CONTAINER = "oc-api-test-qlever" QLEVER_PORT = 7011 -INDEX_NAME = "oc-index-test" +INDEX_NAME = "oc-test" DOCKER_USER = f"{os.getuid()}:{os.getgid()}" -# v7.2.16 -VIRTUOSO_IMAGE = "openlink/virtuoso-opensource-7@sha256:e7a5cd1915569d70d8363503dc62f6bf818b485f1501b230c7608cde8528c72d" -VIRTUOSO_CONTAINER = "oc-api-test-virtuoso" -VIRTUOSO_HTTP_PORT = 8893 -VIRTUOSO_ISQL_PORT = 1112 - TEST_DIR = os.path.dirname(os.path.abspath(__file__)) -QLEVER_DATA_DIR = os.path.join(TEST_DIR, "qlever-index-data") -VIRTUOSO_DATA_DIR = os.path.join(TEST_DIR, "virtuoso-meta-data") -VIRTUOSO_DB_DIR = os.path.join(VIRTUOSO_DATA_DIR, "database") +QLEVER_DATA_DIR = os.path.join(TEST_DIR, "qlever-data") def _wait_for_http(port: int, timeout: int = 60) -> None: @@ -41,41 +32,6 @@ def _wait_for_http(port: int, timeout: int = 60) -> None: raise TimeoutError(f"Service did not become ready on port {port} within {timeout}s") -def _wait_for_virtuoso(container: str, timeout: int = 60) -> None: - deadline = time.monotonic() + timeout - while time.monotonic() < deadline: - result = subprocess.run( - [ - "docker", - "exec", - container, - "isql", - "1111", - "dba", - "dba", - "exec=SELECT 1;", - ], - capture_output=True, - ) - if result.returncode == 0: - return - time.sleep(1) - raise TimeoutError(f"Virtuoso did not become ready within {timeout}s") - - -def _enable_virtuoso_rdf_freetext(container: str) -> None: - commands = ( - "DB.DBA.RDF_OBJ_FT_RULE_ADD(null, null, 'All');" - "DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ();" - "checkpoint;" - ) - subprocess.run( - ["docker", "exec", container, "isql", "1111", "dba", "dba", f"exec={commands}"], - check=True, - capture_output=True, - ) - - @pytest.fixture(scope="session") def qlever_endpoint(): subprocess.run(["docker", "rm", "-f", QLEVER_CONTAINER], capture_output=True) @@ -99,7 +55,7 @@ def qlever_endpoint(): "--init", QLEVER_IMAGE, "-c", - f"qlever-server -i {INDEX_NAME} -j 4 -p {QLEVER_PORT} -m 1G -c 500M -e 500M -k 50 -s 30s", + f"qlever-server -i {INDEX_NAME} -j 4 -p {QLEVER_PORT} -m 1G -c 500M -e 500M -k 50 -s 30s --no-metrics-log --no-resource-usage-log", ], check=True, capture_output=True, @@ -111,50 +67,13 @@ def qlever_endpoint(): @pytest.fixture(scope="session") -def virtuoso_endpoint(): - with tempfile.TemporaryDirectory() as temp_dir: - database_dir = os.path.join(temp_dir, "database") - os.mkdir(database_dir) - for entry in os.scandir(VIRTUOSO_DB_DIR): - if entry.is_file() and entry.name != "virtuoso.log": - shutil.copy2(entry.path, database_dir) - - subprocess.run(["docker", "rm", "-f", VIRTUOSO_CONTAINER], capture_output=True) - subprocess.run( - [ - "docker", - "run", - "-d", - "--name", - VIRTUOSO_CONTAINER, - "-p", - f"{VIRTUOSO_HTTP_PORT}:8890", - "-p", - f"{VIRTUOSO_ISQL_PORT}:1111", - "-e", - "DBA_PASSWORD=dba", - "-v", - f"{database_dir}:/opt/virtuoso-opensource/database", - VIRTUOSO_IMAGE, - ], - check=True, - capture_output=True, - ) - _wait_for_virtuoso(VIRTUOSO_CONTAINER) - _enable_virtuoso_rdf_freetext(VIRTUOSO_CONTAINER) - yield f"http://127.0.0.1:{VIRTUOSO_HTTP_PORT}/sparql" - subprocess.run(["docker", "stop", VIRTUOSO_CONTAINER], capture_output=True) - subprocess.run(["docker", "rm", "-f", VIRTUOSO_CONTAINER], capture_output=True) - - -@pytest.fixture(scope="session") -def skgif_api_manager(virtuoso_endpoint, qlever_endpoint): +def skgif_api_manager(qlever_endpoint): manager = APIManager( [os.path.join(TEST_DIR, "..", "src", "api", "skgif_v1.hf")], - endpoint_override=virtuoso_endpoint, + endpoint_override=qlever_endpoint, ) for config in manager.all_conf.values(): - config["sources_map"] = {"meta": virtuoso_endpoint, "index": qlever_endpoint} + config["sources_map"] = {"meta": qlever_endpoint, "index": qlever_endpoint} return manager @@ -181,11 +100,7 @@ def execute_operation(api_manager: APIManager, operation_url: str) -> str: return response.body -def create_api_manager( - config_path: str, - replacements: dict[str, str], - env_vars: dict[str, str] | None = None, -) -> APIManager: +def create_api_manager(config_path: str, replacements: dict[str, str]) -> APIManager: full_config_path = os.path.join(TEST_DIR, "..", config_path) with open(full_config_path, "r", encoding="utf8") as f: @@ -194,10 +109,6 @@ def create_api_manager( for old, new in replacements.items(): config_content = config_content.replace(old, new) - if env_vars: - for key, value in env_vars.items(): - os.environ[key] = value - tmp_file = tempfile.NamedTemporaryFile( mode="w", suffix=".hf", delete=False, dir=TEST_DIR ) diff --git a/test/data/expected_search_products.json b/test/data/expected_search_products.json index cb4e36b..e951a50 100644 --- a/test/data/expected_search_products.json +++ b/test/data/expected_search_products.json @@ -68,10 +68,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -87,16 +87,16 @@ "local_identifier": "https://w3id.org/oc/meta/br/06160781188", "identifiers": [ { - "value": "S110615584", - "scheme": "openalex" + "value": "1432-1300", + "scheme": "issn" }, { "value": "1432-5012", "scheme": "issn" }, { - "value": "1432-1300", - "scheme": "issn" + "value": "S110615584", + "scheme": "openalex" } ] } @@ -119,13 +119,13 @@ ] }, "identifiers": [ - { - "value": "W2938946739", - "scheme": "openalex" - }, { "value": "10.1007/s11192-019-03217-6", "scheme": "doi" + }, + { + "value": "W2938946739", + "scheme": "openalex" } ], "contributions": [ @@ -194,10 +194,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -216,6 +216,10 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ + { + "value": "0138-9130", + "scheme": "issn" + }, { "value": "1588-2861", "scheme": "issn" @@ -223,10 +227,6 @@ { "value": "S148561398", "scheme": "openalex" - }, - { - "value": "0138-9130", - "scheme": "issn" } ] } @@ -349,10 +349,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -444,13 +444,13 @@ ] }, "identifiers": [ - { - "value": "W3106215946", - "scheme": "openalex" - }, { "value": "10.1162/qss_a_00023", "scheme": "doi" + }, + { + "value": "W3106215946", + "scheme": "openalex" } ], "contributions": [ @@ -502,10 +502,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -524,13 +524,13 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/062501778099", "identifiers": [ - { - "value": "S4210195326", - "scheme": "openalex" - }, { "value": "2641-3337", "scheme": "issn" + }, + { + "value": "S4210195326", + "scheme": "openalex" } ] } @@ -636,10 +636,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -653,11 +653,11 @@ "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ { - "value": "1588-2861", + "value": "0138-9130", "scheme": "issn" }, { - "value": "0138-9130", + "value": "1588-2861", "scheme": "issn" }, { @@ -685,13 +685,13 @@ ] }, "identifiers": [ - { - "value": "W4285173206", - "scheme": "openalex" - }, { "value": "10.1007/978-3-031-06981-9_18", "scheme": "doi" + }, + { + "value": "W4285173206", + "scheme": "openalex" } ], "contributions": [ @@ -754,10 +754,10 @@ { "type": { "class": "http://purl.org/spar/fabio/BookChapter", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book chapter" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -775,11 +775,11 @@ "local_identifier": "https://w3id.org/oc/meta/br/06401297735", "identifiers": [ { - "value": "9783031069819", + "value": "9783031069802", "scheme": "isbn" }, { - "value": "9783031069802", + "value": "9783031069819", "scheme": "isbn" } ] @@ -920,10 +920,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -971,13 +971,13 @@ "value": "9783319580678", "scheme": "isbn" }, - { - "value": "W3115553721", - "scheme": "openalex" - }, { "value": "9783319580685", "scheme": "isbn" + }, + { + "value": "W3115553721", + "scheme": "openalex" } ], "contributions": [ @@ -1061,10 +1061,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1078,19 +1078,19 @@ "local_identifier": "https://w3id.org/oc/meta/br/069066063", "identifiers": [ { - "value": "1864-3035", + "value": "0302-9743", "scheme": "issn" }, { - "value": "1861-2067", + "value": "1611-3349", "scheme": "issn" }, { - "value": "1867-7754", + "value": "1861-2032", "scheme": "issn" }, { - "value": "1611-3349", + "value": "1861-2040", "scheme": "issn" }, { @@ -1098,15 +1098,15 @@ "scheme": "issn" }, { - "value": "0302-9743", + "value": "1861-2067", "scheme": "issn" }, { - "value": "1861-2040", + "value": "1864-3035", "scheme": "issn" }, { - "value": "1861-2032", + "value": "1867-7754", "scheme": "issn" } ] @@ -1126,20 +1126,20 @@ }, "identifiers": [ { - "value": "9783319476025", - "scheme": "isbn" + "value": "10.1007/978-3-319-47602-5", + "scheme": "doi" }, { "value": "9783319476018", "scheme": "isbn" }, { - "value": "W4245488324", - "scheme": "openalex" + "value": "9783319476025", + "scheme": "isbn" }, { - "value": "10.1007/978-3-319-47602-5", - "scheme": "doi" + "value": "W4245488324", + "scheme": "openalex" } ], "contributions": [ @@ -1235,10 +1235,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1252,19 +1252,19 @@ "local_identifier": "https://w3id.org/oc/meta/br/069066063", "identifiers": [ { - "value": "1864-3035", + "value": "0302-9743", "scheme": "issn" }, { - "value": "1861-2067", + "value": "1611-3349", "scheme": "issn" }, { - "value": "1867-7754", + "value": "1861-2032", "scheme": "issn" }, { - "value": "1611-3349", + "value": "1861-2040", "scheme": "issn" }, { @@ -1272,15 +1272,15 @@ "scheme": "issn" }, { - "value": "0302-9743", + "value": "1861-2067", "scheme": "issn" }, { - "value": "1861-2040", + "value": "1864-3035", "scheme": "issn" }, { - "value": "1861-2032", + "value": "1867-7754", "scheme": "issn" } ] @@ -1300,20 +1300,20 @@ }, "identifiers": [ { - "value": "W2784292677", - "scheme": "openalex" + "value": "10.1007/978-3-319-11955-7", + "scheme": "doi" }, { "value": "9783319119540", "scheme": "isbn" }, - { - "value": "10.1007/978-3-319-11955-7", - "scheme": "doi" - }, { "value": "9783319119557", "scheme": "isbn" + }, + { + "value": "W2784292677", + "scheme": "openalex" } ], "contributions": [ @@ -1397,10 +1397,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1414,19 +1414,19 @@ "local_identifier": "https://w3id.org/oc/meta/br/069066063", "identifiers": [ { - "value": "1864-3035", + "value": "0302-9743", "scheme": "issn" }, { - "value": "1861-2067", + "value": "1611-3349", "scheme": "issn" }, { - "value": "1867-7754", + "value": "1861-2032", "scheme": "issn" }, { - "value": "1611-3349", + "value": "1861-2040", "scheme": "issn" }, { @@ -1434,15 +1434,15 @@ "scheme": "issn" }, { - "value": "0302-9743", + "value": "1861-2067", "scheme": "issn" }, { - "value": "1861-2040", + "value": "1864-3035", "scheme": "issn" }, { - "value": "1861-2032", + "value": "1867-7754", "scheme": "issn" } ] @@ -1461,10 +1461,6 @@ ] }, "identifiers": [ - { - "value": "W4249829199", - "scheme": "openalex" - }, { "value": "10.1007/978-1-4020-9632-7", "scheme": "doi" @@ -1476,6 +1472,10 @@ { "value": "9789048127108", "scheme": "isbn" + }, + { + "value": "W4249829199", + "scheme": "openalex" } ], "contributions": [ @@ -1521,10 +1521,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1544,14 +1544,6 @@ ] }, "identifiers": [ - { - "value": "9783642308598", - "scheme": "isbn" - }, - { - "value": "W2221102889", - "scheme": "openalex" - }, { "value": "10.1007/978-3-642-30859-8", "scheme": "doi" @@ -1559,6 +1551,14 @@ { "value": "9783642308581", "scheme": "isbn" + }, + { + "value": "9783642308598", + "scheme": "isbn" + }, + { + "value": "W2221102889", + "scheme": "openalex" } ], "contributions": [ @@ -1632,10 +1632,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1689,10 +1689,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" } } ], @@ -1720,10 +1720,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" } } ], @@ -1751,10 +1751,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" } } ], @@ -1769,10 +1769,6 @@ ] }, "identifiers": [ - { - "value": "9789264799318", - "scheme": "isbn" - }, { "value": "10.1787/b0e499cf-en", "scheme": "doi" @@ -1786,12 +1782,16 @@ "scheme": "isbn" }, { - "value": "W4221051054", - "scheme": "openalex" + "value": "9789264799318", + "scheme": "isbn" }, { "value": "9789264960114", "scheme": "isbn" + }, + { + "value": "W4221051054", + "scheme": "openalex" } ], "contributions": [ @@ -1818,10 +1818,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -1861,20 +1861,20 @@ }, "identifiers": [ { - "value": "9781402096327", - "scheme": "isbn" + "value": "10.1007/978-1-4020-9632-7", + "scheme": "doi" }, { - "value": "W4249829199", - "scheme": "openalex" + "value": "9781402096327", + "scheme": "isbn" }, { "value": "9789048127108", "scheme": "isbn" }, { - "value": "10.1007/978-1-4020-9632-7", - "scheme": "doi" + "value": "W4249829199", + "scheme": "openalex" } ], "contributions": [ @@ -1920,10 +1920,10 @@ { "type": { "class": "http://purl.org/spar/fabio/Book", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2004,10 +2004,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2023,16 +2023,16 @@ "local_identifier": "https://w3id.org/oc/meta/br/06160781188", "identifiers": [ { - "value": "S110615584", - "scheme": "openalex" + "value": "1432-1300", + "scheme": "issn" }, { "value": "1432-5012", "scheme": "issn" }, { - "value": "1432-1300", - "scheme": "issn" + "value": "S110615584", + "scheme": "openalex" } ] } @@ -2055,13 +2055,13 @@ ] }, "identifiers": [ - { - "value": "W2938946739", - "scheme": "openalex" - }, { "value": "10.1007/s11192-019-03217-6", "scheme": "doi" + }, + { + "value": "W2938946739", + "scheme": "openalex" } ], "contributions": [ @@ -2130,10 +2130,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2152,6 +2152,10 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ + { + "value": "0138-9130", + "scheme": "issn" + }, { "value": "1588-2861", "scheme": "issn" @@ -2159,10 +2163,6 @@ { "value": "S148561398", "scheme": "openalex" - }, - { - "value": "0138-9130", - "scheme": "issn" } ] } @@ -2285,10 +2285,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2380,13 +2380,13 @@ ] }, "identifiers": [ - { - "value": "W3106215946", - "scheme": "openalex" - }, { "value": "10.1162/qss_a_00023", "scheme": "doi" + }, + { + "value": "W3106215946", + "scheme": "openalex" } ], "contributions": [ @@ -2438,10 +2438,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2460,13 +2460,13 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/062501778099", "identifiers": [ - { - "value": "S4210195326", - "scheme": "openalex" - }, { "value": "2641-3337", "scheme": "issn" + }, + { + "value": "S4210195326", + "scheme": "openalex" } ] } @@ -2572,10 +2572,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2589,11 +2589,11 @@ "local_identifier": "https://w3id.org/oc/meta/br/0626055628", "identifiers": [ { - "value": "1588-2861", + "value": "0138-9130", "scheme": "issn" }, { - "value": "0138-9130", + "value": "1588-2861", "scheme": "issn" }, { @@ -2621,13 +2621,13 @@ ] }, "identifiers": [ - { - "value": "W4285173206", - "scheme": "openalex" - }, { "value": "10.1007/978-3-031-06981-9_18", "scheme": "doi" + }, + { + "value": "W4285173206", + "scheme": "openalex" } ], "contributions": [ @@ -2690,10 +2690,10 @@ { "type": { "class": "http://purl.org/spar/fabio/BookChapter", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "book chapter" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2711,11 +2711,11 @@ "local_identifier": "https://w3id.org/oc/meta/br/06401297735", "identifiers": [ { - "value": "9783031069819", + "value": "9783031069802", "scheme": "isbn" }, { - "value": "9783031069802", + "value": "9783031069819", "scheme": "isbn" } ] @@ -2856,10 +2856,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2941,10 +2941,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -2963,10 +2963,6 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/06101018", "identifiers": [ - { - "value": "1096-9926", - "scheme": "issn" - }, { "value": "10.1002/(issn)1096-9926", "scheme": "doi" @@ -2974,6 +2970,10 @@ { "value": "0040-3709", "scheme": "issn" + }, + { + "value": "1096-9926", + "scheme": "issn" } ] } @@ -3040,10 +3040,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -3062,10 +3062,6 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/06101018", "identifiers": [ - { - "value": "1096-9926", - "scheme": "issn" - }, { "value": "10.1002/(issn)1096-9926", "scheme": "doi" @@ -3073,6 +3069,10 @@ { "value": "0040-3709", "scheme": "issn" + }, + { + "value": "1096-9926", + "scheme": "issn" } ] } @@ -3393,10 +3393,10 @@ { "type": { "class": "http://purl.org/spar/fabio/ReportDocument", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "report document" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -3460,10 +3460,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -3482,10 +3482,6 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/06101018", "identifiers": [ - { - "value": "1096-9926", - "scheme": "issn" - }, { "value": "10.1002/(issn)1096-9926", "scheme": "doi" @@ -3493,6 +3489,10 @@ { "value": "0040-3709", "scheme": "issn" + }, + { + "value": "1096-9926", + "scheme": "issn" } ] } @@ -3620,10 +3620,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -3642,10 +3642,6 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/0622015443", "identifiers": [ - { - "value": "1097-0215", - "scheme": "issn" - }, { "value": "10.1002/(issn)1097-0215", "scheme": "doi" @@ -3653,6 +3649,10 @@ { "value": "0020-7136", "scheme": "issn" + }, + { + "value": "1097-0215", + "scheme": "issn" } ] } @@ -3719,10 +3719,10 @@ { "type": { "class": "http://purl.org/spar/fabio/JournalArticle", - "defined_in": "http://purl.org/spar/fabio", "labels": { "en": "journal article" - } + }, + "defined_in": "http://purl.org/spar/fabio" }, "dates": { "publication": [ @@ -3741,10 +3741,6 @@ "entity_type": "venue", "local_identifier": "https://w3id.org/oc/meta/br/06101018", "identifiers": [ - { - "value": "1096-9926", - "scheme": "issn" - }, { "value": "10.1002/(issn)1096-9926", "scheme": "doi" @@ -3752,6 +3748,10 @@ { "value": "0040-3709", "scheme": "issn" + }, + { + "value": "1096-9926", + "scheme": "issn" } ] } @@ -5403,48 +5403,54 @@ "identifiers.id:0000-0002-7562-5203": [ { "local_identifier": "https://w3id.org/oc/meta/ra/0622011040459", - "entity_type": "person", + "name": "Fabio Vitali", + "family_name": "Vitali", + "given_name": "Fabio", "identifiers": [ { - "scheme": "orcid", - "value": "0000-0002-7562-5203" + "value": "0000-0002-7562-5203", + "scheme": "orcid" } ], - "given_name": "Fabio", - "family_name": "Vitali", - "name": "Fabio Vitali" + "entity_type": "person" } ], "given_name:Greg": [ { - "entity_type": "person", + "local_identifier": "https://w3id.org/oc/meta/ra/06150114519", "family_name": "Kearsley", "given_name": "Greg", - "local_identifier": "https://w3id.org/oc/meta/ra/06150114519" + "entity_type": "person" } ], "cf.search.given_name:Greg": [ { - "entity_type": "person", + "local_identifier": "https://w3id.org/oc/meta/ra/06150114519", "family_name": "Kearsley", "given_name": "Greg", - "local_identifier": "https://w3id.org/oc/meta/ra/06150114519" + "entity_type": "person" + }, + { + "local_identifier": "https://w3id.org/oc/meta/ra/06150115060", + "family_name": "O'Brien", + "given_name": "Gregory", + "entity_type": "person" } ], "family_name:Nakamura": [ { - "entity_type": "person", + "local_identifier": "https://w3id.org/oc/meta/ra/060176", "family_name": "Nakamura", "given_name": "Takashi", - "local_identifier": "https://w3id.org/oc/meta/ra/060176" + "entity_type": "person" } ], "cf.search.family_name:Nakamura": [ { - "entity_type": "person", + "local_identifier": "https://w3id.org/oc/meta/ra/060176", "family_name": "Nakamura", "given_name": "Takashi", - "local_identifier": "https://w3id.org/oc/meta/ra/060176" + "entity_type": "person" } ], "cf.search.given_name:Silvio,cf.search.family_name:Peroni": [ @@ -5501,14 +5507,14 @@ "identifiers.id:140": [ { "local_identifier": "https://w3id.org/oc/meta/ra/0610116002", - "entity_type": "organisation", + "name": "Emerald", "identifiers": [ { - "scheme": "crossref", - "value": "140" + "value": "140", + "scheme": "crossref" } ], - "name": "Emerald" + "entity_type": "organisation" } ], "identifiers.scheme:crossref": [ @@ -5747,109 +5753,89 @@ "cf.search.name:Mit Press": [ { "local_identifier": "https://w3id.org/oc/meta/ra/0610116105", - "entity_type": "organisation", + "name": "Mit Press", "identifiers": [ { - "scheme": "crossref", - "value": "281" + "value": "281", + "scheme": "crossref" } ], - "name": "Mit Press" + "entity_type": "organisation" } ], "type:conference": [ { "local_identifier": "https://w3id.org/oc/meta/br/0607163623", - "entity_type": "venue", "name": "Proceedings Of The 24Th ACM/IEEE Joint Conference On Digital Libraries", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/061703214020", - "entity_type": "venue", "name": "2009 Fourth International Conference On Cooperation And Promotion Of Information Resources In Science And Technology", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/061703368436", - "entity_type": "venue", "name": "Proceedings Of The 14Th International Conference On World Wide Web - WWW '05", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/06401936298", - "entity_type": "venue", "name": "Proceedings Of The 25Th International Conference On World Wide Web", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/06603395157", - "entity_type": "venue", "name": "Proceedings Of The 8Th International Conference On Semantic Systems - I-SEMANTICS '12", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/06902363257", - "entity_type": "venue", "name": "2021 ACM/IEEE Joint Conference On Digital Libraries (JCDL)", - "type": "conference" + "type": "conference", + "entity_type": "venue" } ], "identifiers.value:2059-481X": [ { "local_identifier": "https://w3id.org/oc/meta/br/06160186133", - "entity_type": "venue", - "identifiers": [ - { - "scheme": "issn", - "value": "2059-481X" - }, - { - "scheme": "openalex", - "value": "S4210240912" - } - ], "name": "Journal Of Open Humanities Data", - "type": "journal" - } - ], - "identifiers.scheme:issn": [ - { - "local_identifier": "https://w3id.org/oc/meta/br/062502076212", - "name": "Data Technologies And Applications", "type": "journal", "identifiers": [ { - "value": "S4210171756", - "scheme": "openalex" - }, - { - "value": "2514-9318", + "value": "2059-481X", "scheme": "issn" }, { - "value": "2514-9288", - "scheme": "issn" + "value": "S4210240912", + "scheme": "openalex" } ], "entity_type": "venue" - }, + } + ], + "identifiers.scheme:issn": [ { "local_identifier": "https://w3id.org/oc/meta/br/06101018", "name": "Teratology", "type": "journal", "identifiers": [ { - "value": "1096-9926", - "scheme": "issn" + "value": "10.1002/(issn)1096-9926", + "scheme": "doi" }, { "value": "0040-3709", "scheme": "issn" }, { - "value": "10.1002/(issn)1096-9926", - "scheme": "doi" + "value": "1096-9926", + "scheme": "issn" } ], "entity_type": "venue" @@ -5899,10 +5885,6 @@ "name": "Journal Of The Medical Library Association", "type": "journal", "identifiers": [ - { - "value": "S146304353", - "scheme": "openalex" - }, { "value": "1536-5050", "scheme": "issn" @@ -5910,6 +5892,10 @@ { "value": "1558-9439", "scheme": "issn" + }, + { + "value": "S146304353", + "scheme": "openalex" } ], "entity_type": "venue" @@ -5920,11 +5906,11 @@ "type": "other", "identifiers": [ { - "value": "2194-5365", + "value": "2194-5357", "scheme": "issn" }, { - "value": "2194-5357", + "value": "2194-5365", "scheme": "issn" }, { @@ -5940,16 +5926,16 @@ "type": "journal", "identifiers": [ { - "value": "1521-3757", - "scheme": "issn" + "value": "10.1002/(issn)1521-3757", + "scheme": "doi" }, { "value": "0044-8249", "scheme": "issn" }, { - "value": "10.1002/(issn)1521-3757", - "scheme": "doi" + "value": "1521-3757", + "scheme": "issn" } ], "entity_type": "venue" @@ -5959,13 +5945,13 @@ "name": "Scientific Data", "type": "journal", "identifiers": [ - { - "value": "S2607323502", - "scheme": "openalex" - }, { "value": "2052-4463", "scheme": "issn" + }, + { + "value": "S2607323502", + "scheme": "openalex" } ], "entity_type": "venue" @@ -5975,13 +5961,13 @@ "name": "SSRN Electronic Journal", "type": "journal", "identifiers": [ - { - "value": "S4210172589", - "scheme": "openalex" - }, { "value": "1556-5068", "scheme": "issn" + }, + { + "value": "S4210172589", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6007,13 +5993,13 @@ "name": "Publications", "type": "journal", "identifiers": [ - { - "value": "S2738007992", - "scheme": "openalex" - }, { "value": "2304-6775", "scheme": "issn" + }, + { + "value": "S2738007992", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6023,10 +6009,6 @@ "name": "Journal Of Computational Chemistry", "type": "journal", "identifiers": [ - { - "value": "1096-987X", - "scheme": "issn" - }, { "value": "10.1002/(issn)1096-987x", "scheme": "doi" @@ -6034,46 +6016,50 @@ { "value": "0192-8651", "scheme": "issn" + }, + { + "value": "1096-987X", + "scheme": "issn" } ], "entity_type": "venue" }, { - "local_identifier": "https://w3id.org/oc/meta/br/061503030632", - "name": "The Australian Library Journal", + "local_identifier": "https://w3id.org/oc/meta/br/061502934", + "name": "Nucleic Acids Research", "type": "journal", "identifiers": [ { - "value": "0004-9670", + "value": "0305-1048", "scheme": "issn" }, { - "value": "2201-4276", + "value": "1362-4962", "scheme": "issn" }, { - "value": "S165931258", + "value": "S134668137", "scheme": "openalex" } ], "entity_type": "venue" }, { - "local_identifier": "https://w3id.org/oc/meta/br/061502934", - "name": "Nucleic Acids Research", + "local_identifier": "https://w3id.org/oc/meta/br/061503030632", + "name": "The Australian Library Journal", "type": "journal", "identifiers": [ { - "value": "S134668137", - "scheme": "openalex" + "value": "0004-9670", + "scheme": "issn" }, { - "value": "0305-1048", + "value": "2201-4276", "scheme": "issn" }, { - "value": "1362-4962", - "scheme": "issn" + "value": "S165931258", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6083,6 +6069,10 @@ "name": "The Charleston Advisor", "type": "journal", "identifiers": [ + { + "value": "1525-4003", + "scheme": "issn" + }, { "value": "1525-4011", "scheme": "issn" @@ -6090,10 +6080,6 @@ { "value": "S82568730", "scheme": "openalex" - }, - { - "value": "1525-4003", - "scheme": "issn" } ], "entity_type": "venue" @@ -6139,10 +6125,6 @@ "name": "Learned Publishing", "type": "journal", "identifiers": [ - { - "value": "S29676049", - "scheme": "openalex" - }, { "value": "0953-1513", "scheme": "issn" @@ -6150,6 +6132,10 @@ { "value": "1741-4857", "scheme": "issn" + }, + { + "value": "S29676049", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6163,13 +6149,13 @@ "value": "2288-7474", "scheme": "issn" }, - { - "value": "S2739153651", - "scheme": "openalex" - }, { "value": "2288-8063", "scheme": "issn" + }, + { + "value": "S2739153651", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6180,16 +6166,16 @@ "type": "journal", "identifiers": [ { - "value": "1097-4571", - "scheme": "issn" + "value": "10.1002/(issn)1097-4571", + "scheme": "doi" }, { "value": "0002-8231", "scheme": "issn" }, { - "value": "10.1002/(issn)1097-4571", - "scheme": "doi" + "value": "1097-4571", + "scheme": "issn" } ], "entity_type": "venue" @@ -6199,6 +6185,10 @@ "name": "Journal Of Informetrics", "type": "journal", "identifiers": [ + { + "value": "1751-1577", + "scheme": "issn" + }, { "value": "1875-5879", "scheme": "issn" @@ -6206,10 +6196,6 @@ { "value": "S205292342", "scheme": "openalex" - }, - { - "value": "1751-1577", - "scheme": "issn" } ], "entity_type": "venue" @@ -6219,13 +6205,13 @@ "name": "Journal Of Clinical Anesthesia", "type": "journal", "identifiers": [ - { - "value": "S155967237", - "scheme": "openalex" - }, { "value": "0952-8180", "scheme": "issn" + }, + { + "value": "S155967237", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6236,16 +6222,16 @@ "type": "journal", "identifiers": [ { - "value": "1097-0215", - "scheme": "issn" + "value": "10.1002/(issn)1097-0215", + "scheme": "doi" }, { "value": "0020-7136", "scheme": "issn" }, { - "value": "10.1002/(issn)1097-0215", - "scheme": "doi" + "value": "1097-0215", + "scheme": "issn" } ], "entity_type": "venue" @@ -6255,13 +6241,13 @@ "name": "Humanities And Social Sciences Communications", "type": "journal", "identifiers": [ - { - "value": "S4210206302", - "scheme": "openalex" - }, { "value": "2662-9992", "scheme": "issn" + }, + { + "value": "S4210206302", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6291,13 +6277,33 @@ "name": "Quantitative Science Studies", "type": "journal", "identifiers": [ + { + "value": "2641-3337", + "scheme": "issn" + }, { "value": "S4210195326", "scheme": "openalex" + } + ], + "entity_type": "venue" + }, + { + "local_identifier": "https://w3id.org/oc/meta/br/062502076212", + "name": "Data Technologies And Applications", + "type": "journal", + "identifiers": [ + { + "value": "2514-9288", + "scheme": "issn" }, { - "value": "2641-3337", + "value": "2514-9318", "scheme": "issn" + }, + { + "value": "S4210171756", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6344,11 +6350,11 @@ "type": "journal", "identifiers": [ { - "value": "1865-7648", + "value": "0341-4183", "scheme": "issn" }, { - "value": "0341-4183", + "value": "1865-7648", "scheme": "issn" }, { @@ -6363,13 +6369,13 @@ "name": "PeerJ", "type": "journal", "identifiers": [ - { - "value": "S1983995261", - "scheme": "openalex" - }, { "value": "2167-8359", "scheme": "issn" + }, + { + "value": "S1983995261", + "scheme": "openalex" } ], "entity_type": "venue" @@ -6379,10 +6385,6 @@ "name": "Cancer", "type": "journal", "identifiers": [ - { - "value": "1097-0142", - "scheme": "issn" - }, { "value": "10.1002/(issn)1097-0142", "scheme": "doi" @@ -6390,6 +6392,10 @@ { "value": "0008-543X", "scheme": "issn" + }, + { + "value": "1097-0142", + "scheme": "issn" } ], "entity_type": "venue" @@ -6400,11 +6406,11 @@ "type": "journal", "identifiers": [ { - "value": "1557-7317", + "value": "0001-0782", "scheme": "issn" }, { - "value": "0001-0782", + "value": "1557-7317", "scheme": "issn" }, { @@ -6419,14 +6425,14 @@ "name": "Journal Of Applied Polymer Science", "type": "journal", "identifiers": [ - { - "value": "0021-8995", - "scheme": "issn" - }, { "value": "10.1002/(issn)1097-4628", "scheme": "doi" }, + { + "value": "0021-8995", + "scheme": "issn" + }, { "value": "1097-4628", "scheme": "issn" @@ -6440,80 +6446,80 @@ "type": "journal", "identifiers": [ { - "value": "1521-4095", - "scheme": "issn" + "value": "10.1002/(issn)1521-4095", + "scheme": "doi" }, { "value": "0935-9648", "scheme": "issn" }, { - "value": "10.1002/(issn)1521-4095", - "scheme": "doi" + "value": "1521-4095", + "scheme": "issn" } ], "entity_type": "venue" }, { - "local_identifier": "https://w3id.org/oc/meta/br/069066063", - "name": "Journal On Data Semantics", + "local_identifier": "https://w3id.org/oc/meta/br/069039310", + "name": "Feddes Repertorium", "type": "journal", "identifiers": [ { - "value": "1861-2032", - "scheme": "issn" + "value": "10.1002/(issn)1522-239x", + "scheme": "doi" }, { - "value": "1861-2067", + "value": "0014-8962", "scheme": "issn" }, { - "value": "1867-7754", + "value": "0374-6577", "scheme": "issn" }, { - "value": "1864-3035", + "value": "1522-239X", "scheme": "issn" - }, + } + ], + "entity_type": "venue" + }, + { + "local_identifier": "https://w3id.org/oc/meta/br/069066063", + "name": "Journal On Data Semantics", + "type": "journal", + "identifiers": [ { - "value": "1861-2059", + "value": "0302-9743", "scheme": "issn" }, { - "value": "0302-9743", + "value": "1611-3349", "scheme": "issn" }, { - "value": "1611-3349", + "value": "1861-2032", "scheme": "issn" }, { "value": "1861-2040", "scheme": "issn" - } - ], - "entity_type": "venue" - }, - { - "local_identifier": "https://w3id.org/oc/meta/br/069039310", - "name": "Feddes Repertorium", - "type": "journal", - "identifiers": [ + }, { - "value": "0014-8962", + "value": "1861-2059", "scheme": "issn" }, { - "value": "1522-239X", + "value": "1861-2067", "scheme": "issn" }, { - "value": "0374-6577", + "value": "1864-3035", "scheme": "issn" }, { - "value": "10.1002/(issn)1522-239x", - "scheme": "doi" + "value": "1867-7754", + "scheme": "issn" } ], "entity_type": "venue" @@ -6522,35 +6528,35 @@ "cf.search.name:Digital Libraries": [ { "local_identifier": "https://w3id.org/oc/meta/br/0607163623", - "entity_type": "venue", "name": "Proceedings Of The 24Th ACM/IEEE Joint Conference On Digital Libraries", - "type": "conference" + "type": "conference", + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/06160781188", - "entity_type": "venue", + "name": "International Journal On Digital Libraries", + "type": "journal", "identifiers": [ { - "scheme": "issn", - "value": "1432-1300" + "value": "1432-1300", + "scheme": "issn" }, { - "scheme": "issn", - "value": "1432-5012" + "value": "1432-5012", + "scheme": "issn" }, { - "scheme": "openalex", - "value": "S110615584" + "value": "S110615584", + "scheme": "openalex" } ], - "name": "International Journal On Digital Libraries", - "type": "journal" + "entity_type": "venue" }, { "local_identifier": "https://w3id.org/oc/meta/br/06902363257", - "entity_type": "venue", "name": "2021 ACM/IEEE Joint Conference On Digital Libraries (JCDL)", - "type": "conference" + "type": "conference", + "entity_type": "venue" } ] } diff --git a/test/data/index_isbn.json b/test/data/index_isbn.json new file mode 100644 index 0000000..52efbd8 --- /dev/null +++ b/test/data/index_isbn.json @@ -0,0 +1,114 @@ +{ + "retrieved_at": "2026-09-29T13:38:24.769502+00:00", + "metadata": [ + { + "url": "https://api.opencitations.net/meta/v1/metadata/isbn:9789663601922", + "results": [ + { + "id": "doi:10.15407/akademperiodyka.192.304 isbn:9789663601922 openalex:W2790273689 omid:br/06101786021", + "title": "Coastal Zone Resources Management", + "author": "Ivanov, V.A. [omid:ra/06105318565]; Igumnova, E.M. [omid:ra/06105318566]; Timchenko, I.E. [omid:ra/06105318567]", + "pub_date": "2012-05-19", + "issue": "", + "volume": "", + "venue": "", + "type": "book", + "page": "", + "publisher": "National Academy Of Sciences Of Ukraine (Co. Ltd Ukrinformnauka) [crossref:6225 omid:ra/0610116288]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/061202333124", + "results": [ + { + "id": "doi:10.31519/conferencearticle_5b1b9384252a73.81999055 openalex:W2593131457 omid:br/061202333124", + "title": "Mapping Biochemical Fields In The Upper Layer Of The Black Sea By The Adaptive Balance Of Causes Method", + "author": "Lazarchuk, Inga [omid:ra/061206986868]; Lazarchuk, Inga [omid:ra/061206986869]; Timchenko, Igor [omid:ra/061206986870]; Timchenko, Igor [omid:ra/061206986871]", + "pub_date": "2017-10-11", + "issue": "", + "volume": "", + "venue": "Proceedings Of International Conference \"Managinag Risks To Coastal Regions And Communities In A Changinag World\" (EMECS'11 - SeaCoasts XXVI) [omid:br/061202334121]", + "type": "proceedings article", + "page": "", + "publisher": "Academus Publishing [crossref:15171 omid:ra/0670114706]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/06603737264", + "results": [ + { + "id": "doi:10.1357/002224090784984678 openalex:W2077769416 omid:br/06603737264", + "title": "A Nitrogen-Based Model Of Plankton Dynamics In The Oceanic Mixed Layer", + "author": "Fasham, M. J. R. [omid:ra/066010366029]; Ducklow, H. W. [omid:ra/066010366030]; McKelvie, S. M. [omid:ra/066010366031]", + "pub_date": "1990-08-01", + "issue": "3", + "volume": "48", + "venue": "Journal Of Marine Research [issn:0022-2402 issn:1543-9542 openalex:S166958622 omid:br/064064740]", + "type": "journal article", + "page": "591-639", + "publisher": "Journal Of Marine Research/Yale [crossref:270 omid:ra/0680114484]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/061502169014", + "results": [ + { + "id": "doi:10.1016/j.ecolecon.2008.01.017 openalex:W2079791368 omid:br/061502169014", + "title": "How To Be An Ecological Economist", + "author": "Faber, Malte [omid:ra/061506480601]", + "pub_date": "2008-05", + "issue": "1", + "volume": "66", + "venue": "Ecological Economics [issn:0921-8009 openalex:S136211407 omid:br/069053430]", + "type": "journal article", + "page": "1-7", + "publisher": "Elsevier Bv [crossref:78 omid:ra/0610116009]", + "editor": "" + } + ] + } + ], + "references": { + "url": "https://api.opencitations.net/index/v2/references/omid:br/06101786021", + "selected_results": [ + { + "oci": "06101786021-06603737264", + "citing": "omid:br/06101786021 doi:10.15407/akademperiodyka.192.304 isbn:9789663601922 openalex:W2790273689", + "cited": "omid:br/06603737264 doi:10.1357/002224090784984678 openalex:W2077769416", + "creation": "2012-05-19", + "timespan": "P21Y9M18D", + "journal_sc": "no", + "author_sc": "no" + }, + { + "oci": "06101786021-061502169014", + "citing": "omid:br/06101786021 doi:10.15407/akademperiodyka.192.304 isbn:9789663601922 openalex:W2790273689", + "cited": "omid:br/061502169014 doi:10.1016/j.ecolecon.2008.01.017 openalex:W2079791368", + "creation": "2012-05-19", + "timespan": "P4Y0M", + "journal_sc": "no", + "author_sc": "no" + } + ] + }, + "citations": { + "url": "https://api.opencitations.net/index/v2/citations/omid:br/06101786021", + "selected_results": [ + { + "oci": "061202333124-06101786021", + "citing": "omid:br/061202333124 doi:10.31519/conferencearticle_5b1b9384252a73.81999055 openalex:W2593131457", + "cited": "omid:br/06101786021 doi:10.15407/akademperiodyka.192.304 isbn:9789663601922 openalex:W2790273689", + "creation": "2017-10-11", + "timespan": "P5Y4M22D", + "journal_sc": "no", + "author_sc": "no" + } + ] + } +} diff --git a/test/data/index_issn.json b/test/data/index_issn.json new file mode 100644 index 0000000..04392cc --- /dev/null +++ b/test/data/index_issn.json @@ -0,0 +1,159 @@ +{ + "retrieved_at": "2026-09-29T15:23:49.872614+00:00", + "metadata": [ + { + "url": "https://api.opencitations.net/meta/v1/metadata/issn:1096-987X", + "results": [ + { + "id": "doi:10.1002/(issn)1096-987x issn:0192-8651 issn:1096-987X openalex:S21117631 omid:br/0615019585", + "title": "Journal Of Computational Chemistry", + "author": "", + "pub_date": "", + "issue": "", + "volume": "", + "venue": "", + "type": "journal", + "page": "", + "publisher": "Wiley [crossref:311 omid:ra/0610116001]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/06190415414", + "results": [ + { + "id": "doi:10.1080/07391102.2017.1386592 openalex:W2761138796 pmid:28978251 omid:br/06190415414", + "title": "Intermolecular Interactions Between DNA And Methamphetamine, Amphetamine, Ecstasy And Their Major Metabolites", + "author": "Reis, Arthur F.V.F. [omid:ra/061901185326]; Pereira, Igor L. G. [orcid:0000-0002-8022-3612 omid:ra/06160113859]; Neto, Abel F.G. [omid:ra/061901185327]; Santos, Alberdan S. [omid:ra/061901185328]; Kuca, Kamil [omid:ra/061901185329]; Nepovimova, Eugenie [orcid:0000-0003-0281-246X omid:ra/068012488831]; Neto, Antonio M.J.C. [omid:ra/061901185330]", + "pub_date": "2017-10-23", + "issue": "12", + "volume": "36", + "venue": "Journal Of Biomolecular Structure And Dynamics [issn:0739-1102 issn:1538-0254 openalex:S178711970 omid:br/061708427]", + "type": "journal article", + "page": "3047-3057", + "publisher": "Informa Uk Limited [crossref:301 omid:ra/0610116005]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/061701295110", + "results": [ + { + "id": "doi:10.1088/0953-4075/47/14/143001 openalex:W2042280112 omid:br/061701295110", + "title": "Understanding The Structure And Dynamic Of Odorants In The Gas Phase Using A Combination Of Microwave Spectroscopy And Quantum Chemical Calculations", + "author": "Mouhib, Halima [orcid:0000-0001-5031-3468 omid:ra/069014588]", + "pub_date": "2014-07-04", + "issue": "14", + "volume": "47", + "venue": "Journal Of Physics B: Atomic, Molecular And Optical Physics [issn:0953-4075 issn:1361-6455 openalex:S108417319 omid:br/0616036311]", + "type": "journal article", + "page": "143001", + "publisher": "Iop Publishing [crossref:266 omid:ra/0610116040]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/06101680950", + "results": [ + { + "id": "doi:10.1484/eer-eb issn:2295-9254 issn:2295-9262 openalex:S4210239944 omid:br/06101680950", + "title": "", + "author": "Essary, Kirk [omid:ra/06035094624]; Van Gent, Jacqueline [omid:ra/06035094625]; Adams, Tracy [omid:ra/06035094626]; Jamroziak, Emilia [omid:ra/06035094627]; Meyer, Matthias [omid:ra/06035094628]; Ricciardelli, Fabrizio [omid:ra/06035094629]; Ruys, Juanita Feros [omid:ra/06035094630]; Sigurðsson, Jón Viðar [omid:ra/06035094631]; Terpstra, Nicholas [omid:ra/06035094632]", + "pub_date": "", + "issue": "", + "volume": "", + "venue": "", + "type": "", + "page": "", + "publisher": "Brepols Publishers Nv [crossref:7597 omid:ra/0610116091]", + "editor": "" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/061602440477", + "results": [ + { + "id": "doi:10.1057/9780230298125_8 openalex:W2339586113 omid:br/061602440477", + "title": "Francis Bacon’s Bi-literal Cipher And The Materiality Of Early Modern Diplomatic Writing", + "author": "Stewart, Alan [omid:ra/061607098301]", + "pub_date": "2011", + "issue": "", + "volume": "", + "venue": "Diplomacy And Early Modern Culture [doi:10.1057/9780230298125 isbn:9780230298125 isbn:9781349316267 openalex:W599936931 omid:br/061602440482]", + "type": "book chapter", + "page": "120-137", + "publisher": "Springer Science And Business Media Llc [crossref:297 omid:ra/0610116006]", + "editor": "Adams, Robyn [omid:ra/061607098305]; Cox, Rosanna [omid:ra/061607098306]" + } + ] + }, + { + "url": "https://api.opencitations.net/meta/v1/metadata/omid:br/06130803068", + "results": [ + { + "id": "doi:10.1080/0268117x.2021.1926651 openalex:W3180010455 omid:br/06130803068", + "title": "Addressing Audiences Abroad: Cultural And Public Diplomacy In Seventeenth-Century Europe", + "author": "Lamal, Nina [orcid:0000-0002-7460-5163 omid:ra/0613061148]; Van Gelder, Klaas [orcid:0000-0002-9250-629X omid:ra/061302457354]", + "pub_date": "2021-05-04", + "issue": "3", + "volume": "36", + "venue": "The Seventeenth Century [issn:0268-117X issn:2050-4616 openalex:S4210210779 omid:br/06130803749]", + "type": "journal article", + "page": "367-387", + "publisher": "Informa Uk Limited [crossref:301 omid:ra/0610116005]", + "editor": "" + } + ] + } + ], + "citations": { + "url": "https://api.opencitations.net/index/v2/citations/omid:br/0615019585?limit=2", + "selected_results": [ + { + "oci": "06190415414-0615019585", + "citing": "omid:br/06190415414 doi:10.1080/07391102.2017.1386592 openalex:W2761138796 pmid:28978251", + "cited": "omid:br/0615019585 doi:10.1002/(issn)1096-987x issn:0192-8651 issn:1096-987X openalex:S21117631", + "creation": "2017-10-23", + "timespan": "", + "journal_sc": "no", + "author_sc": "no" + }, + { + "oci": "061701295110-0615019585", + "citing": "omid:br/061701295110 doi:10.1088/0953-4075/47/14/143001 openalex:W2042280112", + "cited": "omid:br/0615019585 doi:10.1002/(issn)1096-987x issn:0192-8651 issn:1096-987X openalex:S21117631", + "creation": "2014-07-04", + "timespan": "", + "journal_sc": "no", + "author_sc": "no" + } + ] + }, + "references": { + "url": "https://api.opencitations.net/index/v2/references/omid:br/06101680950", + "selected_results": [ + { + "oci": "06101680950-061602440477", + "citing": "omid:br/06101680950 doi:10.1484/eer-eb issn:2295-9254 issn:2295-9262 openalex:S4210239944", + "cited": "omid:br/061602440477 doi:10.1057/9780230298125_8 openalex:W2339586113", + "creation": "", + "timespan": "", + "journal_sc": "no", + "author_sc": "no" + }, + { + "oci": "06101680950-06130803068", + "citing": "omid:br/06101680950 doi:10.1484/eer-eb issn:2295-9254 issn:2295-9262 openalex:S4210239944", + "cited": "omid:br/06130803068 doi:10.1080/0268117x.2021.1926651 openalex:W3180010455", + "creation": "", + "timespan": "", + "journal_sc": "no", + "author_sc": "no" + } + ] + } +} diff --git a/test/qlever-index-data/index_subset.nt b/test/qlever-data/index_subset.nt similarity index 93% rename from test/qlever-index-data/index_subset.nt rename to test/qlever-data/index_subset.nt index 7126ef0..3a4c441 100644 --- a/test/qlever-index-data/index_subset.nt +++ b/test/qlever-data/index_subset.nt @@ -215,3 +215,17 @@ . . . + . + . + . + . + . + . + . + . + . + . + . + . + . + . diff --git a/test/virtuoso-meta-data/meta_subset.nq b/test/qlever-data/meta_subset.nq similarity index 99% rename from test/virtuoso-meta-data/meta_subset.nq rename to test/qlever-data/meta_subset.nq index 8a4b66d..3a963cf 100644 --- a/test/virtuoso-meta-data/meta_subset.nq +++ b/test/qlever-data/meta_subset.nq @@ -34648,3 +34648,80 @@ . . "Zenodo" . + "2012-05-19"^^ . + . + . + . + "2017-10-11"^^ . + . + . + "2008-05"^^ . + . + . + "1990-08-01"^^ . + . + . + . + "10.1016/j.ecolecon.2008.01.017"^^ . + . + "10.1357/002224090784984678"^^ . + . + "10.15407/akademperiodyka.192.304"^^ . + . + "10.31519/conferencearticle_5b1b9384252a73.81999055"^^ . + . + "9789663601922"^^ . + . + "W2077769416"^^ . + . + "W2079791368"^^ . + . + "W2593131457"^^ . + . + "W2790273689"^^ . + . + "2014-07-04"^^ . + . + . + "2017-10-23"^^ . + . + . + . + . + "10.1080/07391102.2017.1386592"^^ . + . + "10.1088/0953-4075/47/14/143001"^^ . + . + "S21117631"^^ . + . + "W2042280112"^^ . + . + "W2761138796"^^ . + . + "28978251"^^ . + . + . + . + . + "2021-05-04"^^ . + . + . + "2011"^^ . + . + . + . + "10.1057/9780230298125_8"^^ . + . + "10.1080/0268117x.2021.1926651"^^ . + . + "10.1484/eer-eb"^^ . + . + "2295-9254"^^ . + . + "2295-9262"^^ . + . + "S4210239944"^^ . + . + "W2339586113"^^ . + . + "W3180010455"^^ . diff --git a/test/qlever-data/oc-test.index.ops b/test/qlever-data/oc-test.index.ops new file mode 100644 index 0000000..b62ccd3 Binary files /dev/null and b/test/qlever-data/oc-test.index.ops differ diff --git a/test/qlever-data/oc-test.index.ops.meta b/test/qlever-data/oc-test.index.ops.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.ops.meta differ diff --git a/test/qlever-data/oc-test.index.osp b/test/qlever-data/oc-test.index.osp new file mode 100644 index 0000000..fc721b8 Binary files /dev/null and b/test/qlever-data/oc-test.index.osp differ diff --git a/test/qlever-data/oc-test.index.osp.meta b/test/qlever-data/oc-test.index.osp.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.osp.meta differ diff --git a/test/qlever-data/oc-test.index.patterns b/test/qlever-data/oc-test.index.patterns new file mode 100644 index 0000000..b34d29d Binary files /dev/null and b/test/qlever-data/oc-test.index.patterns differ diff --git a/test/qlever-data/oc-test.index.pos b/test/qlever-data/oc-test.index.pos new file mode 100644 index 0000000..4355c91 Binary files /dev/null and b/test/qlever-data/oc-test.index.pos differ diff --git a/test/qlever-data/oc-test.index.pos.meta b/test/qlever-data/oc-test.index.pos.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.pos.meta differ diff --git a/test/qlever-data/oc-test.index.pso b/test/qlever-data/oc-test.index.pso new file mode 100644 index 0000000..c247ea5 Binary files /dev/null and b/test/qlever-data/oc-test.index.pso differ diff --git a/test/qlever-data/oc-test.index.pso.meta b/test/qlever-data/oc-test.index.pso.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.pso.meta differ diff --git a/test/qlever-data/oc-test.index.sop b/test/qlever-data/oc-test.index.sop new file mode 100644 index 0000000..90c06d4 Binary files /dev/null and b/test/qlever-data/oc-test.index.sop differ diff --git a/test/qlever-data/oc-test.index.sop.meta b/test/qlever-data/oc-test.index.sop.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.sop.meta differ diff --git a/test/qlever-data/oc-test.index.spo b/test/qlever-data/oc-test.index.spo new file mode 100644 index 0000000..7f22de5 Binary files /dev/null and b/test/qlever-data/oc-test.index.spo differ diff --git a/test/qlever-data/oc-test.index.spo.meta b/test/qlever-data/oc-test.index.spo.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.index.spo.meta differ diff --git a/test/qlever-data/oc-test.internal.index.pos b/test/qlever-data/oc-test.internal.index.pos new file mode 100644 index 0000000..6d64467 Binary files /dev/null and b/test/qlever-data/oc-test.internal.index.pos differ diff --git a/test/qlever-data/oc-test.internal.index.pos.meta b/test/qlever-data/oc-test.internal.index.pos.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.internal.index.pos.meta differ diff --git a/test/qlever-data/oc-test.internal.index.pso b/test/qlever-data/oc-test.internal.index.pso new file mode 100644 index 0000000..62bd397 Binary files /dev/null and b/test/qlever-data/oc-test.internal.index.pso differ diff --git a/test/qlever-data/oc-test.internal.index.pso.meta b/test/qlever-data/oc-test.internal.index.pso.meta new file mode 100644 index 0000000..d4227fa Binary files /dev/null and b/test/qlever-data/oc-test.internal.index.pso.meta differ diff --git a/test/qlever-data/oc-test.meta-data.json b/test/qlever-data/oc-test.meta-data.json new file mode 100644 index 0000000..9e040eb --- /dev/null +++ b/test/qlever-data/oc-test.meta-data.json @@ -0,0 +1 @@ +{"date-of-index-build":"2026-09-29T15:24:24Z","encoded-iri-prefixes":{"prefixes-with-leading-angle-brackets":["o.j $>Mlq#~30<V?<^b11 -m j$~9;-0.op*1|#;? \!;mMu$4c-Iu-Rp 'l<M'Vl?~Jb11| j$ k1=q#IkLb u;UY?/77777(U,U8)867(U,XBU+77(U,(+8U,)7(U,,7(U,NGUB7(U,S6U7(U,6U,7(U,2)6U7(U,U,7(U,)UN6)7(U,2UB7(U,8)8U6),7(U,)77U(7(U6(N)U7(U+,U87(UU(67(U66+BU,,7(U6,UBŶ7(U6B+,UN7(U67U+,87(U8U68+87(U8,Uz)67(UU7(U)BU8+7(U)(US7(U)6)6U787(UU6+,7(UBT(U6(7(UB2U()7(UXU,8N7(U(+U66+7(U8+UT77(UB),+U67(UB)8BU+87z7BU)77,+UN7x`U)67xB)UN)77)+)UN77,U)677BU+T(7(((+U8,7((U(+,(7(N68Uz+7(N8BU,(7(,(,U777(,N8U)+7U6+7U)8+,7N2(2U+7N2)7UX87NBU(϶7S(6U7SSU6)87++UT,7T((U+776)U){7(7`U6,(786U(7266)U,)272)(6U672)U67{UN687,+U8),(7,N)2UB7,S(U+(7,6U(67UB7,)U77,(U2)87B+U)7]8BU+)S76+B(U27+)U+,78+,(T778+U)878,(6U]2678,`786()U8֟78]7U(6786U(џ7]U+7)2(+(7+BUq77ϘU],7)S7U8N6(7)T6U+)7)7Ux7)2U)287),)8U)6(7)6B(UN7B(U)67B+UX7)7UN7B)(T6,7+U77B,U+7+U8BU8+)7+U)+U6BX7+UzB+U7϶7+UN8U6+)7+U{SU{7+U(BU+87+U()U+7+U(S2U+7+U(+86U)T7+U(+UB+)67+U(+)6U+(7+U(2UNT,7+U+2U7+U`B)U287+UNT(U7+UNBU6,7+UN)UB67+U+(6,U,+7+U+(U]87+U6)U(,7+U+BU]7+U+B+2U77+UTGU87+U2((2U27+U2((,U](,7+U2(,,UX7+U82(7+UјU+((7+U28N8UB,7+U2828U2((U+(2U6)U,B+U6(UB+XB)U(266Uғ7(772U)787z77z7U7z(7z(U),7zT8))2687zB7777U+7772Uϯ7777777B,7X++)UB(S688)))8BB)6,(z7z7z(,zz+zz,z,+z6)(ĺz)6zBޟ,,UX2(8N82(2(U2(),,8882U6,8{{(G{S{+)8x`xxBxB)(N+(+B(X277϶7)+7)7,7878U867B+,7B+,U27B,7B,)()77B,7B,+U(,(7yyUyfU(Y-5 t!. [5F!l'Ϳg'F!04 s!O u.};Il9 Σ Z9 $\b'I!/ t.F|$ !c;Uu!9l \ uQI9![3Q*U\4LV> !L4 +2y7@f<#XUB)8@f<#XUN6@f<#X킓@f<#Xz(,@f<#X@f<#X2]@f<#XB)U@f<#(,U+8,8@f<#(,UTB,@f<#(,UB@UN6؝XG^28^U-r$@킓؝(X()7^B()7)^U0#05(i$@킓؝{),^B(,^U0#05$$@킓؝{),^B^U0#05W$6@킓؝{),^B^U0#05_$@킓؝{),^B,)^U0#05($'@킓؝{),^B66^U0#05(P$R@킓؝{),^B),^U0#05($$@킓؝{),^B^U0#05"$9@킓؝{),^B`^U0#05(i$5@킓؝{),^B8^U0#05`"$O@킓؝{),^B`^U0#05"$@킓؝{),^B`26^U0#05"$/@킓؝{),^B`6)^U0#05"$@킓؝{),^B`8+^U0#05N$@킓؝{),^B`^U0#05N_$@킓؝{),^B`B(^U0#05Ni$9@z(,`77(,),^N(G^U.0$,@z(,`77(,),^N(66^U.0P$3@z(,`77(,),^N(^U.0W$R@z(,`77(,),^N6^U.0a$@z(,`77(,),^N(^U.0$/@z(,`77(,),^NN^U.0i$L@z(,`77(,),^N^U.0h$3@z(,`77(,),^N+^U.0($9@z(,`77(,),^N)^U.0(P$@z(,`77(,),^N6^U.0(W$,@z(,`77(,),^NN2)^U.0($O@z(,`77(,),^N+^U.0"$'@z(,`77(,),^NNG^U.0(i$5@z(,`77(,),^NN8,^U.0`"$,@z(,`77(,),^NN)(^U.0"$@z(,`77(,),^NN)B^U.0"$@z(,`77(,),^N6^U.0"$@z(,`77(,),^N)^U.0NW$3@؝)(+)^(2)^U.h$@؝)++)^N(S^U._$7@؝)++)^N(^U.i$1@؝),+)^+()2^U._$L@؝),+)^+(^U.X"$'@؝)8+)^2B^U.W$6@؝)8+)^2)^U.X"$@؝)8+)^2S8^U.(W$8@؝+B^NX,^U._$3@؝7B+B^,N^U."$F@؝((+B^6T7^U.P$@؝((+B^6T)^U.W$a@؝),T^+(,N^U.P$c@؝),T^+(,)^U.$'@؝),T^+2^U.($c@؝ڙ2(^N8B^U.r$6@؝ڍ2(^+6^U.(P$6@؝7B2(^6B^U.(W$,@؝(N2(^)7^U.$@؝(N2(^),)(^U.W$'@؝BX+ٓ^N^U.P$O@؝BX,ٓ^2N8B^U.W$$@؝BX,ٓ^2S)^U._$/@؝BX6ٓ^,+2(^U.W$8@؝BX)ٓ^826B^U.$@؝BX)ٓ^8^U.a$O@؝B((Nٓ^X,^U.W$D@؝B((Nٓ^X828^U.i$8@؝B((Nٓ^X8,2^U.h$0@؝B((Nٓ^X8,)^U.(r$@؝B^(]^U.$0@؝B^()7^U.i$@؝B`+^N()+^U.(r$D@؝B`2^+7^U.P$#@؝B`,^2,^U.W$'@؝B7^BGN^U.P$@؝B7^B6(6^U.W$@؝BS(^(,8^U.$O@؝BS2^+(6(^U.a$@؝B+X^B+^U.r$/@؝B+X^B,^U.W$L@؝BT2٥^+()6^U.i$L@؝BT,٥^2(^U.P$@؝BT6٥^,+^U.$/@؝BT6٥^,+^U.(r$@؝BTB٥^)(^U.W$0@؝B2X٥^B66B^U.W$1@؝B2(N٥^X8S^U.P$R@؝B2(N٥^X8,+^U.$0@؝B2(N٥^X(^U.h$8@؝B26^(S^U.W$L@؝B26^,+)2^U.i$@؝B826^6T7^U.$@؝BB26^)6((^U.h$R@؝BB26^)]+^U.($@؝B,(N26^X8)+^U.(r$3@2])؝()6,^+,^U-11($R@2])`77{86^)(6^U-11X"$#@B)U؝7(ٗ^+`8^Uy7()6,+fO(f``<*1U(y7+Bf<<5#(6+By778Nţ(N26B2O(y7,f8AcU5*y7+(,f0JL=>;n0d,F(FB+),N-8+){,y7++f$*$28By7,N)(f>$*$28B`y7,N)(f>$*$28+(y7,N)(f>$*$,,,Ny7,2f$9*Ēy7G)2f/BL.A<9;!82826(Oy7G)2f/BL.A<9;!828,ۣOy7G)2f/BL.A<9;!++)86O8y7G)2f/BL.A<9;!66)+),,O(y7G)2f/BL.A<9;!682(NO(y7G)8fc0y78N)8f1!=1e14<+26BO(y7f1!=y77y7zy7yy6yyzyzyyyyyy8yy{y{8yxyx7yxyx7)+,yy7yy7y7)7y7)8y7y7y7By7y7UB)8y7UN6y7y7킓y7z(,y7y72]y7By7B)Uy(yXyXyXy((y((y(y(y(y(y(,y(6y(]y(yy(y(),yy,,yy`yyyyyyyyNyN26ByyN6yN68yN8yN8yNyy6yySyS7ySyS8y+(y+yy+y+,y+,(y+,8yy۟y]yۺy+8y+86y+y+y+)6y+)6y+yyTyT7y2(y2yyy7yşy(S7yyy6yyџyy26y266y28y2y2)yy6y2 y,yy,(y,(y,(,y,y,y,U+8,8y,UTB,y,y,UBy,y,UTy,UT((y,N8y,y,y,U7y,y,T8y,2(y,,y,y,Uܒy,,8y,,8U8+y,,y,,)UBŶyy,8y,y,U7)y,y,y,y,UN)6(yy6yGy6(y6((y6((Uy]y6y6+Byyy6,y66y68y68+(y6y6y8yyy8y8N]y8y8y82(y82(U2),8y8,y8,(y8,(U(,y8y8U,8y86yy8y8)8y8y8yy)7y)7y)7y)(y)Xyy϶y)y)y),y)6y)6(y)6(U`+y)6(U`Ty)6(U`y)6(U`68y)y)US+,y)6,y)6,U8ǒy)6,y)68y)68U,y)8y)y)8,y)8,U,)8yy(y,y)y)Byyyڟyy8yڶyB(yB(6yByB`yByBN66,(yByBSyB+yB+yB+yByByB,yB,yyy,y6y8yyyy7y(yyNY4'#4-1=bR;QU-m[!pL-^ 5'ɱyy+Y4'#4-1=bR;*#b3$AEl9/ E >=KoY'04'3Y'5 AK\ |<9 j!yy,y6y8yyByB)7yB)(yByB)yB)yB),yB)(yB)yB),yB)8yByB7yB((yB),yy7y7U7)Uy7y7y77yӂyXyX,yX6yXy((yӟyy`y`y`,yӋ7yS(ySy+XyTyT,yT6yTy2Xy2(y,yyyӘ8yӘy,(y6yӮƒyX(yӒyӶyy(yBXyӺy5yg4``7`77`77(,`77{``(,`x`zz`z{`{`7`7)U{`7`7B $'5 p#q#JL=> k#~$$1=q#5$ך \$'5I Y>j!m#$A7{U`T,688UXU((`````bfv $[4~JL=> k# .Alu.};Iؾu````+``T``26`,`,`,6```U2)(`6`68`6`8`8`8q8`8`86`````B(`B`B7+(+8+,66868U)+882826(828,)BB2U,+,8B2U,,7U86{(XXU6(,2(,68U828U)xB,B,UBB,UBN]7U6,7(N,6]]qU((),U(,2(78BBNNTNT(NT,N2(N2(NNNNN26N28N2N2)7NN2 7(((2UBN(2UB+(+8)+T+,,68 N6NGN6(N]N6NN(N(U+8N6,N66N6]N6]UBN68N68N6N6)N6N6N8NNNN8N8N8N8,N8N86NN8N8NN)7N)(NN϶N)N)N),N)6N)6(N)N)8N)8N8N)82)7NN)N),(7(֟N+(N,68ֶ֒BN#SS7S(S(6SSSSS+,SS,S6S8SS)S)(S+(+X+((+((+(+(+(+(+(,+(,+(6+(6,+++6+(+()+,,+(+++`++++++++N++N6+N8+N+N),+7(+8,668++T+T(+2(+++++)86++26+26BO(+28+2+++,++B+,(+,+,+,+,+,,+++,8+,8+,++7+(X6(۟,68+)ے۶+8++7+26++++8+8+8+8,+8,8+86++8+8++)7+)(++8+)+)S+)+),+)++)+++B(+B+B++B+B,+++B+TT7TT7T(T((TT`TTT,T,T6TGT6,T8T8,TTB,T2(2X2((2((2((,2(2(2(+(2(2(,2(,,2(622()27(,68867{ş6688ŒŶ7(,ј686ђ)7Ѷ7(`886)6,8B,262G26(2]2]HzHHH{HxHHXH((H(H(H(,H(6HH(HzzHzHz{HzxHz7Hz7HzXHz((Hz(Hz(Hz(HޟHH,H6H8HޒHXHxH((H(H(6H{zH{H{H{{H{xH{H{7H{7H{((H{(HxzHxHxHx{HxxHxHx7Hx7HxXHx((HHH{HxHH7HXHzzHzHzHz{HzxHzHz7HzXHz((Hz(Hz(Hz(,HޟHHH,H6H8HޒH((H(HzHHH{HxHH7HXH((H(H{zH{H{H{{H{xH{H{7H{7H{XH{(H{(HxzHxHxHx{HxxHx7HzHHH{HxHH7HXH((HzzHzHzHz{HzxHz7Hz7HzXHޟHHH,H6H8HޒH޶HXH((HzHHH{HxHH7H{H{H{{H{xH{H{7H{7H{XH{((HxzHxHxHx{HxxHxHx7Hx7HxXHx((HNTXHNTXHNTXHNTX,HNTX6HNTX8HNTXHNTXHNT(XHNT((HNT((HNT`HNT`HNT`,HNT`6HNT`8HNT`HNT`HNT7HNT(HNTHNTSHNTSHNTSHNTS,HNTS6HNTS8HNTSHNTSHNTTHNTTHNTT,HNTT6HNTT8HNTTHNTTHNT2((HNT2(HNT2(HNT2(HNTqHNTHNTHNTHNTHNT8HNTHNTHNT,XHNT,((HNT,(HNTGHNTGHNTGHNTG6HNTG8HzHHH{HxHH7H7HXH((HzzHzHzHz{HzxHzHz7Hz7HzXHz((Hz(HHH,H6H8HޒH޶HXH(H(HzHHH{HxHH7H7HXH{zH{H{H{{H{xH{H{(HxzHxHxHx{HxxHxHx7Hx(Hx(HNzHNHNHN{HNxHNHN7HN7HNG`HNG`HNG`6HNG`8HNG`HNG`HNG7HNGHNGSHNGSHNGSHNGS,HNGS6HNGS8HNGSHNG+XHNGTHNGTHNGTHNGT,HNGT6HNGT8HNGTHNG2((HNGqHNGHNGHNGHNGHNGGHNGGHNGGHNGG,HNGG6HNGG8HNGGHNXHNXHNXHNX,HNX6HNX8HNXHNXHN(XHN((HN`HN`HN`HN`,HN`6HN`8HN`HN,HNSHNSHNS,HNS6HNS8HNSHNSHN+XHNTHNTHNTHNT,HNT8HNTHNTHN2XHN2((HN2(HNqHNHNHNHNHN8HNHNHN,XHN,((HN)HN)HN){HN)xHN)HN)7HN)(HN)(HN)(,HN)zHN)zHN)z{HN)zxHN)zHN)z7HN)z7HN)z((HN)ޟHN)HN)HN),HN)6HN){zHN){HN){{HN){xHN){HN){7HN){7HN){XHN)xHN)xHN)x{HN)xxHN)xHN)x7HN)x7HN)xXHN)x(HN)x(HւzHւHւ{HւxHւHzHzHz{HzxHzHz7HޟHHH,H6H8HޒH޶H֙((H֙(H֙(H֙(H֍H֍H֍{H֍xH֍H֍7H֍7H֍XH֍((H֍(H֍(,H{H{H{{H{xH{H{7H{XH{(H{(H{(HxHxHx{HxxHxHx7HxXHx((Hx(HSHSHS{HSxHSHS7HS7HS((HSzzHSzHSzHSz{HSzxHSz7HSz7HSzXHSz((HSz(HSz(HSz(HSz(,HSz(6HSHSHS,HS6HS8HSޒHS޶HSXHS(HSHSHSxHS7HS7HSXHS(HS(HS(HS{zHS{HS{HS{{HS{xHS{HS{7HS{7HS{XHS{((HS{(HS{(HSxHSxxHSxHSx7HSx7HSxXHSx((HSx(HSx(,HSx(6HSxHSxH+XXH+XXH+XXH+XX,H+XX6H+XX8H+XXH+X`H+X`H+X`H+X`,H+X`6H+X`8H+X`H+X`H+X7H+XH+XSH+XSH+XSH+XS,H+XS8H+XSH+XSH+X+XH+X+((H+X+(H+X+(H+X+(H+X+(,H+X+(6H+X+H+XTH+XTH+XTH+XT,H+XT6H+XT8H+XTH+XTH+X2((H+X2(H+X2(H+X2(H+X2(,H+X2H+XH+XH+XH+XH+X8H+XH+XH+X,XH+X,((H+X,(H+X,(6H+XGH+XGH+XG,H+XG6H+XG8H+XGH+XGH+X6XH+X6((H+X6(H+X6(H+X6(H+X6(,H+zH+H+H+{H+xH+H+7H+7H+XH+((H+(H+(H+``H+``H+``H+``,H+``6H+``H+`7H+`(H+`H+`SH+`SH+`SH+`S,H+`S6H+`S8H+`SH+`SH+`+XH+`+((H+`+(H+`+(H+`TH+`TH+`TH+`T,H+`T6H+`T8H+`TH+`TH+`2XH+`2((H+`H+`H+`H+`,(H+`,(,H+`,(6H+`,H+`,(H+`,H+`GH+`GH+`G,H+`G6H+`G8H+`GH+`GH+`6XHzHH{HxHH7H7HXH((H(HzzHzHzHzxHzHz7Hz7HzXHz((Hz(HޟHHH,H6HޒH޶HXH((H(H(H(,HzHHH{HxHH7H7H{H{H{{H{xH{H{7H{7H{XH{((H{(H{(H{(H{(,H{(6H{H{(H{`HxzHxHxHx7Hx7HxXHx((H+TXH+TXH+TXH+TX,H+TX6H+TX8H+TXH+TXH+T(XH+T(((H+T`H+T`H+T`H+T`,H+T`6H+T`8H+T`H+T`H+T7H+TSH+TSH+TSH+TS,H+TS8H+TSH+TSH+T+XH+T+((H+TTH+TTH+TT,H+TT6H+TT8H+TTH+T2XH+T2((H+T2(H+T2(H+T2(,H+T2(6H+T2H+T2(H+TqH+TH+TH+TH+TH+T8H+TH+TGH+TG,H+TG6H+TG8H+TGH+TGH+T6XH+zH+H+H+{H+xH+H+7H+((H+qzH+qH+qH+q{H+qxH+qH+q7H+q7H+qXH+q((H+q(6H+qH+SH+SH+SH+SH+SH++XH++((H++(H++(H+TH+TH+T,H+T6H+T8H+TH+2XH+zH+ԙH+ԍH+{H+xH+ԕH+7H+7H+XH+zH+܍H+{H+xH+ܕH+7H+7HX(HXHXHXHX,HX6H`H`H`H`,H`6H`8H`H`HꋟHSHS,HS6HS8HSHSH+XH+((H+(H+(H+(,HTHTHTHT,HT6HT8HTH2((HqHHHHH8HꘒH꘶H,XH,((H,(H,(6HGHG,HG6HG8HGHGH6XH6((H6(H+XH+XH+XH+X,H+X6H+X8H+`6H+6H++XH++`H+TH+2H+,((H+,H+G6266262628228N828B28B`28+(28282828G2822)(62)(2)2),2),82)82S]6,7{q7q87,ܒ8,(,X,(,(+8,(,(6,,,,,,`,,,,NG,N)(,N),,,S(,S6,,+,+,8,,,6,+8,,,6,ź,2)6,,,,,,,,,,N,7(,,6)B,8,(,8N,8)8,,)77,),)x,)(,)2,)8,)XB,F(FB+),N-86GGG)G)86(6((6(N6(6(,6(66(]](,]]26],]8]8]866+(6+6+,6+)6+B(ǟ+,)66,66,(66,6666+66)+),,66686,6868+8682(66,66)(S6,6),6)866BX6B+,678T8,+,6(888N6(8N)88֟88S8+8+8+,8888+8+)8888288288,88,(68,8,8,8,888,88686(8]7868ǒ(Nғ,6]88)8),(8)86888118Ac)7))){)x)x)()()7){,+(+ϯϘ]))S7)+)+))T6)T)7))28),),)8)))6)6()()6,()6)6)6B()6)8)6)8+,))B+B()B,)),) NB(B(SB(BBBBN]BNBBS7B)(B+XB+(B+B+)6BBT(B,BŶB2B6B,X(+2)78)zS)()(T`+N8)S+X6B)z)S+X6B))(,T)(,,8)28)28G),)x8),)x),)6)(7)6)(S6)T68)T8)ۓS),)()ۓS))2)(N7)BNǴ8,)8)BN86)BN8+()BN()6ꝬBB)(B),B)8B)8N6B t.F|s0V?IkL~=4-[Y> ul=K'e t.F|s0 .F.J 9Z9 !V3? EcD~3'5V?IkL s!OK#I/JA t.F|$A51-9Z K-F\~3'Ab3AEl9/ t k# à5 '=D~lq#-1 g3p*ZKEI$/>м~1;K.V?IkL kF<$d<#K#IkL ãg!$<> ul=K'e~1;JY!3 .1LU4?1! .F.JI j9!.5 $$*#\IkL l j$ uQA'- K~1;J !-*-F.|4?bFɱ04Il9 j9!.5Y$'5 '/>4D~1;J !-*-F.|4?Y?#$1I#ksA[5n0dIE [!=oY?#$1D~1;J jR$Y?/IkL !.A9t$$dQ s!OV~1=p/5? Ep-0n K-F!Y!;mov\.A#~1=p/5? Ep-0n K-F!Y!;movvOV'~1=Ut5'e E !?RE*po !R<1-1=D~Ee3q# t.F|$A19Z K- d/>4IE àpb >=V. .dQ-/>4Y?/~$$3 E OV'Ko s!Og?/D K-Y'04'e E s!OV !J j9!EZ $'#*q# Epo !J j9!E? R s!Ogl' !J j9!E? R s!Ogl'q#^ k1=q#I\!;mb11 -m 0s/[Q4 '#0p EY?/ OV' $ s33α0n A/ E k#|#! s!OV 3$R~9;4 Epo l9b j9\-'5'D E/K E g4Q*;*.~lq# t$ 'F|<9#1'F|<9 '/>4D /!REc E g4'*? /=Ao REc j!m#$A '?Y~9;-0.q#p-0pY>nLZ \!;m '?Y j9!E?b11 -m j$=.$*Zt[*o !JD >=E/'3q# t*LE*g .F.J^ 19Uks>*b11 -m >=g4Kn0$3 E ./Ko 'e !u!3IkL K-Ut! n|q# l9[ s!Ok5AQ. >=g4Kn0$3 Ep0eo LLZ#0?*~JL>pQ'K-~d0Y?/Ij9 'A9Y-/1| >=j9!E? t.F|s0k =~'/'3K.b*OQ4-5\D >=V.~J14'!3$1/>4 E #V?I#3$R >=V. 3$Rm;4 E à ktvj^$k = k#U|#!p-0n t.F|$A19ZY!;mY?/D .A93?b<4 s!Og?/ !?RE*Y?/ EY/V3~>D u.};? REc$3K9!/KZ$3 E~1;J t.F|$A19Z K- t\!'e~3IJ#q#p t.F|s0DVQA'- EY?/KZ \!;m k# '~/'#Zq# K'3 uQA'-K9!E? E !3$1/>4bY>9$E;no $'5#ul=K'e9$EY4'*?op0Ee3K~.50'3q#K#I u.};?Y?/D$3 Eb !.A9s!Og?/$3 E g4$11o t!9-O.E à5IkL k#|#!Y?/D$3 E E*~3'A'3nL-ZK-Y?/k#! *'04^ UQ*F$$c k4$4$Zb#4D'3nO;̷Y4Kn0#V?IkL àbY>nLZ~1= t~'5e#4UR;>\I s!Og?/ !.3 !R~1;J tR!>~J#׀ o ؤugٛ*bKZ j!45\ gj !R *lE E gvg $4q# E \0sFo 1J>4IkL u.};?Y?/D $bF$Y> \!;m $ k# Mgm;|#\<Mv/1-04 $ k#p#q# O.Fd~d E mQ $ k#~'/'3K.b*OQ4- .F.JD $ k# K9!/KZt guvp $ k# à !;\4 !.A9FEIE v/1d/>nYod u[c- '/>4~3LZq#D $39.3$<$19? E \.A#Y4E-s!Og?/I11 1sK! E :g=<1!0n k#Y!0J*;?b0b0nOlI Y/V3~$'#ˏ<^ ! v< F-F.|Zb11 -m j$bKZ !?RE*po;4 vk# .F.JY1!V4? E*I b j!m#Zul=K'e F-F.|Zb11 -m j$bKZ !?RE*po;4 vv#b3AEl9/ E F-F.|Zpo F-F.|Zb11 -m j$ s!O Y?/Il9 t$$dQY!;m !'\4 E/'3q#D F-F.|Z$3 E .F.Jb9E<9.1D F-F.|Z j9!E?po*Y./.3;l?!'e t k#~l*~lo '/>4D Fd/p s!Ol9 '?YD A//opL- E~eKo K-b00E*o j$ gΧ k#4$AI#k1>lq#IK-$3 Ae jR$ E/IkL t*LE*Iu-R F.|4? j9!EZ~J5'04 Eb<< 3$Rp REcD !1|0q# 4p j!-mo Mt$ < j9[co !13? j$ $F=4 !!c3? .A9 $ ,U3'E$'3u!'0$OE[bI N2U$'5pL'JpK#4Il9b*OQ*~E!04;#Y.$AZ11 -m j$ \.A#Y?/DY.J j$ gvg .dQ-/>4 = È Iuf(Y4K! j#כV?IkL k#|#!Ug!!co t!9-O.EY4Kn0!J$3 E=.$*Zg!0 EbY1!V.~>Y4'*? juUvpL!0כte4~Q5I j-*j$F-A$Y4'*?Y4Kn0!'eIEe*Zn j=/Iàj$p '/>4DY?/KZ ul=K'e !OR k# .cKY?/I11 -m j$ \.A#Y?/DY?/IOV'q# *'0q# Y?/ E k#4;.$ j-FdY j9!E? $4q#D j!m#.'! E OV'KobKZ j=/~3'A j!m#.'! EJlEo à5 t!9-O.Eb4 1= j=/[ L- j!m#.'! jR$Ug4-~3'Ab11| j$ #O.5J/>4#*~.O.3 [!=oK9$*IkL~lq#V?D j\4 t'0cIs/! '/F=~$*oY/ j\4Y.A#.LZQ E 9lRE .F.J j9!E? j=/ v/1E4QpbKZ j!4V?D j9e<9'db11| j$ s!O!J$3 j#<3Ko~1=pL- E #*Uà5 k1=q# =$#!$'Is!Og?/=KE =? ;3? ;#oY?/ E -1 v#nLZq#j#nLZj!m#Z $|0 EcY4'*? !OR *'05\D .1L#$3bKZ t.F|$A19ZY?/^b11|0q# j$uvwtwt=Q$'A3ww9-/w-!.3Ks$F[w+8,/VF=nLZ ul=K'e*Y!0n j#<3q#IkLY>nLZj!m#Z$'5#5n0d<^ j9!.5~9;-0n0I#$4Q-/>м*-1nY?/^ g4'*?K#ߛt!9-O.E*'-0*'*'*b .F.Jv4I11|0q# j$ v/1-04 -04Ev//0?p*/-)x*/[*/[K.*/[K.[Q<1!04IkL~1=I *'0*/F.|4*/F.|4? !AK\ j$p#q#!oD*$1*sQ*sQ*OQ*OQ!F-0c9$*I  s!OV*OQK=3D*OQD*OQI p3|#4Y?/I#*~1o*OQ4-*OE=$*..=J-ZVLL!0nLL.5/K.L-?QL-?QLs0LL/K9AA-[#0#4DAAeAKAL.$nDAL.$nDARVARVAs0'34'3AsDD.c$'.c$'[\[\.5.53.J j!m#Z REc^b !Ob11 -m.R!..R!..L='c.L='cc-/1=.$*?cccQ-ccQ-33u 3$<<;? u.};?*Y>9Z-A$ vu^b/=ZQ u.};?b<< )+^ N1 ~3-[3-[3Q3Q3Q w3Q *R;3Q w3Q uw3Qw3Q w3*-.53*-.5 w3F=м3F=м3F=4 tw3F=4 w3}!m4#3}!m4#30$9$|!p kO;#~Q53d|0 v/FVQp 3JO.J K!~;#3d#3d#3dO̷33K33Ko3333q# \$'5I Y?/3$AEl9/3J<$319333 Z 1l93~3 [ZI[Z$F-0?3E.U<<̷*p[-13^ v/1|0q#IE Z~;#$#\3#K.3#K.D34+D34+D3O;!3O;!3O[3O[ w/=Z/=ZQ/./Zc/Zc/JA/E19$'D//##b0'l.JI!J$3 Eb0-/Z u.};D#b3AEl9/ E~1o~Ee3q#KsD#b319-U'/=ZY4E-s!Og?/#V?IkLQ'.50'3q#Y?/IEb0-/Z u.};D#V?IkL .LL=>ItR!> >4?UkLUà Qco-RUà Qco u.};? $'5#à#V?n0$3b u.};? REc#b11|0q#Q-s$b00$'#n j$bY>~>#b11 -m j$b<\Ig=OZ! E'F|0 u.};D#bKY4E-s!Og?/ E~|#Z9;/-Z\!;m '/>4D# 0JZV?IkL !EY>nLZ $'5#VD# 0JZ q#V! E-*Y'F/J~9;It?b0-/Z $'5#VD# 0J4g !Ld0Ik#pl! E *OQ*Y4'*?Y># /1.s0-/[q# t*LE*Iu-Rg0KoY>nLZ ul=K'e# /1.s0-/[q# u$4c-Iu-R# /1.s0V3? '#$3 *$1ךp3d04'j!m#$AD# OV'q#pZ'I#ugp 3* k19 V/$A# OV'q# 9!'/K$A?~$pZ'<e|/[;? !1Eм# O.J;?b11 -mpY?/Ig># -/[q# .LL=>ItR!> jR$Y4'*IkL .A93?~l k3-1=D# =p~1= .dQ-/>м# 1=./>4p d0n0Y?/D# 1=./>4pp j=/ e'>0# 1=./>4p REco^ ut 1=./>4v REc 8,# 1=./>4 j$Y4'*? à t$$dQ#$4 u$AZ j$ v/1 eJY!0n /[q## 1=./>41;J LL!0n#\IkL~1=I#'IIg!;mp/s\# 1=./>4/!REc E kF5Oo o5\D#V?I> LL!0n#\I9eɉK9#b11 -m j$ -/[o !3$1/>4I #=A? j!m#$A?^~$.LZ#Y>ng R k# OOo j!m#$A# j#4j!m#$A#p.Aq# .LL=>4Yo~$*o9$*D#p.Aq# k#|#!Y!;5 jlI#j9!.5 q#<9.1 j$Y!;m k0#p.Aq# Vl? t.F|$A19Z~lq#D# k 9=!Q? j.3I <<^ v/1 F-Fd~lq# REcIkLb'3n*1|## kF!04Ut !'.e/>4I$|9$# k#|#!Y?/ EbAAeAK!Y4K!ue- 0JZ K# k5ORY3!'eIkL##- w#- .O[$#V$A#V?#V?Y4'#4< à !0Eu!04'eIj9 'A99$*$AZjsQA'3#V?D#V?IkL .e04E?Y!;mo#V?IkLpo j=/IE3n0D#V?IkLY>nLZ ul=K'e j$b#\ \!8ȃ-w.d$$!RQ*!RQ*~9!/.$#\.$#\4~3 >4? l9 j5?14!b0nOl?p0e!Y./'34Q!$'<3? l9K9$AZ AeJs!O$3######- u##-;####! tw##! w##$##$u4 $L=0$<1E-Y1!\ ؊1l9It \0sF t?~9'11##'V#V$'D#$ =#$ = u$$cb4 kuI$#nEY1!u.};D#4<^Y!pL=> \0s1I#j!4Ug!;mo s!O\'34D##4D# J# J# J? w# J? vw# J? w# J?w#n94-/[\#n##n4'/E#4$[#4$[#4J[.#4J[.#4J.$#4J.$#4J#4J? w#11X11(11>*.11>*.^ !13? j$ .3|-/I#./b5n0d11d4J11d4J11|011|0q#b~d0UJ$3 EY>nLZ u.};D11|0q#$5# j!m#$AIj$p|};? \$'5Ug9;o REcD11|0q# '!'!o REc$3Ij$ k1n/.q# \$'5b33q# l9[ u.};D11|0q#D11|0q#IkL'3n*./>Jg0Vo^~/>4 k# M9$EY4'*?op0Ee3K~.50'3q#K#I u.};?Y?/<11|11| t.F|s0<^ È~lq#V?I $'5#g'F/J5\D113?o113?o -/! j9!E? j$ u.};? REcD113?o Q-/>4Ut?UkF!0nIj!m#.'!pp*'su.};11V11 -m11 -D11 -Ij$ E!0n !*IE u.};? REcY=OZ\11 -Ij$-m[! u!;#o11 1sKFZ5F!l>5FE\#D50Q3$50Q3$5m.5m.Ooee K'ep $'5#VI V t Eb0-/Zb<<4^bY4'*?b0-/Z v/1-045'1np#$Oq#b<<4 t k# k1> t.F|$A19Z-*K-*~lq# Ke j9=! #*'AK>4<e jldIkL~9!/Z-1=It!0oE!pneeeee33e33sQ#sQ#ss5'#5'# w5/[5/[5/5JA5/5JA5#o5#o5#5#w5!/>Ї5Ї54Q*.54Q*.5 '55 '5 w5n0d5n0dD5nLZ35nLZ3p3|#^bY!0t.F|$A195nLZ3p3|#^~J14< j!m#.'\b11|0q#<55nLZ3p3|#^ #53?ob<<'/1I#tZ kF!0nD5'#-mV-/5'#-mV-/(5'15.OD<-.<-.<54-[o<54-[ob0nOlI bY'F!04be- j9 'A9 t.F|s0V?<11|0q# j$|};? ul=K'e<9d<9d<9/$d<9/$d(XXXx(((((,68Dgvg n'9 u!04'eU8N^ k1=q#I\!;m*Y>U~/J~-'gvgfgu=5~/>4D<1!04D<!LlI#5!p#q#  A/ اvg<< LL!04~1=b'A/>4q# k#Y4-LL *'0nOl<< v/1-04~1= j!m#$A? k# =#p|};? u$Q REcD<<Ї<4'A/>'A'n<#9E9E~lq#^b ul=K'e!'ep3d04'g'04'e9El9ED9E<9.1D$F.$A19ZVKKpo =<'IR^b=#~1;JKZKZbFɱ0n͛*povv *'0ךp*ZK.bFɱ04It?b11|0q#~J4' L=>*Y?#4-0n0~$9=>~sKZbIj$ L.d~J5'0KZ~3LZq# ;sIg'5? '\<^ 1=./>4p k5AQ.q#KZ !0כ*~Ee0ךY1| 55EI b u; K- tKZpoK9$A? KKZ !19~$*o \0s1n jldIE=/p >=KZ5\͚ E!.A# uQA'- '/>4DKZ '=? E/'3q#I  s!OVKZ Qc k1 5 t$$dQY!;I YvKZ j!4V?DKZ j!4V?It k# j#9>>- Ek00'5e#DO-.3-F.|4O-.3-F.|4?V?DO-.3-F.|4? .AlkF!04 v#nL5I؁kv

*Y0$1'DO-.3-Fd5<5\DU?s3d.4J4J??Ftwtwtwtwtwtjwtj/F7!B0LF--ct--cF-Ft-FF-0ct-0ct-0c t$$cp\9;-0n0IkLb9EJ-9Epo^ !1E4 13EKE?Y4'*F-0cA '#*DF-Adt-AdF-.dt-.dF-.5t-.5F-c=t-c=FV'}-#tV'}-#FV3F-/LEt-/LEFQ3tQ3FQ.tQ. wFQcF-$c[t-$c[F;t;U.3d3F;Kt;KF;F;t;F;t;F;-bwt;F;- wt;F;- wt;F;- wt;F;-wt;F;-;t;F;- wF;F=t;F=F;F4$t;F4$F;F[t;F[F;*.t;*.F;>t;>F;c=t;c=F;3$Rt;3$RF;s=F;sQVF;5t;5? wF;t;Y?/ E \!;5<^b 1$t> wt>U/.F>m/;cF>5t>5F>!LlF>!LlDF>>Lt>>LF>At>AF>-/[t>-/[t>-/[ uwt>-/[YwF>#t>#F>#.Jt>#.JF><t><F=At=AF=t=F=5Jt=5JF=c$LLt=c$LLF=|F!?=#t!?=#F!?Jt!?Jt!?JM)2^ 'e u.};? j!m#Zg=OZ\Ά= 3K3? *!R Ec^ -RE e<< )2^ N6,1s^ ~N2B, ;*~$^ 'e u.};? j!m#Zg=OZ\Ά= 3K3? *!R Ec^ -RE e<< )2^ N6,1s^ ~N2B, ;*~$^ 'e u.};? j!m#Zg=OZ\Ά= 3K3? *!R Ec^ -RE e<< )2^ N6,1s^ ~N2B, ;*~$^ 'e u.};? j!m#Zg=OZ\Ά= 3K3? *!R Ec^ -RE e<< )2^ N6,1s^ ~N2B, ;*~$5F!.33t!.33FL1F9Kt9KF9JIE '/=ZY3Y> K- .d<^Y'A'[\F.F|$A19DF.F|$A19F.F|$A51-9ZF.F|s0t.F|s0p*ZKEI=<'I1=4 k1[.Jpb<< \!;m=#t.F|s0$3IEQ-/>4Y4E!v.LL=>nn|4?b/JA v/Dt.F|s0$3IEQ-/>4Y4E!vvàbI '#0ךbK=3t.F|s0$3IEQ-/>4Y4E!vvv!3$1o /1.s0$3t.F|s0 j!m#.'\b11| j$ v<<'\Q-/>4^b~!Y4'*F.F|s0DF.F|$ !ct.F|$ !c EFZ9d5tZ9d5F#=t#=F.3A[t.3A[F.33t.33F[;F[*oF[9t[9F.9!/ˌF.$A19ZVF.ZVF.$DF.$t.$-Y!n0IE'F/~>VF.55t.55F.5Al4t.5Al4F9$1t9$1FRtRF.O[DF.=t.=F=cO.At=cO.AF3-0ct3-0cF3-0ct3-0cF3-.5t3-.5F3Qc>t3Qc>Fd#F3F=At3F=AF3Ot3OF3'/t3'/-~wF$;F$-t$-F$FZct$FZcF$!9/F$>t$>F$A*QLLt$A*QLLF$l>t$l>F$.O[t$.O[U.dF3t3F/=t/=FJ0c-=tJ0c-=FJ[.tJ[.FJ[$FJ#tJ#wFJ.tJ.F$$cF$$cDF$$c[t$$c[F$$dF$$dQF$$dQ#$F$Jt$J k5 t'b04Dt*LE*I.F.J^b !R E/'3t*LE*Iu-R=.$*Zul=K'eY>}-*dt*d}-AtA}-/=t/=}Q*9Et#*9E}t}-'#t'#}-'#[t'#[}-.3}!-* }!-cote-co /'#Zq# t;s= tR!>Y!;5ul=K'e .d^p-0n '}!}!D}>#=te##=}#}Lts!L 4E?Y>}#}.AADtsAAD}.Al4tsAl4}.AltsAl}.33$'[}l9}l4-[ts44-[}$-*'Dt -*'D}$*t *}F=At5F=A}$ >?3}$$c\t $c\}$$cL3t $cL3}$$cDt $cD}$R#t R#}'t5't5' twt5'~wt5' wt5'w}A}'A#}'#>cQt5'#>cQ}?$19?DF'|t'|F'0ct'0cIs/! '/F=~$*oY/F'0c3Qt'0c3QF'0cdt'0cdF'*F'*nF'3t'3F'.3*ot'.3*o tYv L.dIE à5IkL u;'3n*1|#;? K- t\t'.3*o #.5<5m.Y$'5~$F'*$<"t'*$<"F'|0ct'|0cF'#˽ct'#˽cF'5#Dt'5#DF'5e5wwgwg-/'jww0-(0--0-AQ-AQ0-.0-c;#-c;#0V-}3V-}30V0'3'D0V9$'#V9$'#0V3-9QV3-9Q0-/}0-/=J0QQQ s!OkL 5~lq#p\ t!Y./1|L*'3n1d>ךb !L=>bI~9;-0n0 u[c tR!>~l*~lob5n0d0Q-*#Q-*#Y>nLZ $'5#V<^;4 (~$Q-*#Y>nLZ $'5#V<^;4 vvp-00QF=0Q330Q5Q50Q5D0Q3Q30Q.0Q4V3$1D0-1lV0-13Q-13Q0;F$0;FJ3;FJ30;#$#0;#$#\0;#0;;0;*.$O0'3;;*.$O0'3;Y=3 ul=K'e^~9;-0n0< *'0n $'5#V<ߛ*bFɱ0nf o~$0;*D0;L30;3;30;|;1>0;1[$;1[$0;50; 33; 330;5;50;?3;?3000./.5./.501=1=0$0KV$AKV$Aj!4bI *ZKEIkL !OQ0KV$Ao0KV$A'0K!AED0K!AE.0K9=[K9=[0K9K9?bw0K|#0-'0-'D-'IkL u$R.A9~lq#$#nVI Y>^~lq#V?IkL t.9!/?3Q49?$A? $'5#VD0-Ol0-Rc3-Rc300/0*2Y u~3IvUes0*~?4?n0 jU3?/19?~3J!bA-[s/;?V.A#Q4Q-~3D*;;3333D##D#V#4'51Q!0!1Q!050J=0JeF3$1Jn#5#=#54-[5OZVm-L9-Lm-.9-.mVZ9VZmVd\m-/F=D9-/F=DmQ*9Q* wmQAm#9QAm#mQmQmQDmQAom-19-1m;m;-0n0m;-0n0D9;-0n0IkLb ul=K'ebIe*Z4EIkL K#\ItR!>~l*~lo EcDm;-0.9;-0.q# K-F\p As0'34'3Y>D9;-0.q# \!;m-1=IkL ãgZgm$Dm;-0.o9;-0.o *'sg1!u.};? #.5m;-c5'm;Dm;Aom;dD9;dD9;dItw9;dIw9;dIw9;dIw9;dIuw9;dIw9;dIw9;dIjw9;dIտwm;dJm;m;Q9;Qm->9->0c<'//0JLk^ 1=./>4pp#q#k#|#!~JL=>/ZV9!/ZQ$| $A19? l9 d0J t!-/D9!/Zg'04'eI4 \c4$1^pAn Ro j$Il9 k#Uu[! !A? .dD//ˌ/4D/|#/$>*#9>9>A559=55?39=?3bwm9mZ-A$mZ9\m0$90$Ut#m.m.9m.3m.3*9$$m.3*e#m.3*enI j9!.5 kR#'F|0q#Dlq# ul=K'e t?Y>nI j9!.5 kR#'F|0q#Dlq# q# OV'q#~3;.LZ4q#Dlq#IE/Klq#< !L=>I# R Y>nLZ ul=K'e^b$3 ?#-/Zp-0nO.303-A'3-A'03-.e3-.e3-.e w03;3;03;3;03;.LZ03;c3;c3;cbw03;c3;c03D03D3IkL 55EI kv -/\ ؁K-Q-/>43Q030D03LZ3LZq# 5vg^Y!$nLZ '/>4It?!QIkLYLU>=K '1I/13$?o e! uQA'-03LZq#D03L03-'3-'03-'*3-'*03-'*.$3-'*.$0dQodQo .LL=>4 j?1\ kv 55EI$'#*p~l !L=>Ik#~ <Dd/>D0d/>d/>4 jw0d3Qd3Q0|LL0|LLE|LLE*bw0|/>4~3LZ|'!oU- j!m#.'! E *'-./V3?~J#!0*~3'5D03JV03J03$'*03'503'e03'A3'A u; .dIkL '/>4IÈ godUu[c9$3'AY>nLZ $'5#VD03'5D0#05(0#05(0#05(60#050#05(0#050#05`0#050#050#050#05N60#05N80#05N0#050#0580#D0$$U4q#V?I# O.Fd~d$U4q#p g>nLZ ul=K'e^b !R!'e q#<9.1 tR!> jR$ '/>4D0$V$.LZ09#9#0.0l0llb9E s!Ok#|#!^ 1=./>4 l9 g3p*ZKEIul=K'e0$0$#0$*o0$*$*0$A#l.J0$A#l.0$9>$9>0$9=>0$.d$.d0$[-$[- j=/[Y>0$[L$0j?1!~1$^ v4Iv/1-04 k# u.};?*Y>0$d$d0$|#$|#$|# w03-FE3-FEq#p~1q#'0$A0d-A'\0d0d0כ*~9;-0.q#Y1| 55EI Y>nLZ*Ym;3? j!d0 k53-1bI '#0ך u.};?Y.!^b~1;Jb/=ZQ*~Q-*#'F|0 u.};D0d0D0d0nd0n 1=./>4EcpY> j!-mo0d0|#D|#D0JZl0E!04V0!0550F[q#D0F[0/>0/>4;/>4;? k# տE4JIM# t.33 .A94<0/>4D0/=V0/=V30/l0/J0/'#ZKo/'#ZKo j$~/'#ZKED0/'#Z0/'#Zq#D/'#Zq#I ~1=*Y>/'#Zq#IkL 0/'#ZKED0/'#lD0/'#l01;K.1;K. OV'q# jR$po9$*IÈ '*D01;01;o14 K- t\1;J!=*~lq#b<<4 L3'>Y>nLZ $'5#VD1;Jt.F|$A19Z \0s1I.F t? tvkgvg~gߛ.1;J !#4b0'l.JI#ku [K\ E j9e!~Q-*#Y1!u.};D01;JD01>01l.J01.301d/>4;l1d/>4;l? tR!>b àY4'*?*b~lq#Y4'*?p~JA'F|0q#0nI 9?0#*Y3Y>D01d01|001J>4D01$01$'#1$'#E*<^b Fd/p$U$E*[K! s!Og?/D01e=0101q#V01=1=Y./'3q# .50'3q#Y'F0JL=>;n0d0JL=>0JL>0J5J50JAeD0J5O0JD0JA0J4D0J5'00J5'00J<'/=J<'/= !V pn0<^ !V  j!m#$A? E~J<'/=D0J<'/=D0J4-A.J0J#0J#4D0J0J4'V0J4'V.0Jn#'0Jn#'0Jn#'l0Jn#'$'D0J4$'5D0J.F.J0J.F.JD0J.FED0J0Jd0J#V0J5nF.|40$$1=$$1=0$$1=$$1=q#*~1l.Jb/JA u.};? REcD0$E*[K0$E*[0$10$11[.$11[.0$1?sA90Em-*$Em-*$0EDED0E0EdEd0E#3E#30E#=D0E#$AE#$A0E10E1E0E1'D0Ee0nEe0nb9E jld'3n1dUj=/p #ˏI !mQ. t.F|$A19?e1;0Ee00Ee3K\0Ee30$\Ig$'5I 9;/-Z *'5$Ut>!Ll$3 u.};?b0'l.JI j=/IkL à^ AeD$>D0.A.A0/1J/1J0##0#D#D0RLERLE0eKo0e1De1D0e4<$De4<$D0s#s#0s0sn0Vsn0j9e<9*I ~$Ulq# 19D0sn'0 L L0 < <0 59?0D0 <\Il9b'A/>*~9!/ZjldI.d'5e#4p j$ $'5#VI *'0q#!R Ec~~E1Eq# 6BUJ 3? l9Y!/.U##'#*#''/'3q#D'5e#4 v<<'\p^V?I#!3$1/>'5s0'3-pY>^ $'5 !; Ae4I#je#*DK- F\ 4E? !3$1/>4I#je#*I5 66 j9 'A9 8,K- t\4E? !3$1/>4je#*DK-Y>[!=oK- j!m#$AI#*b11|0q#D*K-FK-F!~1;J*K-F\*K-K- Ub 3$F!Aq#b#0? E \!;m KK-l! Ub 3$F!Aq#b#0? E \!;m K*KD*K*K>5F!l'*K4K4*-O-O-Obw-O tw-O~w-O w-O w-O w-O w-Ow-O w*-OLZ#\!LZ#\Y>nLZb0L[l.JDdAK\|53E>$E>$/*D#.>.#c>c##># tw># w##>##n\>n\ àߛ*bF# kF<$d<#p9?0I$'5#VI4 v j#41;4/>1;4/>4V1!R!1!R1d1 !1 po5ec=!c !Y3=!c g3sO=.Oq#bY-/1d $'5#v<<'\ E j\4IkLbO-.3-F.|4?àssOo=.Oo j=/ q#IEb~E1'It? 19 j9!EZ3'5D55=554q# k#Uu[!~9!/ZZ;? ؐuv\.A# 'q#IE s!Og?/It k# gRI$3A#o\.A#ob'3n|'j=/[$A? tQc E #lY4K\ j#<3KED\.A#ob !R -|4? EY=OZ\Z?/E19/ ' =1\ .5'Ij?1! )p #/Z k5 1!/Z -1$Ig;0- 5 \4*~>ˀLs0-ߛ*Y$9b/=Z/[Q4D/[=/[q#YKL-04E?Y0V! E K-5\ -|n\=/[q# J5Oq# j./!=.$*ZVIE k1n/g9L-[#Qb u.};/[q#D/[o3$13$1o!3$1ob0-/Z u.};? !JY'11E4Y?/D3$1/>!3$1/>4bY!n0 .LL=>nj$b04pA#=A? -F'3;?$4 \$'5Y9;o REc<^ REcIg4'*? $t~JL=> ؝)+^F$'5#! Z4Eٿ.5bt~JL=> '3? (N(2 )+F$'5#!-1=I#5!o4D3$'!3$'O.3*9-cV9-cV*9Q\<;9Q\<;*..~$*##*###!w*.F*Z;Z;?-co t?~JL=>*~/l!^ /=ZQb=J-ZuQA'- (6+*#=#=*4;* Q-/[*Z9*.LL=>D*.LL=>*.LL=>nV*.LL'J*.AlV*.|1.|1*.33-.33-*.3|J*.33$.33$*.33J.33J*./>JV*./>JVl*./>JD*./ls$D./ls$Iw*./lsD./lsD*[!9[!9*ododU|LL*.$*K$.$*K$*.e0D.e0I u.};? REco*.e04E.e04E? k1>b0'/>4~3'A È-0 s!Oj!m#.'\'/>4 !1e#4q#p F-F.|Z$3IkL s!OV'/>4 s!O#J14YD'/>4 s!O1=./>4IÈ~3'5V?D*'/>4*'/>4D*$*$**$\$\po 9-'.Ol?K*$.*$*$c'/>4*-[-[V?< ul=;? ;#4ߛ*~J#<'<^ ! ZY4'*D*>Z$>Z$*[K\*[Z[Z*[.c[.c*JJ uwJ w*JVJVJV*bwJV*btwJVtwJVwJVwJVwJVwJVuwJVwJVjwJVw*JAJA*J#J#*J#3J#3*J$9'J$9'*$$d$$d*E!#E!#*EE uw*E$ !E$ !*E$ E$ E$ ? w*$<$<*$*$*$'Fd$'Fd 9o*$'A$'A*$'A3$'A3$'A3~w$'A3 w*$'#$'#*$'O.3d$'O.3d*$R$R*$R#!$R#!*$R4$R4*Ro*e-/*s33*5JF=55JF=5* 4 4*5?-*4*'V*'*'/J'/J*'/Jn='/Jn=*'#0Q'#0Q*'#9-/'#9-/*'#'#*'1|0'1|0q# -1Q\! -/\^b Fd/p~lq#I#t.F|$A19D*'1J'J*'A*44*?/?/*?#-/Z*?#-/ZDwwt'54Jwwwwkw!!6!8!;3;3 w!;3!KJKJ!F!0c0c!0$d0J!0$AZV!0JZ0JZ$|^b j$ s͚Y=OZ\!0JZD!0J!0$Y=OZ\^b~!Y4'**'0q#j[o E~1=Ut !L=>Y=OZ\^ !OR j[o LLE4Ij$ K*'0q# EY>bI L\J*'0q#pY>'0q#V'0KEDO;*#*O;*#R;*R;*bw*R;w*R;w*R;$9#*R;*YwR;*D*R;*D!=!=$=$!LL!0LL!04pQ4Q!$'Is!Ok#po~s!LL!0n!LL!0n#\DLL!0n#\IkL s!O!?bF}!OY/\!LL!04DLL!04IkLn94-/[\ k# +2U9?d#.$?/9-/19-/[!U *'!1dךY=$4J[p KDLL!04IkL~KV$Ao '/!b4 u.};?~JAe.d>w![F-m>F-m3U-9-/3Ug9-/.3-*U;'/-[3-[3-[!w#3#Ȟ53!QEdQEdQE wdQEtw!0ZV!0J!0JZd0JZ'F|<9o^ e*Z-/>4 k00.Jà5I *lE35\D!0JZDd0JZ< $ !!ߛk1=q# u.};D!0$1EZ!cJ5!/>!/>4D>d#!O|D|ȏ=|!=-F9|<-F9l/.-F9|-F9Yw|-F9 Qd#3d#|3||$3|$|$43|$4|D3|D$3$!~wȠO53O5 tOR?#3R?#!'!/=V/=V!/=#0!/=Ao!/.3/.3 w!/.3/.3!/3/3!////- w!/19.\!/1.s0V!/1.s0V3!/13$?o>>0$*oD>>/Z>*$ 3>*'A>=A#=A? j!m#$A?~Ee0>A>}-K>!}-K>>A[!=o>A[!=D>A|<9>n4#n4? '1|0q# k#Ym;3?K>ˏD>$1#$1?*^b'3n*1|#;? k5OR>'/=K.>O.5J/>>O.5J/>4V>O.5J/>4D!1!/Z!1!/.$A!1l93!1l9.$!1l9D!1[1[!'q#D!'.OV>=\eD=Zs0=Z9sm=.cscsc=#5#=5E55E OV'q# EY//ob3AEl9/II3'Ab3AEl9/D=5ED=?19V\=? 5/Z\>#bw\<-?D<<-?IkLY>n v(('#!~;L3*9.3-319 ^ vgven v'#! ;L3*9.3-319^ vgve<< )2^ .U68+1s^ ~77 vgt 7U)B,U7\ =9=9= w\n/Ko./Ko !E u.};?Y=OZ!^ j9!E?α0n\R09 9ZD ZIkL #$Ro!'#'#'#! tw'#! w!'.'. QA!' 1' 1!^b '33Uj!4 ul=K'e K-F! E u.L!Y>I#3KLE/ Ep#$O!' 1!Q' 1!Q \!;m u^Y3Y> \!;m' 1!Q \!;m u^ j!-mo k#|#! s!O #l o* u.};?Ym$D!OO!OV'KoOV'KoY>nLZ $'5#VIRl9$'5#lq# !1E4Ib~!Y4'*?pb0$'ZD!OV'OV'q#b vp E u.};? ul=K'eOV'q#~'5e#4bR;>\Ig=OZ! E9?0I#*b5J? ul=K'eOV'q# s!Og?/<^b !J j9!E?b11 -m!OV'q#D!OQDOQD!3$3$!3?#3?#!#D#D!#4D!5?*-!O>O>~1d~l=$nOq#DO> kuI$#nEY1!u.};I#j!m#Z ~>D!O.J!O.J;!OOo!!-0!-/[!-/[o-/[o \.A#b<<'/1IE s!Og=OZ!^Yv à EY>nLZj!m#ZK-F\!-/1d!-/1dD!mQ!03'Ol!=!9-'.Ol!1Q*o1Q*o K!AEIkL !F-0c!1QJ!1!0!1=#!1=#!1=#D!1=./>!1=./>4V!1=./>41=./>4q# l9~1=U<[o^/=ZQ '/>4q# '/! `!1=./>4D1=./>4I#*V?IkL àV'!pb !JU-co~J!1=1=4Y?/<^b jE3!13-[!1|1|4v/1|4 ;FdI  s!OvY?/D!13$lo13$lo -./'/ #$1?1d j$p0e! s!OLL!0n#\D!13EKE!1e<!1e4 j'/EA.$#\!1e4<^ k3-?< !R -?<ߛ*b~sn0u$$cb4 էvg!#!-0!-04D!L3$?wwwL-F=-F=L-F.$-F.$-F.$ lV.L-L-|n\L-|4L-04$L-04EL-04ED-04EILL!0n k#|#! t.F|$A19Z s!OV^b~J14'/!REc E \!;m-04EILL!0nY'F!04~KV$AY!;mY'0DL-.5 E#LV0$V0$LV.V.YwL-/.|V-/.|q#<9.1I j9? ~Q5 t? 4$UK9$AZj?1L-/.3L-/'3'Dug !Ol^ j> !;IkL=!!>!L![![L**L!/L>Z9>Z9L>#=>#=>#=;n#L=*[Q=*[QwL=#Q*$=#Q*$ ! u=#Q*$ wL=e5=e5LL.}$F34DLZLL3L3*DL.A<9;L.d.d-[#Q!g !-*oI |#L.dDL.|L[VL[QV[Q<1!04IkLp*'s ~><^bY'5L[L[*oL[cȸ[[cȸ[L[c=D[c=DL[#[# 5'1L.5vgj^ d.Fd s!Og?/ E j!Lm9$LLm9$LLLlL.L.L3Q-AQ3Q-AQLd*Ld.FdL3$$3$$L3$RL3$Rm;L3$Rm;4DL3$RDL3$?L3'04'q#D3'04'q#I Qc k55IkL=.$*ZVDL3'E$'3L$-/DLc3ELELE!0LE!0nLE!.A#LE=?193E/K !0$A#l.J^b !1E4b !04b4 u.};?~JAe4~=OZ;#L//L/!REcL#D#D#Iw#Iw#IuwL#<0$#<0$L#D#D#IwL#<0$#<0$L#0$#0$L#0$#0$L#$L#c#c#c twL#D#DL5}Lee*~wewewLes0es0es0 uwLes0ces0cbwLe*e*LeLe!FLeeLeLe!e!Le\e\Le'>0e'>0?U#c .F.JDLe'#eZ9e'#eZ9Le'# Ve'# VLs0cs0cLs0cs0cLss- kwLs3Q5s3Q5LssmssmLs<s<Ls4Ds4DLs4s4L55 e!F! j$ .cK5'3n*1|#;? j$p*1|#;? \!;m^ LL!04IkLY?/Ik# E/k5AQ.q#DL5>5>L5'ɱL5?0c.5?0c.L5?55?5L'>D'>DL'A#'A#L'c'/$4$'c'/$4$L'c'$c'c'$cL'33L'33L'/c.'/c.L'#0L'#0D'#0IkLbQU-m[!p-0n s!Og?/L''L'$\L5L'5 '5 L'5''5'L'eL'L''? q#K-F\- !? j$ 1=4Y?/!>!>33K33d5d5/4-F[#5##=V#=Vl#=V.#=K#=Ko#=#=KE#Z#nd>nd9!/ˌ$LLe!$LLe?w$1$|n0D!$1$|n0IkL^ $R \#~'34'e [K\ E3*# J?Y/l9!R Ec^ kLE#.54?e<< )7 N1s^ ~(+B,EA!EA!EA wE!E!E w!E w!EYw$<>3=V=V*bw=Vw=Vjw5=;59;s4=l5c>=c>5R$$AeAeAAeAEeAEAe4#e4#Ae e Ae#AsLLl9sLLl9AsLLl9DsLLl9DAs<9s<9A  A '#A '1A '1oA '1DA RoA R  R ?#-/ZIkLY!;mY=OZ\ R p9.Fl.J~=OZQ5~3It? ' [$Zb!14E g >A5'#5'#A5'?A'QA'QAA'Q[.'/A'Q[A'=5'=5A'A'[\A'oA'.3F='.3F=4~wA'33'33A3#3#A'/1>F=5'/1>F=5A'14'14A''A'?#'1'?#'1A?'#9U< t $4 U$4?1!p ' te4 1l93~3<^b $d EUNp UU *'*pO.9>$4?1w3-.e'5nDw*R;3wgw9--c--c9-FlD9->->9-9-99VL9V3V39V1[V1[9-/.33-/.339Q-Q-9Q9Q*F$$c9Q*Z-1D9QA9QcQc9Qd9Q#Q#9Q#!9QDQDQIw9Q#9;9;V;V9;9;*o;*o9;;9;;9;/J;/J9;;;tw;w9;s;s w9;sD;sD9;5;5? tw9;;9;nA;nA9;4/;4/ w9;4>> $L=> w9/c-/1/c-/19//9/9/99!/V.!/V.9!A.9!//[c.!//[c.9!/?n09!/E59-AZ!/E59-AZ 1l9.$*Y1[*d~3 !A.9>*s0cD>*s0cD>*s0cI[#9>cd[>cd[9>s>s w9>5>59>449$!$!9$L=9}$$c}$$c955933? t5A9/\/\9$A19$A19?bI11| j$Y4E-s!Og?/D999== w9$$L$$L9E-cE-c9E.J9E#E#9E$RlE$Rl9EE9E4J9ER$$9$$9$9$'59$'9$R$RQ?~;*I= .d '! k1n/.o jR$Uu!3 .d$R j$~$1! l9 E!.A#UuQA'- Fd/^ 1=# -[b4b'3n*1|#;? u-FEKE9$R;$R;$R;w$R;w9!9!9U!9<'<'943O9''9'F='F='F=4 w9'=e'=e93?3?9''~/'#Zq# !I#k5AQ.q# *'0nOl?^ $#nv/1-04LZ!b' -04EI \.A#p-0n u.};?Y?/'!/E? k5AQ.q# E~1= A/D'-1.33-O.5'I# A#$IkLK#4Il9~Q5IkL 11=b=$*.. j09'lD'lI#*Y3Y>I/'#Zq#D9'D9'/19e'/19e9'#'#9'5'594J4J9R!9?!JA?!JAU!9~9$.9?$?$U!JA9?1=9?1$ \.vwv쿲-OZ9Q*vgw./D#vQbwvQ vwvQ Z<'0!v- j-0n0D>nLZ>nL5>nL5D>nL>nL?ov#nL?o*~Ee0npOV~lq#I'! j$ kv 55EI ~ <n4!.A#E......9.v9..0(.0(.0(.0(6.0.0(.0.0`.0.0.0.0N.0.0.0,.06.0.0.<}Qv<}QQ.3.3*.c$v3*.c$ w.|v|bw.33'ɱn.33'ɱD./-.v./-'/.v/-'/../FVQ.//0.//'#.//'#l./1-0./1-0n./1d/>4./1d/>n./1|0q#Dv/1|0q#IkL $A19? EY?/Dv/1|0q#IkL -04 t*LE.F.J./1|./13./1E4Q./1E4Q./1$./1 F-Fd./1 ./1 />v/1 />4bKZbFɱ04It? àY'04'3V?D./1 D./1 Oov/1 Oob 3*Ut Ms0U|c!Y?/v/1 Oob0nLZ ul=K'e l9 #$Rd* 19Dv/1 Oo !?RE*pov/1 Oo u.};? LL!0n#\<^b 1$4 u;~d0D[ !L> !OQ .O$ d0$1EZ j#4 !1K3'3;~;#-p KD[#[03'J[0e[0e 0ep# K\ t $Y1-j./!~3'A~9.3*9$$*b5?4-pYR!# 8+B[0eo[ [[\[o o o*bKZY.A#.LZQV?D ot!9-O.E o '/>4It? Qc> 1=./>4 o 9-'.Ol?1q#Y./.3;l?KsD[*[*Z[*ZK.[*ZKE[*ZKED[*.O'V[*.O'VD[*'[*'D[*'0 *'0ךn4'/E v//'#l? t? !U 9.FlY?>!Z .}$F34I'3l9b$*.Lj!1n[*'sV[*'5[!'l[LQ4D[L!0[L!0[L=> L=>~J!mQ/ EY4Kn0K-F!^ e'>0?U./1$K- 4ED[L.3[L3'> L3'> 4;? -04EIk# k3e0Q 'Iu\.JI b$1'3q#Ut~!UJY4'*?p =V-p* L3'> Q-/[! k# ;*Y!A/>4 k5Ap d.Fd?'e Q! $-/D L3'> k# k#|#! t.F|$A19ZY=OZ\ k#Y4'#4 t!9-O.E[ c u./l[3 3~/'#Zq#b/JAY>nI Yd!1 \!;m 3~/'#Zq#Y>nLZ[n0D n0I#*Y/V3~1=I uK[b/=Z n0I#j#4q#p~9.d^ Ae4 3$R*V?<^ j9!E?Y./'3q#ߛ1=./>444I#*V?D E!- !/;cIj$ /=ZQY4? EY> REc<^ !L[l.JI#\<- j#4pQ \$'5I#k5AQ.q#g'04'e \$'5IIM$$*<p u.L!~?0d *'0 s!Og?/<^~9;-0n0< j\n͛OV'q# N*.3LsuQ0¿!R Ec^ .d? 8Bs^ ~8, s!OV N*Q .nu!;#o5\D Y> UJ<$'Ig4 Y>9>>J Y> \!;m^ g!;m E K'e Y> j=/[$A Y!;m j-0n0D Y!!co 1e4'5 j9!E?bI!'e~J# j# U15\$3IkL~$A#l.J U!co t!9-O.Epb11| \!;mfg=OZ! .5?Yn[V ׀?#-/ZIkL $'5#5n0d jldD[d[mQ[0Ee3K[0$'#4[ž1># ž1>#vg $d k1=KE<^b 'QnnK.V?IkL j9!.5b<[\[L- L- \.A# Ep-0n s!Og?/^b ul=K'eY'5?*b \!;mY?/ \0s1[|}; |};? u$Q<^ v/1-04 !R~$1?sA94 u-R[/s\[/5[#q#V #q#$$1=q#pY?/I#*Y=OZ\ #q#.A9U#=A?9?0Ie14 REc /19.\pl.JmQ #q#$'5#kL~Q5 #q#$'5#k# .Alu.};D[#q#Vl #q#Vl? g3Y><^ v/1|0q#IE j#nLZ $'5#VD[OR[[V[n;[4$[$*'0 $*'0 $*'0כk5OR $*'0 j$ufv A//o E u.};?*Y>j9 $44 5Y'?Y'/o=!R Ec^b0-/Ze<< (13 ؝8N[OV[O.[.AKo[.A[O.Fd[O/>.$Q#v$Q#.v- td.$Dv$Ie *'0q#p !3$1o~$'#ˏDv<<'\p j!m#$A?p #lY4K\lVl!/l!/DlD.OQvOQ.O$vO$wwww-OA>A>AU.>c[D>c[D>#.L=>#.L=!JA=!/=!/? w====! jw=5=5=5? w=5? w\\ w\0\0- uw!?;--9!?;--9##.3*-'.3*-'./J./J[#[#Ug9.'/l<'$l<'$/3$$$Q$Q w$Qw$FD9!/D9!/D$9Q$9Q$9Q#$9Q#$9Q#-~w$9Q#- w$9Q#$9$9#$9#$9#bw$9# tw$9# w$9# *R;$9# w$9# w$9# w$9# uw$9#w$9# w$9#Yw$9# jw$9# w$9#D$9#D$9#4b $'5#d0$'5#$ k53-1p~'5e#4~J#4I^$ *l.JD$'5#1$ !J$|\$'5#OV'$'5#OV'q#pb u; \!;m u.};$'5#kLb11|?/=Y>$'5#kL~|#Z#\ \$'5#kL~1q#9!/ˌ$'5#kLpLE/s0D$'5#kL k1> 'lIK$'5#kL /=ZQY4? EY>$'5#kL gvg <-msm# 5 $c'/>4q#^b~1;K.V?IkL~lq#D$'5#kL Zu.};?b<<$'5#k# K-Y!n0D$'5#VD$?$?5'Q'Q'Q~;3$IV5/'Q w'QQ''Q w'*D'*A/>4D'*l9'*l9'*l9bw'*'*'=#;>;>bw;> tw;>Y1;0cc;.;.cK9=[K9=[! wK9=[! wK9=[! wcKKcK$K$cK=K=c--? uwc-3-'#>#c>#9>#9c>>c=Vc=>=>c=#.Q=#.Qc=5=5c==c=<=<c!O[!O[!O[wc!!? v<<'\pY$O4c!?Dc!?REc9V9Vwc9!.59!.5 **[c.FF.FFc5c  c.3A$'5c././c[ZDcooco*co9>c94Q!c94Q!cc$!9d5$!9d5c$>.A$>.Ac$9$9c9d59d5c$9#$$9#$c$9$9c$.'/.$.'/.c$c$cc33c#c3#cE!QE!Q~$'#3Y> *lEDcELV.ELV.cEL9-EL9-c$4-/;n$4-/;nc$O-0D$O-0Dc$Rl$RlcLLc<$0<$0c''ce#}ce#}cce..ce'=e'=ceOleOlcs<'#s<'#cs[s[c !F= !F=IMg'1=EAQZ<c 9# 9#c 33 33c5J!F'Ac'm'mc'!93'!93c'3'3c'9'9c'9#'9#c'33*ELL'33*ELLc'#'# twc11=11=c'113''113' 5J.'/Uf'Q[.'/Uj?1^Y?# \! #*~9;-c5' =b9>n<# 5J.'/uuw3u- e03-FEKE3-0cu-0cY4Q*;*.q# $'5#jld K- d/>4p K-F\3-0$u-0$3-03-0U#!$ j#!Z K<^ R K#*~9;-0.q# $ v//'#! \1JbA-[~3Ij#<13Q*pk #D3-//!u-//!3Q0uQ03Q*-'uQ*-'3QD3Q*5uQ*53QuQ3Q#F=AuQ#F=A3QAduQAd3QA3$uQA3$3QA'-3QA'-D3Q#=ouQ#=o3Q#uQ#3;3;5u;5u;5? w3;Du;D3;d04'eDdu!d!mdL!5u!L!5dL#$u!L#$dAVdA3d9#'Du!9#'Dd9ld.d./c'9d5u!./c'9d5d d#cu>cd#Eu>E!Ywd#dJdJ;u!J;wd5#=u=#=dJDd<|u\|! wdu.F>|};#D|};#<9.1|};D|};u.};? REcI#\$'5Y9;op #lY4K\^ 4EZ#9.3$<$19Zk5ORu.};?f[Y=OZ\q#g 353|0c|5uZc|5|!F<5uF<5|u|\>=u#=|!RuR|L|L./u.L./!U4q# K\^bK9!/KZ$3 j$~1;!Y>n< Ec|9|c|3u.3|/l|#u[|#0#|#*u[*u[*-~w|#*F=Au[*F=Aw|#*'u[*'|#*u[*|#u[|uo R!|'n0|'n0Duo'n0I#*Y>|#c|#c-|#c|Ju.Jw|Eu.E|1u.1|<||Ju4J|D|;|K'e|K'eD|44d|5|R>u.R>3303d53$Q3$QD3$FQ$Ou$FQ$O3V3$AAo3$AZ3$A|#!;3$9u$93$9u$93$u$ w3J*J3JA3JAl'*[VuJAl'*[9E~lq#-11o^ 9QAoY'04'e-0 !0JZD3JAuJA3JA$uJA$3$$c3$1!u$1!3E>uE> w3E#uE#3E[uE[uE[!'5A-.|D3$u$3$ ;u$ ;3$4cu$4c-*Y>u$4c-Ie'>0? .F.JY>nLZ *'0nOlu$4c-Iu-R*~1=Y> ul=K'eu$4c-Iu-R-1 u.};#<9.13$4cu$4c u-Rp 'lDu$4c u-RU!; t? !;3$'u$'u$'bwu$' w3$'u$'3$O[Du$O[D3$R3$Ru$R3$R=343'u'3'Qu'Q3'=u'=3'#*u'#*- w3'0c9'5u'0c9'53'*R.Au'*R.A3'.A.u'.A.3'u'3'u'3'.u'.3'#u'#*U$9Q#3'u'~-Olq#^ #RQ*~1|0q#~$OU u' !3'#[u'#[3'<9=u'<9=3?*u?*3?*u?*3?/19?u?/19?Y'F1$1'3q#I K#4Il9'3n1ds/;? j'/ED3?/193?/193?#mu?#m3?##u?## w/wtww;3wwww///-0AeAE/-m-*$-0-*$/-m[-m[!po^ uo'n0*Y!/.$n0 v/1|0q#D-m[!U*b11 -m j$ >=!L=>K=3D-m[!U*poY>nLZ \!;mY'//;D-m[!Ue-*-Fd k1 5 k#|#!Y!;D/-m[=/-m3'1-m3'1/-#4?e-0 4?e/-0c--0c-/-0c>-0>/-0c\-0c\/-0d$-0d$/-019=4 jg4vuU(g4/-**c-**c/-9-1K-9-1K/-[-[/-[#Q/-/-c\/-co-co k#Uu[!Y!;mbO-.3-Fdpp*'s\!;m #O.5J/>/-csD-csD/V.A#Q0/V.A#Q/VJ!VJ!Q~wQߛ*Y4?^ !RK#IkLp-0-/>-sV-AoQ-Ao #0Jd-F'3;? $ -04$5<3$$Q5<3$$LeQLeA9.QA9.c[Qc[#Q#Q#*eEQQQEQQ1$R=nLZj!m#Z Y=OZ\p*'5?^ !3$1/>4'e .e0D;coY!0J*;? *'04I#*Y=OZ\/;c$O/;c'D;c'D/;J;J/;5J;5J/;<9;<9/;4;4;4- uw/; ; ; - w; - w/;n#;n#;n# w;n#w/;n#=;n#=/;4J;4J/;4J;4J/;4?#;4?#/;'3|;'3|/;'?-/;'?-//;;?#;? w;? 3d#;? w;? uw;?Y'/;?Q#;?Q# w/;?d#;?3d#~w/;'33$;'33$/-9;'-9;'/-c.-c./D/<-m'44D/<;.<;.//$/$///-c-c/KK*~!UJY4'*I ~lq#V?D/Kmo/K=3/K=3D/K9!/KZV/K9\JK9\J/K9!RDK9!RD/K9K9/KsD/KDKIw/K/K-'e>/-'s-'sw/-'s-'s tw/--/-./V3/-./.|>-./.|>/-./'/-./'/ #$1?1d/-[-[/-?=-?=/-?\-?\/-?#;-?#;/-?'/.-?'/./0V|503|5/00-[0-[/00V30V3/00V3'/0V3'//00;#0;#/00E/Zc0E/Zc/0*J$'A90*J$'A9/39[#!039[#!/00!/0A.330.33/0A 0A 0 /0/'550'55/0/'5-0'5-/*1.*1.bA/*D/!-*$R!-*$R/!Qo/!QD/!;!;/!'e/!'e/>!'e/>4pY>^ kF!0n*Y'F!0ns0g1-!'e/>4 $R 3 L\J!$1d !!1 1 l9 j9!.5 j!m#Zul=K'e!'e/>4 $#n!Eb0-/Z L\J$'5#V<^b9$*$A/!'eD!'eIkL LL!0n#\IEb #.54? u.};!'eIkL àL'3#\IkL s4# j!m#Z j$~9!/Z\!;5D/!'A/!mQZD/!mQ//!mQ/D!mQ/IE OV'KoY>nLZ$d!= !OR/!mQ.//ZV/Z'D/.[/3;D/|#|#!^p$*'0 j$ k#Uu[!Y!;mouv^p$*'0 j$ k#|#!Y!;mo/!o/!oD/!94!94/![0c![0c/!cE.!cE./Q/F$'5#/=$=$U'>D/<</#?c#?c/O[/!/!/!/E/>3<$9#>3<$9#/>o./>$'>$'/>4V/>/=0.=0./=l9=l9/=5/=Ao/=|#=|#/\9/\<-//-*K/VQA'-/-13/>/K9!E/9$/9$*$AZV/9$*$A/9$*D/9?d#.$?/9-/19-/[/s0V/'#/..Ug'/Z9-Z9-Z9-bwZ9- wZ9- wZ9- wZ9- wZ9- wZ9- wZ9- wZ9- w/Z9-ȃZ9-ȃ/Z9Z9Z9 w/Z9/Z9.9.c$Z9.9.c$/ZcZc/Z51=Z51=U#=K 19Z 13-?II#bpYopo/Z LZ9Z LZ9!^bY4'*? à5b4n4'I#!-*o -FlD/Z L.3/Z L.3/ [*oU!?<^ 'Z;/Z \-'s/*d4J*d4J/0?<3-R0?<3-Rw/4#4#/.A#Kn.A#Kn/.A#J.A#J/.c.c/.dO/$D/$*.L/$*'3;/$3$3/$A9*-/$A9*-//$9-/-$9-/-=/$9-//$9-//w/$9Q/$d0'3;$d0'3; =/[Q4IkL ÐUU[*' R p9.Fl.Jp ' u'~Q5~3D/$|4E$|4E/>!>!/J.cJ.c/JlE/JlEo/J$A19J$A19 OV'q# Eb0'l.JI b u; \!;m u.};/JDJD/J33J33/J4Q/J4A=J4A=/J 3/$J$J/$Jc$Jc/$E$E/$E$E/EE-UQ4V3$1D/E-O0cE-O0c/EE! k# [*$E>$/EnEn/EsDEsIEsIw/Es/5#/AA/'9-//-'9-//-'9-//-*pn;/'35'35/'3|#/'3n/'3n*K-F/'3n*./>JV'3n*./>Jg0Vo'V.q# u;$d0'3;Y./.3;l? j-FdD/'3n*1|#;/'3n*1|#/'3nL-/'3n|'V/'3n1d/'3nO;̷/'cRZ'cRZ/'519'519/'5'5/'5n'5n/'5'nI#[!=4p 'F|0Y!04E^b~!Y4'*? !3 /=#0?Q-/>4b*/[q# ؄#REc#REco#REcDREcIE k#Uu[! K- t!b0A'?>#Z9Z9Z9 w#ZcZc#ZcȠ#ZcȠ##Z$Z$#Z-Z-#9$LL9$LL#3#3#3# [# 5'1#.3.3#.c3.c3#.3|-/.3|-/ tw#[!>#[!> #9.$9.$#9.$c9.$c#J5J5#l!0c.l!0c.##3/#$#$=5$=5##[q#D#J#J-9E#JF.F|$A19ZJF.F|$A19Z k#Uu[! K- t!Y=OZ\#$E*9$LL#$$<9[$$<9[#E$E$#E!-'3E!-'3#E!>E!>#E/V.#EE wE w#E =##ER$$#$#$4#$4q#D#$$#$D$Ik# '14-U-O[*# k1n/g4E-$3#$n$n~J5#o $nD#$nD#$#$3#$OZ#$R-c$R-c#$RZc.$RZc.#1e#kJ#Ek;k-5$6k6U2U}$ >?3A'Q[! v/1 Ij9=-1!Zp j!/$!bA-[b+8,Q- >$AL4D$$F!0$F!0n$F!0nD$F!04D$F5O$F5Oq#D$F5Oo$F<$d<#kF<$d<#Y1!u.};?=.$*ZV<^Y-/1| 55EI#n|4?~J4$'5D0.JV0'5e#k00'5e# uI [!=o=.$*ZjldD0'5e#D0'5A9.km.30$!0k!0k 0JZY'5?<^~9[k 0JZY'5?<^~9[- `$>k>$L$LF03$L50$<1E$LLZkLLZ!bq# j!m#$A?'#0<^ k5OR$L$L $9/$4$k9/$4$$94-ck94-c$c-/$4$kc-/$4$-Lk3-L-L#k3-L#-Ok3-O-O$k3-O$ tJ[$ -Y.3O-YQ4$Dk3*!R$3IELZ!b#k3#Ak3Ak3A- twk3A- .3*$$|AJ'0d$n$|O$k|O$$|O5k|O5dk3dk# =.Oo \.A# 'q#IE s!Og?/Dk# '?Y<^ !13? j$~=#k# .A9= u!3b<<!'eDk#po s!O#!QobF$k#Y>k#pe3q#<9.1IkL g>I#j!m#$A?bI1e<t?b~K!AE. u4 $'5#VI#$*.Lt?b~3LZq#Y?/k# uIj$ *lEk# k1n/g4E- t$$cIt?Y.k#Y!0nb!'e s!OLL!0n#\Dk#Y!0nb!'e s!OLL!0n#\I;4 vvv/1d/>4q# 9.3$<$19k# j=/[$A? EY!;mYK!ADk# !3$1/>4Y>k# ./>JVl? à5 t$$dQ!.A9*Y!;mo t k# J5nF.|4? '=? E/Dk# O.JY>k# $'#*q# OV'k# =$#!l?*~3LZq#b9EYLUlq#Dk# v/1E4Q $$4Ug/ j5'#0q#p E*Ue'>0?V?Dk# ;QQp1e4q# t*LE*Iu-Rk# K'e '^b .Fk# =.3IkL=Ao t$$dQ!.A9s!Og?/Dk# V'!k# j?1\Y!;m33q# u.};? \$'5Dk#U|#! u$AAop=.$*ZVIt?~k Èp-0n '=? !1E45\j!m#$Ak#U|#!Y?/I /'#Zq#5\<^ !0Dk#U|#!Y?/IkL 1|#\*Y1!V4?bepY>j!m#$Ak#U|#!Y?/<^ 4E? j!m#$A?ߛ0JZDk#U|#!Y?/<^5!lLV3DJJA$oJ|#k#|#!Y!;mK#<^ u~juv K-Fk#|#!Y!;mo-1=d4 j?1\ 1=#Dk#|#!Y!;mo^ v/1-04 k# à5~9;IkL #à k#|#!Y=OZ\jοt;R!;^p#q#$'#3Y>nLZ #.JIFɱ0n t$;* 8Bwk#|#!Y?/<^ 4E? j!m#$A?ߛ0JZDJ$k#$JJ4;.$J4$ADJ4$AJ'.AF$k#'.AF$$1>$1>-.e$1>4q#Dk1>lq#Ik1>lq#<ߛpL5'04'e k5AQ.q# E k1>Ym;<9.1$1=-Fd$1=$1=q#V$1=q#D$1=KE$1=KED$19 V/$A$1[.Jk1[.J-1=^ \.A#~s E '/>4q# s!OuQA'-Dk1[.J-1=^Y>Y9m;Q4 k#~$1?sA94 !FKk1[.J-1=!3$1/>4I Y>nLZ '/>4q#p uJA j=/k1[.J-1= pdnk1[.J-1=k# j9!E? !3$1/>4pY>k1[.J-1=k1=q#I\!;mp u.};<^b~sn0<<k1[.J-1=αA/KZ kF5Oq#Ik# j9!EZ\!;mpY>k1[.J-1=g>nLZe/\Y>$11>9!./k11>9!./$11E4'#l$1n0V$1n/Vk1n/\$'5b33q#p u.};?Y?/Dk1n/g!0ךb0'l.JY$'5Dk1n/g4E- t$$cIt?Y.!^ k1=q#I\!;mb11 -mk1n/V'\ !0V3eJ$1n/V3$1n/.$1n/.oEk kj^ #'k1=KEEVE-/k/EFlEkv^bY?/ j$ #.'? v#nL? \!;5DEAE5DEAQk5AQq# E 0JZ~$Uk1=q#!3$1/>4 k!0*EAQ/DEAQ.EAQ.q#VEAQ.q#DE#E.A[E.A[VE#3EQ=k5Q=$D$ =k =!$1dI4-c\$ =D$4$4$Z$4#k4#$'1$$0k0!=J!!' 1K9I K#4Il9Y?/ZV.A#Q4 !$1$1D$$O;#$53-1k53-1b/JA $'5#5n0dIg!0E~$ t? tvkgvg~gߛ.k53-1p u4IkL $'5#VIJlE t? t.$<~gߛv$5OR$O<9[ *'01;n1Q4D1;n0'3;1;no10VΔ0V1'VΔ'V1D1<-1<-D1KK1KK1K>K>4LZ!~3LZq#^ v4I9KI#9?D1K>4D1K9QK9Q1K9$AZV1K9$A1K;K;1K#4D1KsKsKs- w1Ks0cKs0c1K5JK5J à k#|#!~.50'3q#Y?/p #$R#Uv/Y!;mo1K#1K#DK#I à^ .A94 j$ t! .LL=>K#IkL~lq# >n\ t? K!'F|0q#p9?0!ORK#IkL $'5#àpb !1;4/>4u.};?^b~lq#V?D1-'3-'3-'3bw-'3 tw-'3 -'3 w-'39.3|1-'3 w1-'|#-'|#-'|#! w1-?#-?#1-1!-1!!c!!c1!=1!=!=1!AA!AA1AA1|<=|<= jQJ1441>#=>#=1>#.>#.1>4>41!$1d1!$1dD1!1[4$3 Eb0-/Z u.};D=# .3A$'5Ij5'#0q#b3AEl9/p .dIkL .LL=>4Y'F!04D=# j\n͚b t$$cv4I bI# s!Og?/=# j\n͚b t$$cp1=LE/o=LE/o OV'q#Y4'*I Y>1=.3D1=[.=[.1=.$*ZV1=.$*ZVD1=.19=V1=l=l1=c=c1=/1=/=/1=J!V1=J.=J.=J.Y.3O.$1=1==1=1=5=51=0.J1=Q.=Q.1=D1=!FJ<ߛ J?~-/=J .3|-/ *1ΆΆ! w1=Ά=Ά=b~Ά= twΆ=~wΆ= wΆ=w19;/-Z-.19;/-ZV19>>19>>J19>$4?119.3-31919.|19.|19.|1 9.|1 w9.|1w9.|1 w9.|1 w19.|119.|1119.3|19.3|1w19.3$<$19ZV19.3$<$1919.319.3119$4$1D19$4$A191919?3|D9?3|Iw19?0V19?0D19?$A15eΏ5eΏ5e w1.3$1.3.3!p.[ c3E! #.A.J1[j!m#$A1$$1-'1e*Z4-F.|41e*Zne*Zn=#Y1!V4D1e*ZD1e*Zn1e*Z4ED1eL=>1eL.\1e.F9e.F91e|/[;1e/\1e1;e1;q# Ep1=D15'e15'eD15!oD5!oIkL (2j9p#q#JL=> k# E3! !F U {5!oIkL N2j9bfv $[4~JL=> k# .Alu.};D5!oIkL j9p#q#JL=> k# E3! !F5!oIkL )j9p#q#JL=> k#Y!n0Y?/IU vUgjvg (15\D15\15\D15\15\< '/! (O[ $.A4=9;Q#!鿑ER$$* ^btu'F|<9o~E1 8B^ )1vgt 7U)B+B(U7U2 vgg 6+U)Bw1 Ae4I ~1=U<*p5'015$5$ךY=OZ\^ OV'q#b3#K.b11 -D1 1=41 1$1uo'n0D1'F|01'F|0'F|0q#p*ZKEIkL K. \!;m LLE4I 9?0Ig'FL3*D'F|0q# KoI=<'I!= KoIkL #.5n\1'F|0q#D'F|0q#D1'F|0q#Y4'*D'QnnK.'=D'='\'\ >=q#E/'3q#^p*Zq# !'\-Fd'\-Fd Vl?$!q#I [?3~93E!U *'u.5 j'/$'5Ie~;#$#Ug1!LZ t ;? l9~3 j?1!*Y1!\<<$c9[<$c9[$A.4$A.D 4~$s/;? $'5#VI#k53-1 tR!>Y=OZ\4#=K#=4DO.-O.OZ9Q*O[*-O[*O[*#-O[*#R?-?505*5*L-0n-!--*-F.|4-*-Fd-*oVlV3ݔJD0V3݅#݅14E0$A#l.J0E0E*DݞA#o!A#o u.};? $FD*'0'0pA.$#\bL !$-*'OQ4~9!/$>*! j9=-1?pK#4Il9 k1=-Fd te4~;#\!\L-04EoL=!\L=>!L=> '\כV?I#*Y!;mYK!A? !3$1/>4 t?Q-m[L=>DL=>Ld0DA-.!A-.A./>A.JVAAˌA'3K9Z9!Z9[c[1e4[4\![4\.1o!.1o3K3K#\D3q# jld u>A j$ '/F=b9EDq# jld u>A j$ '/F=b9EI $'5#5n0dD3q#Vq#j9\-'sp s!OV3q#D3q#<9.1q#<9.1 tR!> *'0nOl? } kF<$d<#3q#<9.1D3K.K. LL!0n#\IkL jld!OQ|-F.|4|A.J/;cD/$#K>K#>#L >L ##>#1=4E.'/1|01313?D1E!1E4 k# OV'q# 1=./>41=Ut~'5e#4UR;>\Ig=OZ! E~9!/4D1E4D1$4E1e#4!1e#4q#~J14 q#IÈ jkgY?/ v^ jeK! vvv k# s!Oj9!E!1e#4q# 9QY4K!pp*.O'\'3n 5 K-b0'.e*5\1e#4q#D!1e#4q#<5\<!/E?!mQ/<^ tZ~1J>4IkL~$A#l.J1'\'\4D'.e/>4D!'.e/>4IE !3$1/>4 vgUF '1 !JUg'11E4Y?/Dݠ;m\!;m *'0nOl?te-* p\4~1=Y>nDݠ;5D<$'5<$'5D<1!0<1J\1J j./! ;I k#|#!Y!;mY?/\1J j$ uš Qd? 4b3 j=K$A? ^+U+N2~J5#o 5n0d t? $? 4b3B) j=K$A? ,)^]U6)<1JF.|4s0<'3n<'34Dn#$ZˏOVs!Ot!9-O.E =.j5'#0KY!;m !?IEb u; k#Uu[! t.F|$A19Z .ds!O5 [!=op^ !;Y.5s!OuQA'-Y3Y>I#K'3Y><^bY4Kn0 .As!O;-/=I Ro K- t\ˏˏOos!Oo l9p-0n !$*0Ds!Oo !0E*I5b .A-F? j!4 k#b[Z1= ÈY4Kn0Qco$<1!0n4'5#ݭ5OR!OR~'5e#4 K- v/1-0n ;3? !0 '[\ E K!~Q5^ u4;n1Q4IEbg~/'#Zq# '1b5n0dIt!A[#o k#- ()X!OR s!O#'/>4q#p~9!/?9;dI-O-/\ '<9\41E4~J#!0n0^ e>R$$e<$R>- w$R>- !D Q# $ ?V5'F>'F>5'm-/'m-/5'0c|*'0c|*5'*L'*L w5'LL#='LL#=5'd5'dD5'<9'<95'<33'<33~w5'm/;cOV'q#Y?/ Eb9E -/! -/F.A'2X2(XĻgXĻXĩ)gXĩ)X8,gX8,X,+N6gX,+N6X`6SgX`6SXۯgXۯXgXXNTB(gXNTB(2)8,,(g2)8,,(ϻ)8Sgϻ)8S)B2g)B2-F' g-F' -5gm$>m;m;|#\Dm;3gm;3?'F|<9ou[c Km;3?*Km;<9.1m$|gm$|-Y>4s0I#.cKmd5gmd5mgmm$m$9$'m$DmE5gmE5m !5gm !5m'3Dgm'3Dm'3 !gm'3 !m'34gm'34mR;gmR;>g>~lq#pI$ e0|#Zg> ul=K'eg> *log>Y9m;QD>nLZg>nLZj!m#$AZ Y?/I g$O4 #.Jg>nLZ Kg>nLZ |ng>nLZ e\1JF.|4g>nLZp'.5?^b$3 E k#|#!Y!;mo>n>nD>4s0Dg>4s0D0$1'D0$n#.$nDg0$n#.$nD0$4g0$4g0$44 wg0$44 uw0e>o*K*.*1!;mg!;mpOR j!m#.'\* -[bI##4IkL à5YKL-0 l9 k#|#! t.F|$A19Z s!OVg!;mYK!A?~J5'0כà~lq# REc< l9bY.$Ug>nLZ -/1d^ M/E19$'Ig!/.UJ*'04EI#*YkO<9[4 s!Og?/Dg!;mo 9!/Zul=K'eg!;mo 9!/Zul=K'e j9e! k#Uu[! >*E<^b~1;J!FnQg!FnQ!F; g!F; !0Jg!0J*U9Q#$Rd*#p'.5?p4$~$A#l.b9El?Ks0c .3R$$e<< )!0J*;g!0J*;?Y=OZ\pY>j!m#$A?^b !Ud R!0g!0 vvv!V V?I><~d;o9$'<ߛk =Y1! !04Ж!A'5g!A'5!9mQAg!9mQA!..g!..'cg'c!0Ж!0g!0\'34I5p'.5?p4$ j\n͚ s!Og?/D!0ng!0n~1= \$'5IEp03'J l9[bsY?/!0g!0ךY>nLZ=.$*ZVI p*'s\!;m u.};!0nL!n0g!n0 q#<9.1ItR!>~l*~lob5n0dI u.};?*Y> $'5#VDg!n0Ym;g!n0 !Fg!n0 !F~JL=> k#4$A? Ub !L-04EoY.J!n0D!/.!/.$n0!//g!//>A-Ag>A-A>#D!11$g!11$!'gÊubI uQA'- E '/>4 s!OV!'>nV=g==3g=3b0'l.JbI~-1lt'*n Fd/=3D=D=$4J[=='/g='/~( dOq#c~|#Z!0ך~Q5pb$1-'<Չ>=O.g=O.=OZ=OZ\Dn!'g!'U!!3!e9-0cg9-0c9-L4Jg9-L4J9-9-9g9-9-99-939-.d#*g9-.d#*9-/-/#g9-/-/#9-/.9Q#Jg9Q#J9-$?.g9-$?.9-1.g9-1.9-1. g9-1. 9;o9-'A9#\<g9-'A9#\<9-Rg9-R9m;Q9!19=g9!19=9=g9=9=g9=9.LLg9.LL9.L4g9.L4Ж9[g9[9[$-c.g9[$-c.9.eg9.e9.'/9.O9Qc;g9.O9Qc;9.O9;g9.O9;9$!/-c=g9$!/-c=9$LL#=g9$LL#=9$44Jg9$44Jg9$44J -O95'F9'3*F=Ag9'3*F=AZ9gZ9Z.ALsgALs5g5Ж.A#K'e.A#.LZQ.A#D.c$Dg.c$D.3O.3O.$g.3O.$./.3;lg./.3;l?*Y4-F.|4?V?IkL jR$;no j?1!~3'Ab3AEl9/Dg./.3;l?!'eIE t$$dQY!;m !'\4 E/'3q#Dg./.3;l?44I!'e~3IJ#q# j$ [.p./c[Dg./c[D./Jg./Jg./Jw./Jg./J./1|L./'3Kog./'3Ko~.50'3q#Uà~9;-0n0~'5IÈ~.50'3q# K./'3./'34Q!$'<3odgodU1I9$E =/[o g!n0 q#<9.1ItR!> j=/D[9g[9.5.el'.cK\gcK\cmc[33-/!0cg3-/!0c3K=g3K=3-#Dg3-#Dd!1|03$4c[g3$4c[/V3g/V3/Vdg/Vd/;Ж/.dg/.d/l9g/l9#-11=g#-11=#?5g#?53g3Y>~9;-0n0Il9;n0'3; !L=> j$ *'0q#\$'5I ~>I؊v4.$.$/$A19Zg.$/$A19Z~Ee3K\p0$'#4? ;I 'F|0 u.};? k1.$!0JZg.$!0JZ~J*l.JIK j$b0nOl?p u\I!3$1~$'#ˏD.$!/$V.$AZV.$A$=3g$=3$L4R;g$L4R;! !OR^~kv k1>lq#I ~ < kvU4$Ukv~lq#D;gku^bY4E-k#Uu[!bKZ s!Og?/3JgJ.J.JDg.JIE v#nLZq# Fd/<^b u$$cb4 \!;m k5AQ.q# !AˌOo'#*;-/g'#*;-/g!b<1!04IkL~lq# t!9-O.E^b.3$4Y4'*?p t'#\I*/[g!~'5e#4 s!O\!;mp #l o*g! v/1|0q#IkLbKZ !0$A#l.J t.F|$A19Z d/>4Dg! !Ld0Ik# !3$|0? EY!0J*;?Y?/I#*Y=OZ\ )(g! q#ItR!> '=I#*Y!;mUj=/I>=K t?~KV$A à5Dg! F.|4? v<<'\p =? u; K-F\g! !/;cIk# |n>JpY>g!Y$O4~J14IkL EY>g!Y4Kn0<1!04I$Lgvg'F|0q#Dg!Y4?|Z ;I Y>nLZ snJgJJAgJAE>gE>e#ge#*e##g*e##EZngEZn$'3$'5$'5D$9$'$OЖ$O4D$R#g$R#1-g1-ULLZ#4 !1e#4q#~lq# KD1-D1;1;0c1K31-'3*og1-'3*o1!-c=Dg1!-c=I4 8N E*J \!;m~JL=>^ j9!.5 t-0cA '#*I#ul=K'e !0E*IIg!0bIE MkUkLUg1!V4?Y>nI#k =D1!mg1!mЖ1!V1!V4D1!V.1!Vn\1!V41!\1!LZ1|1>5g1>51=|g1=|;n#1Z=g1Z=1 $LLg1 $LL1.3d5D1[*d1[$LL1|g1|4~lq# v#n4?^b~!Y4'*? 5 0JZDg1|4Y.!UQc$3IE .F.Jp j=/D1A'g1A'15g15Y>t'#\I u30';'.FFg'.FFY>Y?/^~1=.Y!0n /[q#~'5e#4bR;>\<ߛ <1!0nY!;mo9;/-Z-. ul=K'e<5#gg d0JZ $'5#V4-F.|44-*d5g4-*d54-LL4-LLEg4-LLE4-4Q*;*.g4Q*;*.q# $'5#jldI K-F\4Q*;*.4Q*;*Dg4Q*;*IE snbFɱ04D4Qg4Q4Qc!g4Qc!4Qdg4Qd4Q$'3$Og4Q$'3$O4Q4Jg4Q4J4;cDg4;cD4;5g4;5 $Q#4K4K!/>Ж4K\4Kn0Vg4Kn0E5#V?IkLb~/'#Zq#U19g4Kn0!0$A#l.J~J#4 j=/I >=j!Ж4Kn0V34Kn0DLQ$gLQ$gLQ$ -0m. |[-0c=g[-0c=[F=Ag[F=A[=g[=[/g[/|$Dg|$D33/-5g33/-5///o19>g19>g19>bwg19> twg19> wg19>wg19> kwg19>wg19>Yw19>pb $'5#REcg'04'3 '.OV>pb!LlIkL u-04Eߛ k1=q#1= A/ EbKZ -0ך~!Y'//;I#1$I5~$'54 !JD'04'eD'/o=g'/o=4';g4';g4';4bwg4';4 w4'#g4'#4-1=bR;82g?/KZY!;mobFɱ04I#*p\pp*1|#;?be4'#4D4'5g4'54'*Dg4'*I 5?19V\-/E19Ivv^!-b5FE\#5\'F/J'F1$1'3q#D'}-#g'}-#'}-?-/g'}-?-/'F<0s1'FQD'FF=AgR>F=AR=4gR=4RDR.LgR.LЖRlmo?/F.$D?#,?#-1g?#-1?#*5?>!Z?#$1D?#4-0n0?#4-0n0V3g?#4-0n0V3? tpo?# \?# Z?/g?/ \.A# E !0כ*~Ee0ךY1| 55EI Y>nLZ*Ym;3? j!Ж?/KZg?/KZ n|q# ' \$'5II#pA3;4Y> Ec?/Z?/Dg?/I!L[l.JDg?/Ij9!E?!QojwjtsQ wjwjwj;cjwj.3|-/4-4-Fd4-FdD4-0n0D4-*-$j-*-$4-'<j-'<j-'< w4-j-!U?'#4-A|-0$$j-A|-0$$4-A'j-A'4-c-c'j-c-c'4-c-.j-c-.4-c9.j-c9.4-c>4V-O-jV-O-4V3jV34V/JjV/J4-/;j-/;4-/'j-/'4Q-cjQ-c4QAjQA4QJ4cjcUE#*b04Y?/ àpb u.};?Ym$~'5s0'3'/FFj!FFm#ZVj!m#Z ~><^Y1!V.Y=OZ\ j$Y>j!m#$A?# k5ORm#.'m#.'\m#$AZVm#$ADm#$Aj!m#$A?*~/'#Zq#p 'ej!m#$A? j#nLZj!m#Z $|0?v4Iv/1-04 k# j!m#$AZ R jLc$j!Lc$c-j!c-/$/13K!L.3d5#j> !;IkL ul=K'e k#|#!Y!;mo^V?IkL k#|#!k#|#! !OR-(K$Aj=K$A!19 VK\/j=/U/~Ee3q# E u;KsD/[V/[/[$A/D±#j=#e#j=e#bw5j=5j=5? w j= ul=K'e<^ vj=~J03'JD/Vj\/Voj\n͚b K'3 uQA'- s!Og?/ Eb '33 j!4 #$Rd* tDj!4~1eA #0$*oDj!4Y!;mo s!OkL#I#k ==Vl? LL!04s!OOV'q# E u;~d0DFɱ04 $'5#V U`^ ksA[ !3$1/>4.LL'JQ= t5''# Y0;!0 Re<< ^ +1s ~(N'-0? g>~lq#p gvbI#p*ZKEp#q#g>nLZb0nOl11|0q#b[Z1= j$ j9\-'5'IJ5'011|0q# '#0 \0s14EIj$ !3$1/>4Y?/ j$1$A11|0q#'3n1dUs n|4? j9!E? j$ OV'q#Y?/D'ɱ|Q u.};? $'5#Vt.F|$U L.d jR$U Uk#!-0c-^ v4Ie1;q# *'0;co àDt[;? K'e~Jn#'$'I!OQ '*A/>4<^bY4'*? à5<=1DtuY?/^ A//! E g4'*?Y! Md0JZ $'5#V<t*LEu-R^b !R~V0'3'IE g3Y><ts33$'[!'eb9Eg~J.F.J j$b ul=K'ep4=4 s!OV/'#l?~d u.};? s4 !l\41E4~j^ e>R$$e $(2J<'/=IkL !R j!m#$A?^bY'5? n|q#uvE#=I#*IkL eJU!0V3Y';Ee3q# tR!>=n#>K!~lq# '1|0q#p'3n*K-F!Y!;D$ULL!0n#\I#V?IkL s!O#/[q#Y?/D'34'3b11kL LLE4Ij$b3dO̷p!'l?F=#ZIkL t.F|$A19Z~J^ j$R;*b j9!E? '/>4 s!Og?/D!3$1/>4e|/[;? j\4 t!9-O.E K ./>JIkLY?/D!3$1/>4bY!n0 .LL=>nj$b< s!Og?/.LL'J~E!'F|0q#I b/=ZQY.$A.3|J ?1$ \ jl'3;~JZl?^ /1.s0j\4 5 0$AZg>D./>JIkL=.*b0nD.F.JY>nLZ *'0nOl?*Y3~9Q5?-.Al!1$4E?^'F|<9 O.J;? K-bI;4 eK= K- 0$4 k5Ap m.$g~3'Ab3AEl9/LL!04p*.O'.LL=>IkL~$A#l.Y4?d k# '*A/>4IkL '/>4 !OQLL!04;-/= #54-[n\ k# e*ZIkLb u.};? REc$3LL!04=4 11=Uu$R=~! u~F[q#<ߛ!5 !$ k#K5J \1J j$~j 13-?~KV$A !0E*DLL!04Y'F!04K k# KZpo '33 j!LL!04IkL >5*b k#e4~3LZq#;4 vv^ $R !~3L#O.5J/>4~3LZq#^ J14'03'Ol1!/Z5\I#J4-A.J$31!/.$A? \!;m k# M#V$'IK=' 1!/0~JnLZ K-Q-/>4*YR;*<9.1[!1E4 1;K.Y?/Iu-FEKE?^b !OR.U. j9!E?po*Y'113E/#V?IkL '/>4 s!Og?/D'#0IkLbFɱ04I l3Y0e>o j!m#Z'/>4It? à5'epo*bFɱ0nY=OZ\VLUu.L! 9!/Zul=K'evgbt #q#3LZq#Y?/ E9?0<^ v4I4E?'ev#nL59$*!'A àbI11| j$$| .50'3q# à t$$cI5b #.54? u.};v/1-04p|};?b04q#Yjjv/1E4Q !0V3v/1E4QYv E~'5e#4bR;>\I 3*Il9Y!eY0Kš *'sg1!u.};? '#.5 Mt! u[!Y4'*? v4I#4*~9;-0n0D nb04v4IL/K9^ j$R;*be*ZnY> Aך -1Q u[c~>It.F|$A19Z K-p4$ k1>lq#Dgvg kpu.};?bI# n|4?p #.54?~J4^ O.J!'e/>4Y=OZu.};?~/'#l?b4b j!m#$AZ#9.3$<$19Z << -*<^ !<<;?*Y'LLZ#4~J*l.JIEY'5O.OVQ-/>4*Y3Y> ul=K'e<^p*1|#;?~ <4 j=/ v/1E4QpbKZpok1>v EcL3$RIE K-Q-/>k1>lq#I ^ \0s1ךb K-F! Oo k1>~lq# Kk5AQ.q#à^~J.F.JIkLY>~1q#uo'n0I#*b5nLZ3p3|#=/=/Y'F!04p^b$F.$A19Z!OR= j$ Fd/IkL j#<|q#eL.\ߛ*~1$'#-/.3? -/\ 1$vp E4j\4 v4ILL!0n#\Db9E -/\*b9E #ˏI b u; k#Uu[! #.J~KV$AbIs!È j5'#0K !?D\!;m9$à*pY'FL3*I# R 'F|<9 ul=K'ep j9$Y'FL3*<^ =}K!V!J4$A?!9!/ˌs!O Fd/p9$4$A19? ؝+Nٿ' *F=A ((U$db44E#!?>4$3IkL u-Rp~! !OQ =/[q#<^ 13EKE?V?D$dbKZpopb04pY'11En u.};?* \!;mp #l o*$dIkL !ORI  j# ~>4'5?b/=ZQY>g!n0 !Fg!n0 !F^ gՐ 2YK| #4Dg.$AZq#<9.1IkLY>g$'3b !R-m[!j0? 5t$J^ ul4d t R# )(wg4-F.|4? jR$~/JKmo '#0I ~3LZq# l9 \1!04 j$b 1$!'eg4K!Y!0J*;?b0Dg'0<>Jt.F|s05\Dg?/I11 -m^ v4I;4?b<1!04Dg?/I$/>4^ k5OR EY>nDj!m#$A? u.};?* REcDj9!EZ$'#*q# .1LIu-Rv4I11|0q# j$ t.F|$A19Z K-F! #O.5J/>àbF}!OI#*b05J?/I 9?0Iul=K'eà~1=UJlE K-pY>*~/'#Zq# \!;mà 0s/[Q4V?Ij$Y!04~J#4Ut!;o E*Dà -04I Y=OZ\à '!'o REcI#.p5 A//o j$b33K! \$'5Ik1n/V3? l9[b u.};? u-?$àY4Kn09$*I u.};?*Y>à jldIEbKZ '/>4~3LZàK#IkL9?0I$'5#VI b u;b0-/Z \!;m u.};à5pL- Ep-0n t.F|$A19ZY!;mo^V?IkL 4n4'IkL [!>Y>nD5JA -? j$ $3E/'3-t*LE*g u-R !Vj9!u .| 'd<^ 3$Rm;4Iv33'ɱn j9!.5b11|0q# l9b~sn'!*Y'A.JIE v/1 /> !.5 /j9/ !/KZj9!/KZV?I#MkF<$d<#j9!/KZV?I Y>j9!/KZV?I Y>^ -/1d Mul=K'e kF<$d<# !$*Ej9!$*Ej9!$*E!bwj9!$*E!~wj9!$*E!w !EZ !EZVj9!EZ$'#*q#IkL j9\-'5'͚ j=/IEp03'Jpb~$E*[K!p Eu \\ ! 55j955 o [co .5 j9 j9 j9j9~wj9 wj9 wj9 *J*<>j9 wj9 wj9wj9 wj9 jwj9 w 1Djld =<'IjldfFɱ04 j!4Y!;mopYvY?/Dn4dDn4'3;4c-0?cjc-0?c4#Lg44$j$j$ k5 j$ vA#E!bY>ngb3#K.I !-0n j$ =0.J ~d-A'\4$F-A$4$FDj$FD4$Fj$F4K|QjK|Q4$*-4$*j$*4$|};4djd4|5j|54/4$-c.j$-c.4$9j$94$?j$?4J.jJ.~;F$4$$!j$$!4$D4$14$1ZD4$1$A4$1<j$1 K- .dDj$R;*b !R E.JpY>^ -[UQV?Dj$R;*b;-*.A/ EY>^ L3'> =!c !Y3-sj$R;*b j9!E? [ovvj$R;*p0e 'Vl?~J<$'<#\IEb30$9$|^p4$Aj$R;*I j9!E? '/>4 u!;#oj$R;*I5?*-? uQA'- s!Og?/I[Z1=Dj$R;*I1=4Y?/IE g!0ךY!;m !?Dj$R;*I'33?Ud**b5m.Oo E KD4$Zl4$|#jkuv^ O.J k#|#!p-0n t.F|$A19Z K-F-0-0j0?U##-.3D-[o-lDQnLZj!m#Z5n0dDQ<3KEDQ<|'Vj#<|'3q#~J14' pZj#<3Q<|Q*Dje#*I u.};?*Y> *'0je#*I Q1$R= !I Y> 5 68 j$ +1$j5+1$!'je'!OEjeOE w'3[-0;.js<0;.J0j5J0'*.j5'*.'\R3j5'\R3'#0K'#0'?144<-.j<-.Ug9>4'3$ɉj'3$ɉ- e..b !RY1!\ 5 j'# E =#bLs04'/E4'/ED4'/$'5D4'#4'3j'34'5#=j'5#=4' LLj' LL4'<0Q4E3jE3^K9!/KZ$|͚ u.};?Y?/D4'O4R.#ɱjR.#ɱ4R$jR$$3IEe*ZnY'F!04~.50'3q#^b~J.F.J j$ 33q# Fd/jR$$IkL~1=b<*p5'0pb u.};? !L=>~$'5jR$;no j?1!~3'Ab3AEl9/D4?14?14?1\4?##4??#ȃj??#ȃ4!9$OVj!9$OV'wÿ;-?Q'FV*[$FV*[$ Q4'F.'lF.'l?e<< u4*w'0#'#Þ#'[-/[-/ w'c'3'3L3L'3-3-'##'#54-[n\'#0Jd'#0J#V#0J#׀àIkL k#Uu[! s!Og?/<^ k#U|#! t.F|s0Y4'*D'#'#53?o'#5Q*o#5Q*oY>nLZ ul=K'e<^b t.F|s0b11 -m$19~J$9'!~-/}<-m'44<^ vje<< X(؝8+'#.J'#.JD'#.''#.'Ȍ'#l'#l'#.5p'F|<9p\à5 j[o E k#Uu[! s!Og?/D'5D'D'<9<9'È͛ vgY./'3q# j$ E!04Q1$R= !DÈ t$$dQ '=Il9b~3'e.d k5AQ.Èp*'/>4Y./.3;l?p '/>4 s!Og?/DÈ d0~J$3È d0UJ$3È jvY?/p gvg .dQ-/>4 ='<'*<'*.|4n|4?U !EZpon|4?U !EZpo^b $ k# .34<=.!I b33Ko $'5#$DOwO(O(OO8O-00-00O-*-.-*-.OV5/OV>n#V>n#OVOVKoVKoJlEo t.F|$A19Z*~lq# K-p k1>lq#Id0DOVlVl?~lq#~s Eb<< L3'>Y>nLZ'F|0q#<^ !R O> l9!=b<<OV'V'!U*5\I u.L!~?0dOV'\OQQ t5'A#Q = u!.Q'3|#QYm-.cOQ#*E1Q#*E1OQ#!O;O;FdO;FdDO;;ך K'e~lq#!'eIl9 $'5#VI#*Y>nLZY1!Vn\O;DO;4;4? #=q# ![1e4q#Y9Q#JIK9!/KZj9!E?~/'#Zq#ߛv4Iv/1|0q#IEY>O;O.d.dV!Vll9!l93$1$1#*ED#cK\9>cK\9=5FEA9=FEA953-A5<'D5}K5n0V5O.OOZc=Zc=OZ4EZ4EO604EZ4Ebw604Ebt'|Z4EYwOZ4EZ4EO!$O!$*0!$*0 j!m#$AO!$*0DORO.A.3.A.3O.-.-? wO.5F=A.5F=AO[#[#O[c>[c>O[?3O..-bwO.5A.3.5A.3O.5A[.5A[O.5A$.5A$O.5'DO.J.JOlOO'VO'V.OlV.lV.OlVlVO.O$O3-*./.53-*./.5O-F'3;O$A$AO$.AO$c-0$c-0OO'/OOJO$E9!\$E9!\O$$D$$DOE4/!?=E4/!?=O#R.Rq#R.RqODRwտt5'տ-Oտ$'A3տwտwտ$F=տgwտjwR(,,,((,,,(R()+)6]26()+)6]26R`28`28R`N)(`N)(R`,72(`,72(R`,,+)X`,,+)XR`86B2(6`86B2(6R`8B(ے`8B(ےR(T7Ջ(T7RN82X8ՋN82X8R,,),Ջ,,),RXNլXNR+(N6լ+(N6Rz8z8R7B(),7B(),R+B,)6((+B,)6((R8)+8Bթ8)+8BRB+(+(8թB+(+(8RN6(6N6(6RN86((+)8N86((+)8RN86GNTN86GNTRN868,8N868,8RN8)BN6N8)BN6RN8N8)N8N8)RN88)B(N88)B(RN)B+ӂ8,N)B+ӂ8,R+)B268++)B268+R6B,)86B,)8RSzN)()SSzN)()SRSxB(6B,8SxB(6B,8RS((6(S((6(R+X](26+X](26R+((`{+((`{R+((,,,+8+((,,,+8R+(6N8+(6N8R+(,X+(,XR+(+8)8,,+(+8)8,,R+(,+()+(,+()R++,86++,86R+()7,,+()7,,R+2)B++2)B+R+,S)8+,S)8RT+)6T+)6R{X,Փ{X,RւxՓւxRB)((ՓB)((R8B)6Փ8B)6R2+NՓ2+NRBՓBR),+`6Փ),+`6Rx6Bx6BR6(){86(){8R--A/!\--A/!\R-93O-93OR-RV#V#RVc=Vc=RV3V3RV3-V3-RVVV ! 5'? /FVwR-/ $gٛ*Y0$1'<^ jlQIkL t.F|$A19Zp j$*-?I0-/Z E3R!!c3R!#=!#=R!.A9R!.A9nR!.3!.3R!.#!.#R![=![=R!!R!DR3R|A>AR>5>5R>R\4d5\4d5R\41ER9K9K /[q#Y4'*Iv/13?~J5#o \.A# k#Uu[! !L=> s!Og?/D9K vItb~J14'$3 E t.F|$A19Z #.59K-c\bKZ !?RE*~3LZq# LL!0nR9KDR9>9> vI~9Q*Y4K! $4b~9Q*Y4K! 9>b j9!E?!mQZI=I -b j9!E? K.OlR9=9=! vI'F|<9o $ob=<1!0n k#~9Q9=! 0 vI#ՔpY>R9Z9R9l9lR9l!9!-9l!9!-R9l#!R9l/E9l/ER9lRE R9$9$~l 9Kb~lq#V?IkL $'5 tZ~KV$Ao j!4DR9R9?DRZ9#Z9#RR#DՏ#DR.cKR.3/9.3/9R.d.dR.3LsR.3c\.3c\R.3c[R$$$$R$$*R;$$*R;R$$5$$5RERE*DREcREcL3$RDREcDRE3E3! $'5#VDRE >E >RE R$DRsA9sA9RsnRs4#s4# !1e#4q# j$1ZI# *'0ך '=? j=/DR5JAR''RRRR?K?KN*)(>$AL4D.w?-A9/-.-A9/-.?VV!w?-/--c.-/--c.?QAQA?;'/?=?'9;'9;?'9.c$'9.c$?'9. '9. ?'c-''c-'?'?'c.'?'c.?!;?!;D?!K\!K\?!?!9!9?=c!=c!?90?.?3?.9.9U9>?.3/-3;.3/-3;?3!3!U=44'V?ͭͭ?$c$4$c$4?JA'QJA'Q?Ec?$<9./'$<9./'?$'$'?$OlD$OlD?''?'#<'F'#<'F?'?Q'?Q-FE$R$*$>$*$9QA9QA9-$9-$9>A1o9>A1o9'QA9'QA.//=.//=.1L.1L#..../'/'$F$F'5'5'sQ'sQ'5c$R*o-"9441^ff1sV!"9441^ff1'53EAf<1;f*K-fE*"9441^ff1'53EAf<1;f*K-f1/"9441^ff1'53EAf<1;f*K-f'v#nL5"9441^ff1'53EAf<1;fL-F.$f$'5#V"9441^ff1'53EAf<1;fL-F.$f$'5#V5n0d"9441^ff1'53EAf<1;fL-F.$f$'5#Vv<<'!"9441^ff1'53EAf<1;fL-F.$f$'5#V'/!"9441^ff1'53EAf<1;fL-F.$fQ.L\4q#"9441^ff1'53EAf<1;fL-F.$f5!o<-1="9441^ff1'53EAf<1;fL-F.$f!1E4'/>4"9441^ff1'53EAf<1;fL-F.$f!FJ#4"9441^ff1'53EAf<1;f1 f-9E"9441^ff1'53EAf<1;f1 flE"9441^ff1'53EAf<1;f1 f'/>4J4E"9441^ff1'53EAf<1;f1 f*t?"9441^ff1'53EAf<1;f1 f1'F|<9="9441^ff1'53EAf<1;f1 f$d j./!"9441^ff1'53EAf<1;f1 fRl9$d"9441^ff1'53EAfO-FfL5}f0E!a!/F$*./>4"9441^ff1'53EAfO-FfL5}f0E!a1;4kL"9441^ffd50<'#.ULe.F'5AfF'.3n#UL'#0nL5^*$.+XX(6N!0$d0J`7)_'5#^U-1.^^>nL5^*$.+XX,8N)zS)(i'5#^U-1.^^>nL5^*$.+XX)7Nz6)(ĺ`N66,r'5#^U-1.^^>nL5^*$.+XX)7N+B(XN8(+)6'5#^U-1.^^>nL5^*$.+XXN7B,+UT8,N28N(2N(7"'5#^U-1.^^>nL5^*$.+X(+,8N7zT8))268i'5#^U-1.^^>nL5^*$.+X(2)2N!=U!F"'5#^U-1.^^>nL5^*$.+X(,T8N-c-/1=.$*?c-NSW'5#^U-1.^^>nL5^*$.+X+(,N0JL=>;n0d,F(FB+),N-8+){a'5#^U-1.^^>nL5^F#+)6Ꝭ"'5#^U-1.^^>nL5^<#+B,UBW'5#^U-1.^^>nL5^<#+B,UBN]"'5#^U-1.^^>nL5^$1>V!+g(6+r'5#^U-1.^^>nL5^$1>V!+gX"'5#^U-1.^^>nL5^$1>V!+`N)('5#^U-1.^^>nL5^$1>V!+`86B2('5#^U-1.^^>nL5^$1>V!+`8B(i'5#^U-1.^^>nL5^$1>V!++B,)6((P'5#^U-1.^^>nL5^$1>V!+թB+(+(_'5#^U-1.^^>nL5^$1>V!+N86((+)8"'5#^U-1.^^>nL5^$1>V!+N8N8)h'5#^U-1.^^>nL5^$1>V!++()7,a'5#^U-1.^^>nL5^1/+N),r \ No newline at end of file diff --git a/test/qlever-data/oc-test.vocabulary.words.external.offsets b/test/qlever-data/oc-test.vocabulary.words.external.offsets new file mode 100644 index 0000000..34a9e65 Binary files /dev/null and b/test/qlever-data/oc-test.vocabulary.words.external.offsets differ diff --git a/test/qlever-data/oc-test.vocabulary.words.internal b/test/qlever-data/oc-test.vocabulary.words.internal new file mode 100644 index 0000000..3154a8b Binary files /dev/null and b/test/qlever-data/oc-test.vocabulary.words.internal differ diff --git a/test/qlever-data/oc-test.vocabulary.words.internal.ids b/test/qlever-data/oc-test.vocabulary.words.internal.ids new file mode 100644 index 0000000..83b3efd Binary files /dev/null and b/test/qlever-data/oc-test.vocabulary.words.internal.ids differ diff --git a/test/qlever-index-data/oc-index-test.index-log.txt b/test/qlever-index-data/oc-index-test.index-log.txt deleted file mode 100644 index 408300a..0000000 --- a/test/qlever-index-data/oc-index-test.index-log.txt +++ /dev/null @@ -1,43 +0,0 @@ -2026-06-10 13:35:39.310 - INFO: QLever index builder, compiled on Sun Feb 22 15:49:56 UTC 2026 using git hash 36ed96 -2026-06-10 13:35:39.311 - INFO: Locale was not specified in settings file, default is en_US -2026-06-10 13:35:39.311 - INFO: You specified "locale = en_US" and "ignore-punctuation = 0" -2026-06-10 13:35:39.311 - INFO: By default, integers that cannot be represented by QLever will throw an exception -2026-06-10 13:35:39.311 - WARN: Implicitly using the parallel parser for a single input file for reasons of backward compatibility; this is deprecated, please use the command-line option --parse-parallel or -p -2026-06-10 13:35:39.311 - INFO: Processing triples from single input stream /dev/stdin (parallel = true) ... -2026-06-10 13:35:39.311 - INFO: Parsing input triples and creating partial vocabularies, one per batch ... -2026-06-10 13:35:39.336 - INFO: Triples parsed: 217 [average speed 0.2 M/s] -2026-06-10 13:35:39.340 - INFO: Number of triples created (including QLever-internal ones): 217 [may contain duplicates] -2026-06-10 13:35:39.340 - INFO: Number of partial vocabularies created: 1 -2026-06-10 13:35:39.340 - INFO: Merging partial vocabularies ... -2026-06-10 13:35:39.340 - INFO: Words merged: 123 [average speed 2.2 M/s] -2026-06-10 13:35:39.342 - INFO: Finished writing compressed internal vocabulary, size = 1262 B [uncompressed = 5890 B, ratio = 21%] -2026-06-10 13:35:39.342 - INFO: Number of words in external vocabulary: 123 -2026-06-10 13:35:39.344 - INFO: Converting triples from local IDs to global IDs ... -2026-06-10 13:35:39.345 - INFO: Triples converted: 217 [average speed 0.6 M/s] -2026-06-10 13:35:39.345 - INFO: Creating permutations SPO and SOP ... -2026-06-10 13:35:39.345 - INFO: Number of inputs to `uniqueView`: 217 -2026-06-10 13:35:39.345 - INFO: Number of unique elements: 217 -2026-06-10 13:35:39.345 - INFO: Triples sorted: 217 [average speed 8.7 M/s] -2026-06-10 13:35:39.346 - INFO: Statistics for SPO: #relations = 55, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.346 - INFO: Statistics for SOP: #relations = 55, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.346 - INFO: Number of distinct patterns: 2 -2026-06-10 13:35:39.346 - INFO: Number of subjects with pattern: 55 [all] -2026-06-10 13:35:39.346 - INFO: Total number of distinct subject-predicate pairs: 217 -2026-06-10 13:35:39.346 - INFO: Average number of predicates per subject: 3.9 -2026-06-10 13:35:39.346 - INFO: Average number of subjects per predicate: 54 -2026-06-10 13:35:39.346 - INFO: Creating permutations OSP and OPS ... -2026-06-10 13:35:39.346 - INFO: Triples sorted: 217 [average speed 9.9 M/s] -2026-06-10 13:35:39.347 - INFO: Statistics for OSP: #relations = 59, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.347 - INFO: Statistics for OPS: #relations = 59, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.347 - INFO: Adding 55 triples to the POS and PSO permutation for the internal `ql:has-pattern` ... -2026-06-10 13:35:39.347 - INFO: Creating permutations PSO and POS ... -2026-06-10 13:35:39.348 - INFO: Number of inputs to `uniqueView`: 55 -2026-06-10 13:35:39.348 - INFO: Number of unique elements: 55 -2026-06-10 13:35:39.348 - INFO: Triples sorted: 55 [average speed 3.2 M/s] -2026-06-10 13:35:39.348 - INFO: Statistics for PSO: #relations = 1, #blocks = 1, #triples = 55 -2026-06-10 13:35:39.348 - INFO: Statistics for POS: #relations = 1, #blocks = 1, #triples = 55 -2026-06-10 13:35:39.348 - INFO: Creating permutations PSO and POS ... -2026-06-10 13:35:39.349 - INFO: Triples sorted: 217 [average speed 10.8 M/s] -2026-06-10 13:35:39.349 - INFO: Statistics for PSO: #relations = 4, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.349 - INFO: Statistics for POS: #relations = 4, #blocks = 1, #triples = 217 -2026-06-10 13:35:39.349 - INFO: Index build completed diff --git a/test/qlever-index-data/oc-index-test.index.ops b/test/qlever-index-data/oc-index-test.index.ops deleted file mode 100644 index 7e002ab..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.ops and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.ops.meta b/test/qlever-index-data/oc-index-test.index.ops.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.ops.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.osp b/test/qlever-index-data/oc-index-test.index.osp deleted file mode 100644 index d51dc71..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.osp and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.osp.meta b/test/qlever-index-data/oc-index-test.index.osp.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.osp.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.patterns b/test/qlever-index-data/oc-index-test.index.patterns deleted file mode 100644 index 46b7468..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.patterns and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.pos b/test/qlever-index-data/oc-index-test.index.pos deleted file mode 100644 index 97d3d43..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.pos and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.pos.meta b/test/qlever-index-data/oc-index-test.index.pos.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.pos.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.pso b/test/qlever-index-data/oc-index-test.index.pso deleted file mode 100644 index 1556168..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.pso and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.pso.meta b/test/qlever-index-data/oc-index-test.index.pso.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.pso.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.sop b/test/qlever-index-data/oc-index-test.index.sop deleted file mode 100644 index f308111..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.sop and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.sop.meta b/test/qlever-index-data/oc-index-test.index.sop.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.sop.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.spo b/test/qlever-index-data/oc-index-test.index.spo deleted file mode 100644 index 6568a59..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.spo and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.index.spo.meta b/test/qlever-index-data/oc-index-test.index.spo.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.index.spo.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.internal.index.pos b/test/qlever-index-data/oc-index-test.internal.index.pos deleted file mode 100644 index 841e13a..0000000 Binary files a/test/qlever-index-data/oc-index-test.internal.index.pos and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.internal.index.pos.meta b/test/qlever-index-data/oc-index-test.internal.index.pos.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.internal.index.pos.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.internal.index.pso b/test/qlever-index-data/oc-index-test.internal.index.pso deleted file mode 100644 index b0c0736..0000000 Binary files a/test/qlever-index-data/oc-index-test.internal.index.pso and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.internal.index.pso.meta b/test/qlever-index-data/oc-index-test.internal.index.pso.meta deleted file mode 100644 index 259383a..0000000 Binary files a/test/qlever-index-data/oc-index-test.internal.index.pso.meta and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.meta-data.json b/test/qlever-index-data/oc-index-test.meta-data.json deleted file mode 100644 index b6a6c98..0000000 --- a/test/qlever-index-data/oc-index-test.meta-data.json +++ /dev/null @@ -1 +0,0 @@ -{"encoded-iri-prefixes":{"prefixes-with-leading-angle-brackets":[]},"git-hash":"36ed96","has-all-permutations":true,"index-format-version":{"date":"2024-10-22","pull-request-number":1572},"locale":{"country":"US","ignore-punctuation":false,"language":"en"},"num-blank-nodes-total":0,"num-objects":{"internal":0,"normal":59},"num-predicates":{"internal":1,"normal":4},"num-subjects":{"internal":0,"normal":55},"num-triples":{"internal":55,"normal":217},"vocabulary-type":"on-disk-compressed"} \ No newline at end of file diff --git a/test/qlever-index-data/oc-index-test.settings.json b/test/qlever-index-data/oc-index-test.settings.json deleted file mode 100644 index 0967ef4..0000000 --- a/test/qlever-index-data/oc-index-test.settings.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/test/qlever-index-data/oc-index-test.vocabulary.codebooks b/test/qlever-index-data/oc-index-test.vocabulary.codebooks deleted file mode 100644 index 8544eae..0000000 Binary files a/test/qlever-index-data/oc-index-test.vocabulary.codebooks and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.vocabulary.words.external b/test/qlever-index-data/oc-index-test.vocabulary.words.external deleted file mode 100644 index 3ad4477..0000000 Binary files a/test/qlever-index-data/oc-index-test.vocabulary.words.external and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.vocabulary.words.external.offsets b/test/qlever-index-data/oc-index-test.vocabulary.words.external.offsets deleted file mode 100644 index d25d229..0000000 Binary files a/test/qlever-index-data/oc-index-test.vocabulary.words.external.offsets and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.vocabulary.words.internal b/test/qlever-index-data/oc-index-test.vocabulary.words.internal deleted file mode 100644 index 77ad25f..0000000 Binary files a/test/qlever-index-data/oc-index-test.vocabulary.words.internal and /dev/null differ diff --git a/test/qlever-index-data/oc-index-test.vocabulary.words.internal.ids b/test/qlever-index-data/oc-index-test.vocabulary.words.internal.ids deleted file mode 100644 index b1732a2..0000000 Binary files a/test/qlever-index-data/oc-index-test.vocabulary.words.internal.ids and /dev/null differ diff --git a/test/test_indexapi_v1.py b/test/test_indexapi_v1.py index d5de94d..b4d1e6c 100644 --- a/test/test_indexapi_v1.py +++ b/test/test_indexapi_v1.py @@ -1,27 +1,24 @@ import json -from unittest.mock import patch import pytest -from requests import RequestException from conftest import create_api_manager, execute_operation, normalize_citations from ramose import APIManager @pytest.fixture(scope="session") -def api_manager(qlever_endpoint: str, virtuoso_endpoint: str) -> APIManager: - return create_api_manager( +def api_manager(qlever_endpoint: str) -> APIManager: + manager = create_api_manager( "src/api/index_v1.hf", { "#base https://api.opencitations.net/index": f"#base {qlever_endpoint}", "#endpoint http://qlever-service.default.svc.cluster.local:7011": f"#endpoint {qlever_endpoint}", "#addon indexapi_v1": "#addon ../src/api/indexapi_v1", }, - env_vars={ - "SPARQL_ENDPOINT_INDEX": qlever_endpoint, - "SPARQL_ENDPOINT_META": virtuoso_endpoint, - }, ) + for config in manager.all_conf.values(): + config["sources_map"] = {"meta": qlever_endpoint, "index": qlever_endpoint} + return manager DOI_ERRORS_DOI = "10.1007/s11192-022-04367-w" @@ -78,7 +75,7 @@ def api_manager(qlever_endpoint: str, virtuoso_endpoint: str) -> APIManager: "cited": ZENODO_DMP_DOI, "creation": "2021-06-08", "timespan": "-P0Y0M1D", - "journal_sc": "yes", + "journal_sc": "no", "author_sc": "yes", }, { @@ -183,27 +180,3 @@ def test_reference_count_zero(api_manager: APIManager) -> None: execute_operation(api_manager, "/index/v1/reference-count/10.3233/sw-210434") ) assert result == [{"count": "0"}] - - -def test_citation_count_meta_sparql_failure(api_manager: APIManager) -> None: - with ( - patch("indexapi_v1.post", side_effect=RequestException), - patch("indexapi_common.post", side_effect=RequestException), - ): - result = json.loads( - execute_operation( - api_manager, f"/index/v1/citation-count/{QSS_ARTICLE_DOI}" - ) - ) - assert result == [{"count": "0"}] - - -def test_citations_meta_sparql_failure(api_manager: APIManager) -> None: - with ( - patch("indexapi_v1.post", side_effect=RequestException), - patch("indexapi_common.post", side_effect=RequestException), - ): - result = json.loads( - execute_operation(api_manager, f"/index/v1/citations/{QSS_ARTICLE_DOI}") - ) - assert result == [] diff --git a/test/test_indexapi_v2.py b/test/test_indexapi_v2.py index 2137eb7..849c34a 100644 --- a/test/test_indexapi_v2.py +++ b/test/test_indexapi_v2.py @@ -1,32 +1,37 @@ import json -from unittest.mock import patch +from pathlib import Path import pytest -from requests import RequestException from conftest import create_api_manager, execute_operation, normalize_citations from ramose import APIManager @pytest.fixture(scope="session") -def api_manager(qlever_endpoint: str, virtuoso_endpoint: str) -> APIManager: - return create_api_manager( +def api_manager(qlever_endpoint: str) -> APIManager: + manager = create_api_manager( "src/api/index_v2.hf", { "#base https://api.opencitations.net/index": f"#base {qlever_endpoint}", "#endpoint http://qlever-service.default.svc.cluster.local:7011": f"#endpoint {qlever_endpoint}", "#addon indexapi_v2": "#addon ../src/api/indexapi_v2", }, - env_vars={ - "SPARQL_ENDPOINT_INDEX": qlever_endpoint, - "SPARQL_ENDPOINT_META": virtuoso_endpoint, - }, ) + for config in manager.all_conf.values(): + config["sources_map"] = {"meta": qlever_endpoint, "index": qlever_endpoint} + return manager MAIN_PAPER_OMID = "omid:br/062104388184" MAIN_PAPER_DOI = "doi:10.1162/qss_a_00292" MAIN_PAPER_PIDS = f"{MAIN_PAPER_OMID} {MAIN_PAPER_DOI}" +ISBN_EXAMPLES = json.loads( + (Path(__file__).parent / "data" / "index_isbn.json").read_text(encoding="utf-8") +) +ISSN_EXAMPLES = json.loads( + (Path(__file__).parent / "data" / "index_issn.json").read_text(encoding="utf-8") +) + EXPECTED_CITATIONS = [ { @@ -513,7 +518,7 @@ def api_manager(qlever_endpoint: str, virtuoso_endpoint: str) -> APIManager: "cited": ZENODO_DMP_PIDS, "creation": "2021-06-08", "timespan": "-P0Y0M1D", - "journal_sc": "yes", + "journal_sc": "no", "author_sc": "yes", }, ] @@ -638,6 +643,59 @@ def test_reference_count_by_doi(api_manager: APIManager) -> None: assert result == [{"count": "45"}] +@pytest.mark.parametrize("isbn", ["9789048127108", "9781402096327"]) +@pytest.mark.parametrize( + ("operation", "expected"), + [ + ("citation-count", [{"count": "0"}]), + ("reference-count", [{"count": "0"}]), + ("citations", []), + ("references", []), + ], +) +def test_operations_by_isbn(api_manager, isbn, operation, expected): + result = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/isbn:{isbn}") + ) + result_by_omid = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/omid:br/0612058700") + ) + assert result == result_by_omid == expected + + +@pytest.mark.parametrize( + ("operation", "expected"), + [ + ("citation-count", [{"count": "1"}]), + ("reference-count", [{"count": "2"}]), + ], +) +@pytest.mark.parametrize("isbn", ["9789663601922", "978-966-360-192-2"]) +def test_nonzero_counts_by_isbn(api_manager, operation, expected, isbn): + result = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/isbn:{isbn}") + ) + result_by_omid = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/omid:br/06101786021") + ) + assert result == result_by_omid == expected + + +@pytest.mark.parametrize("operation", ["citations", "references"]) +@pytest.mark.parametrize("isbn", ["9789663601922", "978-966-360-192-2"]) +def test_citation_data_by_isbn(api_manager, operation, isbn): + result = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/isbn:{isbn}") + ) + result_by_omid = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/omid:br/06101786021") + ) + expected = normalize_citations(ISBN_EXAMPLES[operation]["selected_results"]) + assert ( + normalize_citations(result) == normalize_citations(result_by_omid) == expected + ) + + def test_citation_count_by_pmid(api_manager: APIManager) -> None: result = json.loads( execute_operation(api_manager, "/index/v2/citation-count/pmid:25378340") @@ -652,13 +710,63 @@ def test_reference_count_by_pmid(api_manager: APIManager) -> None: assert result == [{"count": "0"}] -def test_venue_citation_count(api_manager: APIManager) -> None: +@pytest.mark.parametrize("issn", ["2641-3337", "26413337"]) +def test_venue_citation_count(api_manager: APIManager, issn: str) -> None: result = json.loads( - execute_operation(api_manager, "/index/v2/venue-citation-count/issn:2641-3337") + execute_operation(api_manager, f"/index/v2/venue-citation-count/issn:{issn}") ) assert result == [{"count": "6"}] +@pytest.mark.parametrize( + ("operation", "expected"), + [ + ("citation-count", [{"count": "0"}]), + ("reference-count", [{"count": "0"}]), + ("citations", []), + ("references", []), + ], +) +def test_operations_by_issn(api_manager, operation, expected): + result = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/issn:2641-3337") + ) + result_by_omid = json.loads( + execute_operation(api_manager, f"/index/v2/{operation}/omid:br/062501778099") + ) + assert result == result_by_omid == expected + + +@pytest.mark.parametrize( + ("issn", "omid", "operation"), + [ + ("0192-8651", "0615019585", "citations"), + ("1096-987X", "0615019585", "citations"), + ("1096987x", "0615019585", "citations"), + ("2295-9254", "06101680950", "references"), + ("2295-9262", "06101680950", "references"), + ], +) +@pytest.mark.parametrize("count", [False, True]) +def test_nonzero_citations_by_issn(api_manager, issn, omid, operation, count): + endpoint = f"{operation[:-1]}-count" if count else operation + result = json.loads( + execute_operation(api_manager, f"/index/v2/{endpoint}/issn:{issn}") + ) + result_by_omid = json.loads( + execute_operation(api_manager, f"/index/v2/{endpoint}/omid:br/{omid}") + ) + if count: + assert result == result_by_omid == [{"count": "2"}] + else: + expected = normalize_citations(ISSN_EXAMPLES[operation]["selected_results"]) + assert ( + normalize_citations(result) + == normalize_citations(result_by_omid) + == expected + ) + + def test_citations_negative_timespan(api_manager: APIManager) -> None: result = json.loads( execute_operation(api_manager, f"/index/v2/citations/{ZENODO_DMP_OMID}") @@ -691,35 +799,3 @@ def test_citations_with_author_sc(api_manager: APIManager) -> None: assert normalize_citations(result) == normalize_citations( EXPECTED_QSS_ARTICLE_CITATIONS ) - - -def test_citation_count_meta_anyids_failure(api_manager: APIManager) -> None: - with patch("indexapi_common.post", side_effect=RequestException): - result = json.loads( - execute_operation( - api_manager, f"/index/v2/citation-count/{MAIN_PAPER_OMID}" - ) - ) - assert result == [{"count": "0"}] - - -def test_citation_count_meta_sparql_failure(api_manager: APIManager) -> None: - with ( - patch("indexapi_v2.post", side_effect=RequestException), - patch("indexapi_common.post", side_effect=RequestException), - ): - result = json.loads( - execute_operation(api_manager, f"/index/v2/citation-count/{MAIN_PAPER_DOI}") - ) - assert result == [{"count": "0"}] - - -def test_citations_meta_sparql_failure(api_manager: APIManager) -> None: - with ( - patch("indexapi_v2.post", side_effect=RequestException), - patch("indexapi_common.post", side_effect=RequestException), - ): - result = json.loads( - execute_operation(api_manager, f"/index/v2/citations/{MAIN_PAPER_OMID}") - ) - assert result == [] diff --git a/test/test_metaapi.py b/test/test_metaapi.py index f03c3eb..97848b3 100644 --- a/test/test_metaapi.py +++ b/test/test_metaapi.py @@ -7,13 +7,12 @@ @pytest.fixture(scope="session") -def api_manager(virtuoso_endpoint: str) -> APIManager: - virtuoso_base = virtuoso_endpoint.rsplit("/", 1)[0] +def api_manager(qlever_endpoint: str) -> APIManager: return create_api_manager( "src/api/meta_v1.hf", { - "#base https://api.opencitations.net/meta": f"#base {virtuoso_base}", - "#endpoint http://virtuoso-service.default.svc.cluster.local:8890/sparql": f"#endpoint {virtuoso_endpoint}", + "#base https://api.opencitations.net/meta": f"#base {qlever_endpoint}", + "#endpoint http://meta-qlever-service.default.svc.cluster.local:7011": f"#endpoint {qlever_endpoint}", "#addon metaapi": "#addon ../src/api/metaapi", }, ) diff --git a/test/test_skgif_filter.py b/test/test_skgif_filter.py index 0529c0d..ab99626 100644 --- a/test/test_skgif_filter.py +++ b/test/test_skgif_filter.py @@ -182,6 +182,14 @@ def _canonical_entities(entities: list[dict]) -> list[dict]: return sorted(canonical, key=lambda entity: entity["local_identifier"]) +def _has_word_clause(variable: str, word: str) -> str: + return ( + f"{{ SELECT DISTINCT ?{variable} WHERE {{ ?{variable} " + " ?_word . " + f'FILTER STRSTARTS(?_word, "{word}") }} }}' + ) + + def _filter_param_description(spec: dict, entity: str) -> str: op_spec = spec["paths"][f"/{entity}"]["get"] inline_params = [ @@ -208,9 +216,7 @@ def test_returns_all_products(self, skgif_api_manager: APIManager) -> None: class TestTitleFilter: - def test_title_search_uses_virtuoso_text_index( - self, skgif_api_manager: APIManager - ) -> None: + def test_title_search_uses_text_index(self, skgif_api_manager: APIManager) -> None: op = skgif_api_manager.get_op( "/skg-if/v1/products?filter=cf.search.title:Covid-19" ) @@ -218,11 +224,12 @@ def test_title_search_uses_virtuoso_text_index( params = op._prepare_params() filter_param = params["filter"] assert isinstance(filter_param, str) - assert ( - filter_param - == "?local_identifier dcterm:title ?title .\n?title bif:contains \"'Covid-19'\" ." + assert filter_param == ( + "?local_identifier dcterm:title ?title .\n" + f"{_has_word_clause('title', 'covid')}\n" + "?local_identifier dcterm:title ?title .\n" + f"{_has_word_clause('title', '19')}" ) - assert "CONTAINS" not in filter_param def test_title_search_matches_content(self, skgif_api_manager: APIManager) -> None: results = _exec( @@ -586,21 +593,21 @@ def test_filter_descriptions_keep_expected_order( class TestPersonsEndpoint: - def test_text_search_uses_virtuoso_index( - self, skgif_api_manager: APIManager - ) -> None: + def test_text_search_uses_text_index(self, skgif_api_manager: APIManager) -> None: expected_filters = { "cf.search.family_name:Peroni": ( "?local_identifier foaf:familyName ?familyName .\n" - "?familyName bif:contains \"'Peroni'\" ." + f"{_has_word_clause('familyName', 'peroni')}" ), "cf.search.given_name:Silvio": ( "?local_identifier foaf:givenName ?givenName .\n" - "?givenName bif:contains \"'Silvio'\" ." + f"{_has_word_clause('givenName', 'silvio')}" ), "cf.search.name:Peroni Silvio": ( "?local_identifier foaf:name ?name .\n" - "?name bif:contains \"'Peroni Silvio'\" ." + f"{_has_word_clause('name', 'peroni')}\n" + "?local_identifier foaf:name ?name .\n" + f"{_has_word_clause('name', 'silvio')}" ), } for filter_value, expected_filter in expected_filters.items(): @@ -609,7 +616,6 @@ def test_text_search_uses_virtuoso_index( filter_param = op._prepare_params()["filter"] assert isinstance(filter_param, str) assert filter_param == expected_filter - assert "FILTER(CONTAINS" not in filter_param def test_returns_person_by_identifier(self, skgif_api_manager: APIManager) -> None: results = _exec( @@ -651,9 +657,7 @@ def test_filters(self, skgif_api_manager: APIManager) -> None: class TestOrganisationsEndpoint: - def test_text_search_uses_virtuoso_index( - self, skgif_api_manager: APIManager - ) -> None: + def test_text_search_uses_text_index(self, skgif_api_manager: APIManager) -> None: op = skgif_api_manager.get_op( "/skg-if/v1/organisations?filter=cf.search.name:Mit Press" ) @@ -661,9 +665,8 @@ def test_text_search_uses_virtuoso_index( filter_param = op._prepare_params()["filter"] assert isinstance(filter_param, str) assert filter_param == ( - "?local_identifier foaf:name ?name .\n?name bif:contains \"'Mit Press'\" ." + f"{_has_word_clause('name', 'mit')}\n{_has_word_clause('name', 'press')}" ) - assert "FILTER(CONTAINS" not in filter_param def test_returns_organisation_by_identifier( self, skgif_api_manager: APIManager @@ -701,9 +704,7 @@ def test_filters(self, skgif_api_manager: APIManager) -> None: class TestVenuesEndpoint: - def test_text_search_uses_virtuoso_index( - self, skgif_api_manager: APIManager - ) -> None: + def test_text_search_uses_text_index(self, skgif_api_manager: APIManager) -> None: op = skgif_api_manager.get_op( "/skg-if/v1/venues?filter=cf.search.name:Digital Libraries" ) @@ -712,9 +713,10 @@ def test_text_search_uses_virtuoso_index( assert isinstance(filter_param, str) assert filter_param == ( "?local_identifier dcterms:title ?name .\n" - "?name bif:contains \"'Digital Libraries'\" ." + f"{_has_word_clause('name', 'digital')}\n" + "?local_identifier dcterms:title ?name .\n" + f"{_has_word_clause('name', 'libraries')}" ) - assert "FILTER(CONTAINS" not in filter_param def test_returns_venue_by_identifier(self, skgif_api_manager: APIManager) -> None: results = _exec( diff --git a/test/virtuoso-meta-data/database/virtuoso-temp.db b/test/virtuoso-meta-data/database/virtuoso-temp.db deleted file mode 100644 index 2fc18f5..0000000 Binary files a/test/virtuoso-meta-data/database/virtuoso-temp.db and /dev/null differ diff --git a/test/virtuoso-meta-data/database/virtuoso.db b/test/virtuoso-meta-data/database/virtuoso.db deleted file mode 100644 index 0abd91f..0000000 Binary files a/test/virtuoso-meta-data/database/virtuoso.db and /dev/null differ diff --git a/test/virtuoso-meta-data/database/virtuoso.ini b/test/virtuoso-meta-data/database/virtuoso.ini deleted file mode 100644 index 291be43..0000000 --- a/test/virtuoso-meta-data/database/virtuoso.ini +++ /dev/null @@ -1,241 +0,0 @@ -; -; virtuoso.ini -; -; Configuration file for the OpenLink Virtuoso VDBMS Server -; -; To learn more about this product, or any other product in our -; portfolio, please check out our web site at: -; -; http://virtuoso.openlinksw.com/ -; -; or contact us at: -; -; general.information@openlinksw.com -; -; If you have any technical questions, please contact our support -; staff at: -; -; technical.support@openlinksw.com -; -; -; Database setup -; -[Database] -DatabaseFile = ../database/virtuoso.db -ErrorLogFile = ../database/virtuoso.log -LockFile = ../database/virtuoso.lck -TransactionFile = ../database/virtuoso.trx -xa_persistent_file = ../database/virtuoso.pxa -ErrorLogLevel = 7 -FileExtend = 200 -MaxCheckpointRemap = 2000 -Striping = 0 -TempStorage = TempDatabase - -[TempDatabase] -DatabaseFile = ../database/virtuoso-temp.db -TransactionFile = ../database/virtuoso-temp.trx -MaxCheckpointRemap = 2000 -Striping = 0 -;MaxTempDBPages = 50G ; Limit size of the TempDatabase file to 50GB on disk - -; -; Server parameters -; -[Parameters] -ServerPort = 1111 -LiteMode = 0 -DisableUnixSocket = 1 -DisableTcpSocket = 0 -;SSLServerPort = 2111 -;SSLCertificate = cert.pem -;SSLPrivateKey = pk.pem -;X509ClientVerify = 0 -;X509ClientVerifyDepth = 0 -;X509ClientVerifyCAFile = ca.pem -MaxClientConnections = 10 -CheckpointInterval = 60 -SoftCheckpoint = 0 -O_DIRECT = 0 -CaseMode = 2 -MaxStaticCursorRows = 5000 -CheckpointAuditTrail = 0 -AllowOSCalls = 0 -SchedulerInterval = 10 -DirsAllowed = / -ThreadCleanupInterval = 1 -ThreadThreshold = 10 -ResourcesCleanupInterval = 1 -FreeTextBatchSize = 100000 -SingleCPU = 0 -VADInstallDir = ../vad/ -PrefixResultNames = 0 -RdfFreeTextRulesSize = 100 -IndexTreeMaps = 64 -MaxMemPoolSize = 400000000 -PrefixResultNames = 0 -MacSpotlight = 0 -MaxQueryMem = 2G ; memory allocated to query processor -VectorSize = 1000 ; initial parallel query vector (array of query operations) size -MaxVectorSize = 1000000 ; query vector size threshold. -AdjustVectorSize = 0 -ThreadsPerQuery = 4 -AsyncQueueMaxThreads = 10 -;; -;; When running with large data sets, one should configure the Virtuoso -;; process to use between 2/3 to 3/5 of free system memory and to stripe -;; storage on all available disks. -;; -;; Uncomment next two lines if there is 2 GB system memory free -;NumberOfBuffers = 170000 -;MaxDirtyBuffers = 130000 -;; Uncomment next two lines if there is 4 GB system memory free -;NumberOfBuffers = 340000 -; MaxDirtyBuffers = 250000 -;; Uncomment next two lines if there is 8 GB system memory free -;NumberOfBuffers = 680000 -;MaxDirtyBuffers = 500000 -;; Uncomment next two lines if there is 16 GB system memory free -;NumberOfBuffers = 1360000 -;MaxDirtyBuffers = 1000000 -;; Uncomment next two lines if there is 32 GB system memory free -;NumberOfBuffers = 2720000 -;MaxDirtyBuffers = 2000000 -;; Uncomment next two lines if there is 48 GB system memory free -;NumberOfBuffers = 4000000 -;MaxDirtyBuffers = 3000000 -;; Uncomment next two lines if there is 64 GB system memory free -;NumberOfBuffers = 5450000 -;MaxDirtyBuffers = 4000000 -;; -;; Note the default settings will take very little memory -;; but will not result in very good performance -;; -NumberOfBuffers = 10000 -MaxDirtyBuffers = 6000 -SSLServerPort = 1112 -SSLCertificate = virtuoso.crt -SSLPrivateKey = virtuoso.key - -[HTTPServer] -ServerPort = 8890 -ServerRoot = ../vsp -MaxClientConnections = 10 -DavRoot = DAV -EnabledDavVSP = 0 -HTTPProxyEnabled = 0 -TempASPXDir = 0 -DefaultMailServer = localhost:25 -MaxKeepAlives = 10 -KeepAliveTimeout = 10 -MaxCachedProxyConnections = 10 -ProxyConnectionCacheTimeout = 15 -HTTPThreadSize = 280000 -HttpPrintWarningsInOutput = 0 -Charset = UTF-8 -;HTTPLogFile = logs/http.log -MaintenancePage = atomic.html -EnabledGzipContent = 1 -SSLPort = 8891 -SSLCertificate = virtuoso.crt -SSLPrivateKey = virtuoso.key - -[AutoRepair] -BadParentLinks = 0 - -[Client] -SQL_PREFETCH_ROWS = 100 -SQL_PREFETCH_BYTES = 16000 -SQL_QUERY_TIMEOUT = 0 -SQL_TXN_TIMEOUT = 0 -;SQL_NO_CHAR_C_ESCAPE = 1 -;SQL_UTF8_EXECS = 0 -;SQL_NO_SYSTEM_TABLES = 0 -;SQL_BINARY_TIMESTAMP = 1 -;SQL_ENCRYPTION_ON_PASSWORD = -1 - -[VDB] -ArrayOptimization = 0 -NumArrayParameters = 10 -VDBDisconnectTimeout = 1000 -KeepConnectionOnFixedThread = 0 - -[Replication] -ServerName = db-NOBLE-PORT -ServerEnable = 1 -QueueMax = 50000 - -; -; Striping setup -; -; These parameters have only effect when Striping is set to 1 in the -; [Database] section, in which case the DatabaseFile parameter is ignored. -; -; With striping, the database is spawned across multiple segments -; where each segment can have multiple stripes. -; -; Format of the lines below: -; Segment = , [, .. ] -; -; must be ordered from 1 up. -; -; The is the total size of the segment which is equally divided -; across all stripes forming the segment. Its specification can be in -; gigabytes (g), megabytes (m), kilobytes (k) or in database blocks -; (b, the default) -; -; Note that the segment size must be a multiple of the database page size -; which is currently 8k. Also, the segment size must be divisible by the -; number of stripe files forming the segment. -; -; The example below creates a 200 meg database striped on two segments -; with two stripes of 50 meg and one of 100 meg. -; -; You can always add more segments to the configuration, but once -; added, do not change the setup. -; -[Striping] -Segment1 = 100M, db-seg1-1.db, db-seg1-2.db -Segment2 = 100M, db-seg2-1.db -;... -;[TempStriping] -;Segment1 = 100M, db-seg1-1.db, db-seg1-2.db -;Segment2 = 100M, db-seg2-1.db -;... -;[Ucms] -;UcmPath = -;Ucm1 = -;Ucm2 = -;... - -[Zero Config] -ServerName = virtuoso (NOBLE-PORT) -;ServerDSN = ZDSN -;SSLServerName = -;SSLServerDSN = - -[Mono] -;MONO_TRACE = Off -;MONO_PATH = -;MONO_ROOT = -;MONO_CFG_DIR = -;virtclr.dll = - -[URIQA] -DynamicLocal = 0 -DefaultHost = localhost:8890 - -[SPARQL] -DefaultGraph = -DefaultQuery = select distinct ?Concept where {[] a ?Concept} LIMIT 100 -;ResultSetMaxRows = 100000 -;MaxConstructTriples = 100000 -;MaxQueryExecutionTime = 120 ; in seconds -;LabelInferenceName = facets ; Only needed when using the Faceted Browser - -[Plugins] -LoadPath = ../hosting -Load1 = plain, geos -Load2 = plain, graphql -Load3 = plain, proj4 -Load4 = plain, shapefileio diff --git a/test/virtuoso-meta-data/database/virtuoso.pxa b/test/virtuoso-meta-data/database/virtuoso.pxa deleted file mode 100644 index e69de29..0000000 diff --git a/test/virtuoso-meta-data/database/virtuoso.trx b/test/virtuoso-meta-data/database/virtuoso.trx deleted file mode 100644 index e69de29..0000000 diff --git a/uv.lock b/uv.lock index 0ad7e53..4266954 100644 --- a/uv.lock +++ b/uv.lock @@ -156,14 +156,11 @@ wheels = [ [[package]] name = "click" -version = "8.3.1" +version = "8.5.0" source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/3d/fa/656b739db8587d7b5dfa22e22ed02566950fbfbcdc20311993483657a5c0/click-8.3.1.tar.gz", hash = "sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a", size = 295065, upload-time = "2025-11-15T20:45:42.706Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/0e/7fa0ef50764b67090eca4114772a2abf8b6148198475e54c660b97caeee6/click-8.5.0.tar.gz", hash = "sha256:ba0d2089de75ea0310e2dde03160e6ca10009947fb95a182f9b54021bb272e34", size = 382235, upload-time = "2026-08-26T13:33:14.56Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/98/78/01c019cdb5d6498122777c1a43056ebb3ebfeef2076d9d026bfe15583b2b/click-8.3.1-py3-none-any.whl", hash = "sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6", size = 108274, upload-time = "2025-11-15T20:45:41.139Z" }, + { url = "https://files.pythonhosted.org/packages/58/50/6c0d534c5f134586a8e1ba4e330569e32f057e33372ae556463212fb4cd3/click-8.5.0-py3-none-any.whl", hash = "sha256:255bc9599cf7748b4b1a446ccc735421bd08a2ae529a8b88597d3de5664ee360", size = 125251, upload-time = "2026-08-26T13:33:12.928Z" }, ] [[package]] @@ -296,14 +293,14 @@ wheels = [ [[package]] name = "flask-swagger-ui" -version = "5.32.6" +version = "5.33.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "flask" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c8/db/06cd2b77fff6c115c37dc8ec4db04ee6e5119799a27c7e19410f0f303c0e/flask_swagger_ui-5.32.6.tar.gz", hash = "sha256:38730cb566e5f1d70deb8bb1035ef1565b35dc50cdfd2a9e507779a751d46930", size = 613730, upload-time = "2026-05-18T10:31:09.328Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a5/9c/3b4ff2c907d5e4fe872bf593250bf3ef0725da24c26a7348a4df08b86eb1/flask_swagger_ui-5.33.0.tar.gz", hash = "sha256:96ec9bbb2ddc004123b722242111a08f074f04d2c93dfbd3682f7720cd5f80e2", size = 639836, upload-time = "2026-09-21T15:28:29.051Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/10/9f/a0510e3c648f2e6b58bbf5dc7db23668ec0ad5db90e1d84afb466a1f778f/flask_swagger_ui-5.32.6-py3-none-any.whl", hash = "sha256:83ec82f2b1da3628d89bc2eaa4836fdba7194353ff09d3d5c7d1e6892f345336", size = 618735, upload-time = "2026-05-18T10:31:07.034Z" }, + { url = "https://files.pythonhosted.org/packages/bc/f9/c0900ac012e625f902ec3445e22ed6ab5c5325a05416db0c45356c996394/flask_swagger_ui-5.33.0-py3-none-any.whl", hash = "sha256:183a0234fa0e0e001fbb1a5f8a4aa762729f7eaf34ff288bd7a00514a6ab7381", size = 644885, upload-time = "2026-09-21T15:28:27.46Z" }, ] [[package]] @@ -565,11 +562,11 @@ wheels = [ [[package]] name = "markdown" -version = "3.10.2" +version = "3.10.3" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2b/f4/69fa6ed85ae003c2378ffa8f6d2e3234662abd02c10d216c0ba96081a238/markdown-3.10.2.tar.gz", hash = "sha256:994d51325d25ad8aa7ce4ebaec003febcce822c3f8c911e3b17c52f7f589f950", size = 368805, upload-time = "2026-02-09T14:57:26.942Z" } +sdist = { url = "https://files.pythonhosted.org/packages/29/6f/da4c6aea59b3001f2e8c0ec7497475aadaf3b021c10cab5b2858f0f32b26/markdown-3.10.3.tar.gz", hash = "sha256:3589362618f743188b4d955b874402bc814f4f83f544dc207719f4baa7d9c45f", size = 372596, upload-time = "2026-07-30T19:05:29.005Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/de/1f/77fa3081e4f66ca3576c896ae5d31c3002ac6607f9747d2e3aa49227e464/markdown-3.10.2-py3-none-any.whl", hash = "sha256:e91464b71ae3ee7afd3017d9f358ef0baf158fd9a298db92f1d4761133824c36", size = 108180, upload-time = "2026-02-09T14:57:25.787Z" }, + { url = "https://files.pythonhosted.org/packages/64/69/4a5af2bc115a9a33fefe51709749de8262be3f9ba063d1753a837cdbc49c/markdown-3.10.3-py3-none-any.whl", hash = "sha256:fa6c92a00a4a3c98b22728c64a935ae1928250ae65058a6ded814d2cc29a4cea", size = 110757, upload-time = "2026-07-30T19:05:27.883Z" }, ] [[package]] @@ -686,7 +683,7 @@ wheels = [ [[package]] name = "oc-api" -version = "4.0.1" +version = "4.2.0" source = { editable = "." } dependencies = [ { name = "gevent" }, @@ -720,7 +717,7 @@ requires-dist = [ { name = "gunicorn", specifier = ">=22.0.0" }, { name = "idna", specifier = ">=3.15" }, { name = "python-dateutil", specifier = ">=2.9.0.post0" }, - { name = "ramose", specifier = ">=2.9.1" }, + { name = "ramose", specifier = ">=2.10.1" }, { name = "rdflib", specifier = ">=6.1.1" }, { name = "redis", specifier = ">=7.0.1" }, { name = "requests", specifier = ">=2.32.4" }, @@ -980,7 +977,7 @@ wheels = [ [[package]] name = "ramose" -version = "2.9.1" +version = "2.10.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "flask" }, @@ -989,9 +986,9 @@ dependencies = [ { name = "pyyaml" }, { name = "requests" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/ac/bb/26d5fcc24bc3cfe31ba185ba1cfc174904afc8f39d3244363204fcfdcc1c/ramose-2.9.1.tar.gz", hash = "sha256:5dcf9856f5d79f509df02838b7d3957b04f865ce7cedb1a2baff280ed5c26c53", size = 1146976, upload-time = "2026-09-09T18:23:51.808Z" } +sdist = { url = "https://files.pythonhosted.org/packages/cf/77/2bacb8c996bec68057ebb197eade2cfd115ab913b225b5897fbf6e549c4b/ramose-2.10.1.tar.gz", hash = "sha256:8a1b3aa384594298554f69683685161bdb817837875ea2d62b7945e4a25aefdf", size = 1370934, upload-time = "2026-09-24T21:59:58.02Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1c/80/9bf440d2bf194bc52ce73401936d97529e1f6df8a4b9dc9ab42f7e50d901/ramose-2.9.1-py3-none-any.whl", hash = "sha256:0652138f0ef17736a0d1f71be29966d3918a817a9d30d850dc0492d153369ca3", size = 66525, upload-time = "2026-09-09T18:23:50.388Z" }, + { url = "https://files.pythonhosted.org/packages/5b/ed/61f973b673c47139bc01554f103d7b582d3c02efd4df0b3dfeabd5a1d5de/ramose-2.10.1-py3-none-any.whl", hash = "sha256:c3fda73f6c3adca93e3a9acc7859f8de02494d6613b1dcaaff9804fe91cfc799", size = 70432, upload-time = "2026-09-24T21:59:56.983Z" }, ] [[package]] @@ -1041,7 +1038,7 @@ wheels = [ [[package]] name = "requests" -version = "2.32.4" +version = "2.34.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, @@ -1049,9 +1046,9 @@ dependencies = [ { name = "idna" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/e1/0a/929373653770d8a0d7ea76c37de6e41f11eb07559b103b1c02cafb3f7cf8/requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422", size = 135258, upload-time = "2025-06-09T16:43:07.34Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ac/c3/e2a2b89f2d3e2179abd6d00ebd70bff6273f37fb3e0cc209f48b39d00cbf/requests-2.34.2.tar.gz", hash = "sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed", size = 142856, upload-time = "2026-05-14T19:25:27.735Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c", size = 64847, upload-time = "2025-06-09T16:43:05.728Z" }, + { url = "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", hash = "sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0", size = 73075, upload-time = "2026-05-14T19:25:26.443Z" }, ] [[package]]