Skip to content

Commit d5c2368

Browse files
Prefix exclusion (#50)
* Set theme jekyll-theme-slate * Create index.md Initialise GH pages * Exclude bald:isPrefixedBy from output graph
1 parent e650610 commit d5c2368

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

binary-array-ld-cli/src/test/kotlin/net/bald/BinaryArrayConvertCliTest.kt

-6
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ class BinaryArrayConvertCliTest {
176176
statement(BALD.contains, model.createResource("http://test.binary-array-ld.net/example/var1")) {
177177
statement(RDF.type, BALD.Resource)
178178
}
179-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
180179
}
181180
}
182181
}
@@ -276,7 +275,6 @@ class BinaryArrayConvertCliTest {
276275
statement(BALD.contains, model.createResource("http://test.binary-array-ld.net/example/var1")) {
277276
statement(RDF.type, BALD.Resource)
278277
}
279-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
280278
}
281279
}
282280
}
@@ -319,7 +317,6 @@ class BinaryArrayConvertCliTest {
319317
statement(BALD.contains, model.createResource("http://test.binary-array-ld.net/example/var1")) {
320318
statement(RDF.type, BALD.Resource)
321319
}
322-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
323320
}
324321
}
325322
}
@@ -364,7 +361,6 @@ class BinaryArrayConvertCliTest {
364361
statement(BALD.contains, model.createResource("http://test.binary-array-ld.net/example/var1")) {
365362
statement(RDF.type, BALD.Resource)
366363
}
367-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
368364
}
369365
}
370366
}
@@ -435,7 +431,6 @@ class BinaryArrayConvertCliTest {
435431
statement(BALD.contains, createResource("http://test.binary-array-ld.net/example/var0")) {
436432
statement(RDF.type, BALD.Resource)
437433
}
438-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
439434
}
440435
}
441436
}
@@ -579,7 +574,6 @@ class BinaryArrayConvertCliTest {
579574
list(15)
580575
}
581576
}
582-
statement(BALD.isPrefixedBy, createPlainLiteral("prefix_list"))
583577
}
584578
}
585579
}

binary-array-ld-netcdf/src/main/kotlin/net/bald/netcdf/NetCdfContainer.kt

+11-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ abstract class NetCdfContainer(
4040
}
4141

4242
override fun subContainers(): Sequence<Container> {
43-
return group.groups.asSequence().filter(::acceptGroup).map(::subContainer)
43+
return group.groups.asSequence()
44+
.filter(::acceptGroup)
45+
.map(::subContainer)
4446
}
4547

4648
private fun subContainer(group: Group): NetCdfContainer {
@@ -55,8 +57,15 @@ abstract class NetCdfContainer(
5557
return true
5658
}
5759

60+
open fun acceptAttr(attr: Attribute): Boolean {
61+
return true
62+
}
63+
5864
override fun attributes(): Sequence<Attribute> {
59-
return group.attributes().let(::source).attributes()
65+
return group.attributes()
66+
.let(::source)
67+
.attributes()
68+
.filter(::acceptAttr)
6069
}
6170

6271
fun subContainer(name: String): NetCdfContainer? {

binary-array-ld-netcdf/src/main/kotlin/net/bald/netcdf/NetCdfRootContainer.kt

+6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package net.bald.netcdf
22

3+
import net.bald.Attribute
34
import ucar.nc2.Group
45
import ucar.nc2.Variable
56
import net.bald.Container
67
import net.bald.alias.AliasDefinition
8+
import net.bald.vocab.BALD
79

810
/**
911
* NetCDF implementation of [Container] based on the root group.
@@ -31,6 +33,10 @@ class NetCdfRootContainer(
3133
return prefixSrc != v.shortName
3234
}
3335

36+
override fun acceptAttr(attr: Attribute): Boolean {
37+
return BALD.isPrefixedBy.hasURI(attr.uri).not()
38+
}
39+
3440
override fun childUri(name: String): String {
3541
return uri + name
3642
}

binary-array-ld-netcdf/src/test/kotlin/net/bald/netcdf/NetCdfBinaryArrayTest.kt

-3
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ class NetCdfBinaryArrayTest {
222222
val ctx = ModelContext.create(prefix)
223223
val ba = fromCdl("/netcdf/attributes.cdl", "http://test.binary-array-ld.net/attributes.nc", ctx)
224224
ContainerVerifier(ba.root).attributes {
225-
attribute(BALD.isPrefixedBy.uri, createPlainLiteral("prefix_list"))
226225
attribute(SKOS.prefLabel.uri, createPlainLiteral("Attributes metadata example"))
227226
attribute(DCTerms.publisher.uri, createResource("${BALD.prefix}Organisation"))
228227
attribute("http://test.binary-array-ld.net/attributes.nc/date", createPlainLiteral("2020-10-29"))
@@ -273,7 +272,6 @@ class NetCdfBinaryArrayTest {
273272
val ba = fromCdl("/netcdf/alias.cdl", "http://test.binary-array-ld.net/alias.nc", ctx, alias)
274273
ContainerVerifier(ba.root).apply {
275274
attributes {
276-
attribute(BALD.isPrefixedBy.uri, createPlainLiteral("prefix_list"))
277275
attribute(SKOS.prefLabel.uri, createPlainLiteral("Alias metadata example"))
278276
attribute(DCTerms.publisher.uri, createResource("${BALD.prefix}Organisation"))
279277
attribute("http://test.binary-array-ld.net/alias.nc/date", createPlainLiteral("2020-10-29"))
@@ -309,7 +307,6 @@ class NetCdfBinaryArrayTest {
309307

310308
ContainerVerifier(ba.root).apply {
311309
attributes {
312-
attribute(BALD.isPrefixedBy.uri, createPlainLiteral("prefix_list"))
313310
attribute(SKOS.prefLabel.uri, createPlainLiteral("Variable reference metadata example"))
314311
attribute(TestVocab.rootVar.uri, createResource("http://test.binary-array-ld.net/var-ref.nc/var0"))
315312
attribute(TestVocab.unorderedVar.uri) {

0 commit comments

Comments
 (0)