diff --git a/project/dalia/query/items/metadata/one_to_one_metadata.py b/project/dalia/query/items/metadata/one_to_one_metadata.py index 0b4d3df71391bc5203e1a09addbfd7cedba08515..19161d0cf9b04a36dc2b5671b76bbe2ae2967502 100644 --- a/project/dalia/query/items/metadata/one_to_one_metadata.py +++ b/project/dalia/query/items/metadata/one_to_one_metadata.py @@ -37,7 +37,7 @@ def prepare_query_for_one_to_one_metadata_for_resources(resource_uri_refs: List[ (var_lr, RDF.type, educor.EducationalResource), OPTIONAL((var_lr, DCTERMS.description, _VARIABLES["description"])), OPTIONAL((var_lr, DCTERMS.title, _VARIABLES["title"])), - OPTIONAL((var_lr, DCTERMS.created, _VARIABLES["created"])), + OPTIONAL((var_lr, SCHEMA.datePublished, _VARIABLES["created"])), OPTIONAL((var_lr, DCTERMS.license, _VARIABLES["license"])), OPTIONAL((var_lr, SCHEMA.fileSize, _VARIABLES["fileSize"])), OPTIONAL((var_lr, SCHEMA.url, _VARIABLES["url"])), diff --git a/project/dalia/query/items/search/text_search_query.py b/project/dalia/query/items/search/text_search_query.py index 04ec63729e89d6d747e150ddc2f0c092467d0a55..6dd6474896d5dbbf911eb017eab2601ab0afec2a 100644 --- a/project/dalia/query/items/search/text_search_query.py +++ b/project/dalia/query/items/search/text_search_query.py @@ -45,7 +45,7 @@ def prepare_where_for_text_search_for_learning_resources( (var_list, Jena_ARQ_list.member, var_s), (var_lr, SCHEMA.author, var_list), OPTIONAL( - (var_lr, DCTERMS.created, var_created) + (var_lr, SCHEMA.datePublished, var_created) ) ), OPTIONAL( @@ -54,7 +54,7 @@ def prepare_where_for_text_search_for_learning_resources( ), (var_s, RDF.type, educor.EducationalResource), OPTIONAL( - (var_s, DCTERMS.created, var_created) + (var_s, SCHEMA.datePublished, var_created) ), BIND( var_s, diff --git a/project/dalia/rdf/namespace/SCHEMA.py b/project/dalia/rdf/namespace/SCHEMA.py index abe7c005b78b70107488539d8a2c9a88698883af..9a07494e6e84cc0b72cae258a91de925f1b07c32 100644 --- a/project/dalia/rdf/namespace/SCHEMA.py +++ b/project/dalia/rdf/namespace/SCHEMA.py @@ -7,6 +7,7 @@ NS = "https://schema.org/" # Properties author = URIRef(NS + "author") +datePublished = URIRef(NS + "datePublished") familyName = URIRef(NS + "familyName") fileSize = URIRef(NS + "fileSize") givenName = URIRef(NS + "givenName") diff --git a/tests/project/dalia/query/items/facets/test_existing_facet_items_in_database.py b/tests/project/dalia/query/items/facets/test_existing_facet_items_in_database.py index 0b41c8bb4f029948f66c8a44c48cb0c5fea6a4be..e0dca0cdfa0f132ac1d647037438397087e29ab0 100644 --- a/tests/project/dalia/query/items/facets/test_existing_facet_items_in_database.py +++ b/tests/project/dalia/query/items/facets/test_existing_facet_items_in_database.py @@ -27,14 +27,14 @@ def test_prepare_query_for_getting_existing_facet_items_in_text_search_for_facet ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . diff --git a/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py b/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py index c4bb8bff47a3fc489caca9668844e48ea3647cc2..5a2bd62ab0c237431940a712a7d5097bcad966a0 100644 --- a/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py +++ b/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py @@ -27,7 +27,7 @@ def test_prepare_query_for_one_to_one_metadata_for_resources(): ?lr <http://purl.org/dc/terms/title> ?title . } . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . OPTIONAL { ?lr <http://purl.org/dc/terms/license> ?license . diff --git a/tests/project/dalia/query/items/search/test_count.py b/tests/project/dalia/query/items/search/test_count.py index ff5856a58eafc7c56a80fd63df0eb0f322508f13..93f8ac0b033a27538389734c2c34cb97782173f4 100644 --- a/tests/project/dalia/query/items/search/test_count.py +++ b/tests/project/dalia/query/items/search/test_count.py @@ -31,14 +31,14 @@ def test_prepare_query_for_count_in_text_search(): ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . @@ -66,14 +66,14 @@ def test_prepare_query_for_count_in_text_search_with_target_audience_facet(): ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . diff --git a/tests/project/dalia/query/items/search/test_text_search.py b/tests/project/dalia/query/items/search/test_text_search.py index 93dc32b41c70b9ec40e3523b72db2ee8eef59222..84df0ade9c5ffc30c743ab8d4929ff8a0939753c 100644 --- a/tests/project/dalia/query/items/search/test_text_search.py +++ b/tests/project/dalia/query/items/search/test_text_search.py @@ -39,14 +39,14 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . @@ -81,14 +81,14 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_created_d ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . @@ -130,14 +130,14 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } . @@ -178,14 +178,14 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_created_a ?list <http://jena.apache.org/ARQ/list#member> ?s . ?lr <https://schema.org/author> ?list . OPTIONAL { - ?lr <http://purl.org/dc/terms/created> ?created . + ?lr <https://schema.org/datePublished> ?created . } . } . OPTIONAL { FILTER ( !ISBLANK ( ?s ) ) . ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://github.com/tibonto/educor#EducationalResource> . OPTIONAL { - ?s <http://purl.org/dc/terms/created> ?created . + ?s <https://schema.org/datePublished> ?created . } . BIND ( ?s AS ?lr ) . } .