Skip to content

Bugfix 48 creator query too narrow #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Bugfix 48 creator query too narrow #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70f1d37
adding jsonld w/ alt config of "creator" (#48)
iannesbitt Oct 24, 2023
b2ab6d5
adding spoofed systemmetadata file for creator-role json-ld test case
iannesbitt Aug 17, 2024
b12e74b
adding sparql queries to address #48
iannesbitt Aug 17, 2024
97648fe
adding a test for creator role list types
iannesbitt Aug 17, 2024
ef308ff
changing sm time to not match
iannesbitt Aug 17, 2024
2d643a1
adding unit test for schema.org creator-role and creator-role-list sp…
iannesbitt Aug 20, 2024
4632e2b
adding unit test for schema.org creatorrole and creatorrolelist sparq…
iannesbitt Aug 20, 2024
aab0578
reducing test time
iannesbitt Oct 16, 2024
3151375
reducing test time #2
iannesbitt Oct 16, 2024
87881f0
adding bean references to application-context-json-ld.xml
iannesbitt Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/resources/application-context-json-ld.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<ref bean="schema_org_funder_identifier" />
<ref bean="schema_org_funder_name" />
<ref bean="schema_org_creator_list" />
<ref bean="schema_org_creator_role_name" />
<ref bean="schema_org_creator_list_role_name" />
<ref bean="schema_org_hasPart" />
<ref bean="schema_org_keywords" />
<ref bean="schema_org_license_url" />
Expand Down
91 changes: 91 additions & 0 deletions src/main/resources/application-context-schema-org.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,97 @@
</constructor-arg>
</bean>

<!-- This query extracts the name from a creator field that uses no list when there is a single creator,
and also nests creator fields with @type definitions.
{
"@context": {
"@vocab": "https://schema.org/"
},
"@graph": {
"creator": {
"@type": "Role",
"creator": {
"@type": "Person",
...
"name": "..."
}
}
}
}
-->
<bean id="schema_org_creator_role_name" class="org.dataone.cn.indexer.annotation.SparqlField">
<constructor-arg name="name" value="origin" />
<constructor-arg name="query">
<value>
<![CDATA[
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
PREFIX SO: <http://schema.org/>

SELECT (?name as ?origin)
WHERE {
?dsId rdf:type SO:Dataset .
?dsId SO:creator $creator .
$creator SO:creator ?role .
$role SO:name ?name .
}
]]>
</value>
</constructor-arg>
</bean>

<!-- This query extracts the names from a creator field that uses ordered list syntax when there are multiple creators,
and also nests creator fields with @type definitions.
{
"@context": {
"@vocab": "https://schema.org/"
},
"@graph": {
"creator": [
{
"@type": "Role",
"creator": {
"@type": "Person",
...
"name": "Person 1"
}
},
{
"@type": "Role",
"creator": {
"@type": "Person",
...
"name": "Person 2"
}
}
]
}
}
-->
<bean id="schema_org_creator_list_role_name" class="org.dataone.cn.indexer.annotation.SparqlField">
<constructor-arg name="name" value="origin" />
<constructor-arg name="query">
<value>
<![CDATA[
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
PREFIX SO: <http://schema.org/>

SELECT (?name as ?origin)
WHERE {
?dsId rdf:type SO:Dataset .
?dsId SO:creator ?creatorList .
?creatorList list:member ?creator .
?creatorList list:index ?pos .
?creator SO:creator ?role .
?role SO:name ?name .
}
order by (?pos)
]]>
</value>
</constructor-arg>
</bean>

<bean id="schema_org_prov_hadDerivation" class="org.dataone.cn.indexer.annotation.SparqlField">
<constructor-arg name="name" value="prov_hasDerivations" />
<constructor-arg name="query">
Expand Down
65 changes: 64 additions & 1 deletion src/test/java/org/dataone/cn/index/JsonLdSubprocessorTest.java
View file
Open in desktop
Copy link
Collaborator

@artntek artntek Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both these new tests fail for me:

+++++++++++++++++++The value of the field authorGivenName from Solr is null
The expected value of the field authorGivenName is Ian

Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public class JsonLdSubprocessorTest extends DataONESolrJettyTestBase {
private String schemaOrgTestDocDryad2Pid = "doi.org_10.5061_dryad.41sk145.jsonld";
private Resource schemaOrgTesHakaiDeep;
private String schemaOrgTesHakaiDeepPid = "hakai-deep-schema.jsonld";
private Resource schemaOrgTestCreatorRole;
private String schemaOrgTestCreatorRolePid = "creator-role.jsonld";
private Resource schemaOrgTestCreatorRoleList;
private String schemaOrgTestCreatorRoleListPid = "creator-role-list.jsonld";


/* An instance of the RDF/XML Subprocessor */
private JsonLdSubprocessor jsonLdSubprocessor;
Expand Down Expand Up @@ -122,6 +127,8 @@ public void setUp() throws Exception {
schemaOrgTestDocDryad1 = (Resource) context.getBean("schemaOrgTestDryad1");
schemaOrgTestDocDryad2 = (Resource) context.getBean("schemaOrgTestDryad2");
schemaOrgTesHakaiDeep = (Resource) context.getBean("schemaOrgTesHakaiDeep");
schemaOrgTestCreatorRole = (Resource) context.getBean("schemaOrgTestCreatorRole");
schemaOrgTestCreatorRoleList = (Resource) context.getBean("schemaOrgTestCreatorRoleList");

// instantiate the subprocessor
jsonLdSubprocessor = (JsonLdSubprocessor) context.getBean("jsonLdSubprocessor");
Expand Down Expand Up @@ -532,5 +539,61 @@ public void testHakaiDeep() throws Exception {
String[] license = {"https://creativecommons.org/licenses/by/4.0/"};
assertTrue(compareFieldValue(id, "licenseUrl", license));
}


/**
* Test that the JsonLdSubprocessor can successfully index JSONLD documents with creator roles.
*
* @throws Exception
*/
@Test
public void testCreatorRole() throws Exception {
String id = schemaOrgTestCreatorRolePid;
indexObjectToSolr(id, schemaOrgTestCreatorRole);

//Thread.sleep(2*SLEEPTIME);
// now process the tasks
//processor.processIndexTaskQueue();
int TIMES = 2*8 + 10*2;
int SLEEP = 500;
for (int i=0; i<TIMES; i++) {
try {
Thread.sleep(SLEEP);
assertPresentInSolrIndex(id);
break;
} catch (Throwable e) {

}
}
assertTrue(compareFieldValue(id, "authorGivenName", "Ian"));
assertTrue(compareFieldValue(id, "authorLastName", "Nesbitt"));
}

/**
* Test that the JsonLdSubprocessor can successfully index JSONLD documents with creator role lists.
*
* @throws Exception
*/
@Test
public void testCreatorRoleList() throws Exception {
String id = schemaOrgTestCreatorRoleListPid;
indexObjectToSolr(id, schemaOrgTestCreatorRoleList);

//Thread.sleep(2*SLEEPTIME);
// now process the tasks
//processor.processIndexTaskQueue();
int TIMES = 2*8 + 10*2;
int SLEEP = 500;
for (int i=0; i<TIMES; i++) {
try {
Thread.sleep(SLEEP);
assertPresentInSolrIndex(id);
break;
} catch (Throwable e) {

}
}
assertTrue(compareFieldValue(id, "authorGivenName", "Ian"));
assertTrue(compareFieldValue(id, "authorLastName", "Nesbitt"));
}

}
44 changes: 44 additions & 0 deletions ...dataone/cn/index/resources/d1_testdocs/json-ld/creator-role-list/creator-role-list.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"@context": "http://schema.org/",
"@type":"Dataset",
"description":"Vocab https://schema.org/, creator without @list and with @type: 'Role'. Modeled after CanWIN SO format.",
"name":"test of alternative creator field configuration",
"creator": [
{
"@type": "Role",
"creator": {
"@type": "Person",
"Affiliation": {
"@type": "Organization",
"name": "National Center for Ecological Analaysis and Synthesis"
},
"Email": "[email protected]",
"Identifier": {
"@type": "PropertyValue",
"propertyID": "https://registry.identifiers.org/registry/orcid",
"url": "http://orcid.org/0000-0001-5828-6070",
"value": "0000-0001-5828-6070"
},
"Name": "Nesbitt, Ian\t"
}
},
{
"@type": "Role",
"creator": {
"@type": "Person",
"Affiliation": {
"@type": "Organization",
"name": "National Center for Ecological Analaysis and Synthesis"
},
"Email": "[email protected]",
"Identifier": {
"@type": "PropertyValue",
"propertyID": "https://registry.identifiers.org/registry/orcid",
"url": "http://orcid.org/0000-0002-1209-5268",
"value": "0000-0002-1209-5268"
},
"Name": "Tao, Jing\t"
}
}
]
}
26 changes: 26 additions & 0 deletions ...s/org/dataone/cn/index/resources/d1_testdocs/json-ld/creator-role-list/systemmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<ns1:systemMetadata xmlns:ns1="http://ns.dataone.org/service/types/v2.0">
<serialVersion>1</serialVersion>
<identifier>creator-role-list.jsonld</identifier>
<formatId>science-on-schema.org/Dataset;ld+json</formatId>
<size>498</size>
<checksum algorithm="MD5"></checksum>
<submitter>dataone_integration_test_user</submitter>
<rightsHolder>dataone_integration_test_user</rightsHolder>
<accessPolicy>
<allow>
<subject>dataone_public_user</subject>
<permission>read</permission>
</allow>
<allow>
<subject>dataone_integration_test_user</subject>
<permission>write</permission>
</allow>
</accessPolicy>
<replicationPolicy replicationAllowed="true"/>
<dateUploaded>2024-08-17T12:59:47.171874</dateUploaded>
<dateSysMetadataModified>2024-08-17T12:59:47.173344</dateSysMetadataModified>
<originMemberNode>test_documents</originMemberNode>
<authoritativeMemberNode>test_documents</authoritativeMemberNode>
</ns1:systemMetadata>

24 changes: 24 additions & 0 deletions ...urces/org/dataone/cn/index/resources/d1_testdocs/json-ld/creator-role/creator-role.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"@context": "http://schema.org/",
"@type":"Dataset",
"description":"Vocab https://schema.org/, creator without @list and with @type: 'Role'. Modeled after CanWIN SO format.",
"name":"test of alternative creator field configuration",
"creator": {
"@type": "Role",
"creator": {
"@type": "Person",
"Affiliation": {
"@type": "Organization",
"name": "National Center for Ecological Analaysis and Synthesis"
},
"Email": "[email protected]",
"Identifier": {
"@type": "PropertyValue",
"propertyID": "https://registry.identifiers.org/registry/orcid",
"url": "http://orcid.org/0000-0001-5828-6070",
"value": "0000-0001-5828-6070"
},
"Name": "Nesbitt, Ian\t"
}
}
}
26 changes: 26 additions & 0 deletions ...ources/org/dataone/cn/index/resources/d1_testdocs/json-ld/creator-role/systemmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<ns1:systemMetadata xmlns:ns1="http://ns.dataone.org/service/types/v2.0">
<serialVersion>1</serialVersion>
<identifier>creator-role.jsonld</identifier>
<formatId>science-on-schema.org/Dataset;ld+json</formatId>
<size>498</size>
<checksum algorithm="MD5"></checksum>
<submitter>dataone_integration_test_user</submitter>
<rightsHolder>dataone_integration_test_user</rightsHolder>
<accessPolicy>
<allow>
<subject>dataone_public_user</subject>
<permission>read</permission>
</allow>
<allow>
<subject>dataone_integration_test_user</subject>
<permission>write</permission>
</allow>
</accessPolicy>
<replicationPolicy replicationAllowed="true"/>
<dateUploaded>2024-08-17T11:59:47.171874</dateUploaded>
<dateSysMetadataModified>2024-08-17T11:59:47.173344</dateSysMetadataModified>
<originMemberNode>test_documents</originMemberNode>
<authoritativeMemberNode>test_documents</authoritativeMemberNode>
</ns1:systemMetadata>

10 changes: 10 additions & 0 deletions src/test/resources/org/dataone/cn/index/test-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,16 @@ xmlns:context="http://www.springframework.org/schema/context"
value="org/dataone/cn/index/resources/d1_testdocs/json-ld/doi.org_10.5061_dryad.41sk145/doi.org_10.5061_dryad.41sk145.jsonld"/>
</bean>

<bean id="schemaOrgTestCreatorRole" class="org.springframework.core.io.ClassPathResource" >
<constructor-arg type="java.lang.String"
value="org/dataone/cn/index/resources/d1_testdocs/json-ld/creator-role/creator-role.jsonld"/>
</bean>

<bean id="schemaOrgTestCreatorRoleList" class="org.springframework.core.io.ClassPathResource" >
<constructor-arg type="java.lang.String"
value="org/dataone/cn/index/resources/d1_testdocs/json-ld/creator-role-list/creator-role-list.jsonld"/>
</bean>

<bean id="emlWithDataTableTestDoc" class="org.springframework.core.io.ClassPathResource" >
<constructor-arg type="java.lang.String"
value="org/dataone/cn/index/resources/d1_testdocs/eml220/eml2.2.0testdatatable/eml2.2.0testdatatable.xml"/>
Expand Down