Skip to content
This repository was archived by the owner on May 16, 2025. It is now read-only.

Commit 3270ea5

Browse files
committed
Rename "target_language" to "select_language"
1 parent 131e580 commit 3270ea5

File tree

6 files changed

+12
-12
lines changed
  • metafix/src

6 files changed

+12
-12
lines changed

metafix/src/main/java/org/metafacture/metafix/maps/RdfMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
*/
5757
public final class RdfMap extends AbstractReadOnlyMap<String, String> {
5858
public static final String TARGET = "target";
59-
public static final String TARGET_LANGUAGE = "target_language";
59+
public static final String TARGET_LANGUAGE = "select_language";
6060
public static final String SELECT = "select";
6161
private static final int MAX_REDIRECTIONS = 10;
6262
private static final int MIN_HTTP_STATUS_CODE = 299;

metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ public void shouldLookupRdfUrlWithRedirection() {
939939
public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateOfSpecificLanguage() {
940940
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
941941
"set_array('prefLabel', 'https://w3id.org/kim/hochschulfaechersystematik/n4')",
942-
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de')"
942+
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de')"
943943
),
944944
i -> {
945945
i.startRecord("1");
@@ -957,7 +957,7 @@ public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateO
957957
public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecificLanguage() {
958958
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
959959
"set_array('id', 'Mathematics, Natural Sciences')",
960-
"lookup_rdf('id.*', '" + RDF_MAP + "', target: 'skos:prefLabel', target_language: 'en')"
960+
"lookup_rdf('id.*', '" + RDF_MAP + "', target: 'skos:prefLabel', select_language: 'en')"
961961
),
962962
i -> {
963963
i.startRecord("1");
@@ -976,7 +976,7 @@ public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecifi
976976
@Test // Scenario lookupRdfPropertyToProperty
977977
public void shouldLookupInExternalRdfMapGetPropertyOfSpecificLanguageWithTargetedPredicate() {
978978
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
979-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'en')"
979+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'en')"
980980
),
981981
i -> {
982982
i.startRecord("1");
@@ -1012,7 +1012,7 @@ public void shouldLookupInExternalRdfMapGetSubjectOfPropertyWithTargetedPredicat
10121012
@Test
10131013
public void lookupRdfDefinedPropertyToSubjectNonDefault() {
10141014
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1015-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de')"
1015+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de')"
10161016
),
10171017
i -> {
10181018
i.startRecord("1");
@@ -1050,7 +1050,7 @@ public void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecific
10501050
@Test
10511051
public void shouldLookupRdfDefinedPropertyToSubject() {
10521052
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1053-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de', select: 'subject')"
1053+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de', select: 'subject')"
10541054
),
10551055
i -> {
10561056
i.startRecord("1");
@@ -1094,7 +1094,7 @@ public void shouldLookupRdfDefinedPropertyToSubject() {
10941094
private void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage(final String target) {
10951095
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
10961096
"set_array('prefLabel', 'Mathematics, Natural Sciences')",
1097-
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: '" + target + "', target_language: 'de')"
1097+
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: '" + target + "', select_language: 'de')"
10981098
),
10991099
i -> {
11001100
i.startRecord("1");
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", target_language: "en", select: "object")
1+
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", select_language: "en")
22
# Cant define specific lookup-match fields, would expect something like this:
3-
# lookup_rdf("a", "./hcrt.ttl", match="http://www.w3.org/2004/02/skos/core#prefLabel", match_language: "de", target: "http://www.w3.org/2004/02/skos/core#prefLabel", target_language: "en")
3+
# lookup_rdf("a", "./hcrt.ttl", match="http://www.w3.org/2004/02/skos/core#prefLabel", match_language: "de", target: "http://www.w3.org/2004/02/skos/core#prefLabel", select_language: "en")
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lookup_rdf('a', '../../../../../maps/hcrt.ttl', target: 'http://www.w3.org/2004/02/skos/core#prefLabel', target_language: 'de', select: 'subject')
1+
lookup_rdf('a', '../../../../../maps/hcrt.ttl', target: 'http://www.w3.org/2004/02/skos/core#prefLabel', select_language: 'de', select: 'subject')
22
# Cant define specific lookup-match fields, would expect something like this:
33
# lookup_rdf("a", "./hcrt.ttl", match="http://www.w3.org/2004/02/skos/core#prefLabel", match_language: "de")
44

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", target_language: 'en')
1+
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", select_language: 'en')
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Lookup replaces with default value by default. Should be an option.
2-
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", target_language: "de")
2+
lookup_rdf("a", "../../../../../maps/hcrt.ttl", target: "http://www.w3.org/2004/02/skos/core#prefLabel", select_language: "de")

0 commit comments

Comments
 (0)