Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
sennierer committed Oct 20, 2023
2 parents 91a7960 + 593b91d commit b68684f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [2.0.3](https://github.com/InTaVia/InTaVia-Backend/compare/v2.0.2...v2.0.3) (2023-10-19)


### Bug Fixes

* fixes an error due to missing prefixes ([9776346](https://github.com/InTaVia/InTaVia-Backend/commit/9776346f4d83cebff825652ca785573ef4cfef06))



## [2.0.2](https://github.com/InTaVia/InTaVia-Backend/compare/v2.0.1...v2.0.2) (2023-08-31)


Expand Down Expand Up @@ -49,12 +58,3 @@



## [0.5.2](https://github.com/InTaVia/InTaVia-Backend/compare/v0.5.1...v0.5.2) (2023-08-21)


### Bug Fixes

* fixes an issue with the pagination ([5b06d2f](https://github.com/InTaVia/InTaVia-Backend/commit/5b06d2f571185842b70d003ec4b9b07e6ddc52a3)), closes [#185](https://github.com/InTaVia/InTaVia-Backend/issues/185)



2 changes: 1 addition & 1 deletion intavia_backend/main_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ async def bulk_retrieve_biography_objects(
r_fin["text"] = r1.json()["text"]
elif "biotext" in r:
r_fin["text"] = r["biotext"]
if "bioAbstract" in res[0]:
if "bioAbstract" in r:
r2 = requests.get(r["bioAbstract"])
if r2.status_code == 200:
r_fin["abstract"] = r2.json()["text"]
Expand Down
5 changes: 4 additions & 1 deletion intavia_backend/sparql/add_datasets_v2_1.sparql
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ FROM <http://www.intavia.eu/graphs/provided_persons>
FROM <http://www.intavia.eu/graphs/provided_groups>
FROM <http://www.intavia.eu/graphs/provided_places>
FROM <http://www.intavia.eu/graphs/provided_cho>
FROM <http://www.intavia.org/graphs/person-id-enrichment>
FROM <http://www.intavia.org/graphs/place-id-enrichment>
FROM <http://www.intavia.org/graphs/group-id-enrichment>
{% for dataset in datasets %}
FROM <{{dataset.value}}>
{% endfor %}
{% endfor %}
11 changes: 8 additions & 3 deletions intavia_backend/sparql/bulk_retrieve_biographies_v2_1.sparql
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
PREFIX idmcore: <http://www.intavia.eu/idm-core/>
PREFIX bgn: <http://data.biographynet.nl/rdf/>

SELECT ?bioText ?bioAbstract ?bioID
SELECT ?bioText ?bioAbstract ?biotext ?bioID

{% include 'add_datasets_v2_1.sparql' %}

WHERE {
VALUES ?bioID { {% for id in ids %}<{{id}}> {% endfor %} }
?bioID idmcore:full_bio_link ?bioText .
OPTIONAL {?bioID idmcore:short_bio_link ?bioAbstract .}
{ ?bioID idmcore:full_bio_link ?bioText .
OPTIONAL {?bioID idmcore:short_bio_link ?bioAbstract .} }
UNION
{ ?bioID bgn:hasBioParts ?bioparts .
?bioparts bgn:text ?biotext .
FILTER NOT EXISTS { ?bioparts bgn:hasFigure ?fig . } }
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ profile = "black"

[tool.poetry]
name = "intavia-backend"
version = "2.0.2"
version = "2.0.3"
description = ""
authors = [ "Matthias Schlögl <[email protected]>" ]
license = "MIT"
Expand Down

0 comments on commit b68684f

Please sign in to comment.