Skip to content

Commit b49445d

Browse files
dr0idr0i
committed
Rename "target_language" to "select_language"
1 parent 1d0e542 commit b49445d

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
@@ -1049,7 +1049,7 @@ public void shouldLookupRdfUrlWithRedirection() {
10491049
public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateOfSpecificLanguage() {
10501050
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
10511051
"set_array('prefLabel', 'https://w3id.org/kim/hochschulfaechersystematik/n4')",
1052-
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de')"
1052+
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de')"
10531053
),
10541054
i -> {
10551055
i.startRecord("1");
@@ -1067,7 +1067,7 @@ public void shouldLookupInExternalRdfMapGetObjectOfSubjectWithTargetedPredicateO
10671067
public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecificLanguage() {
10681068
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
10691069
"set_array('id', 'Mathematics, Natural Sciences')",
1070-
"lookup_rdf('id.*', '" + RDF_MAP + "', target: 'skos:prefLabel', target_language: 'en')"
1070+
"lookup_rdf('id.*', '" + RDF_MAP + "', target: 'skos:prefLabel', select_language: 'en')"
10711071
),
10721072
i -> {
10731073
i.startRecord("1");
@@ -1086,7 +1086,7 @@ public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecifi
10861086
@Test // Scenario lookupRdfPropertyToProperty
10871087
public void shouldLookupInExternalRdfMapGetPropertyOfSpecificLanguageWithTargetedPredicate() {
10881088
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1089-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'en')"
1089+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'en')"
10901090
),
10911091
i -> {
10921092
i.startRecord("1");
@@ -1122,7 +1122,7 @@ public void shouldLookupInExternalRdfMapGetSubjectOfPropertyWithTargetedPredicat
11221122
@Test
11231123
public void lookupRdfDefinedPropertyToSubjectNonDefault() {
11241124
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1125-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de')"
1125+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de')"
11261126
),
11271127
i -> {
11281128
i.startRecord("1");
@@ -1160,7 +1160,7 @@ public void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecific
11601160
@Test
11611161
public void shouldLookupRdfDefinedPropertyToSubject() {
11621162
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
1163-
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', target_language: 'de', select: 'subject')"
1163+
"lookup_rdf('a', '" + HCRT_RDF_MAP + "', target: 'skos:prefLabel', select_language: 'de', select: 'subject')"
11641164
),
11651165
i -> {
11661166
i.startRecord("1");
@@ -1204,7 +1204,7 @@ public void shouldLookupRdfDefinedPropertyToSubject() {
12041204
private void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage(final String target) {
12051205
MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
12061206
"set_array('prefLabel', 'Mathematics, Natural Sciences')",
1207-
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: '" + target + "', target_language: 'de')"
1207+
"lookup_rdf('prefLabel.*', '" + RDF_MAP + "', target: '" + target + "', select_language: 'de')"
12081208
),
12091209
i -> {
12101210
i.startRecord("1");

‎metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupRdfDefinedPropertyToProperty/test.fix

Lines changed: 2 additions & 2 deletions
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

‎metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupRdfDefinedPropertyToSubject/test.fix

Lines changed: 1 addition & 1 deletion
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

‎metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupRdfPropertyToProperty/test.fix

Lines changed: 1 addition & 1 deletion
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')

‎metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupRdfSubjectToProperty/test.fix

Lines changed: 1 addition & 1 deletion
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)