joerg/marc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for drop() field transformer

Browse source
This commit is contained in:
Jörg Prante 2016-09-18 21:46:54 +02:00
parent 38576e881b
commit 0811f397b2
3 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,3 +1,3 @@
group = org.xbib
version = 1.0.1
version = 1.0.2
org.gradle.daemon = true

48
src/main/java/org/xbib/marc/transformer/field/MarcFieldTransformer.java
View file

@ -255,11 +255,35 @@ public class MarcFieldTransformer extends LinkedHashMap<String, MarcField> {
public Builder fromTo(String a, String b) {
String[] from = a.split(Pattern.quote(MarcField.KEY_DELIMITER), -1);
MarcField.Builder fromBuilder = MarcField.builder();
switch (from.length) {
case 1:
fromBuilder.tag(from[0]);
break;
case 2:
fromBuilder.tag(from[0]).indicator(from[1]);
break;
case 3:
fromBuilder.tag(from[0]).indicator(from[1]).subfields(from[2]);
break;
default:
break;
}
String[] to = b.split(Pattern.quote(MarcField.KEY_DELIMITER), -1);
MarcField.Builder fromBuilder = MarcField.builder()
.tag(from[0]).indicator(from[1]).subfields(from[2]);
MarcField.Builder toBuilder = MarcField.builder()
.tag(to[0]).indicator(to[1]).subfields(to[2]);
MarcField.Builder toBuilder = MarcField.builder();
switch (to.length) {
case 1:
toBuilder.tag(to[0]);
break;
case 2:
toBuilder.tag(to[0]).indicator(to[1]);
break;
case 3:
toBuilder.tag(to[0]).indicator(to[1]).subfields(to[2]);
break;
default:
break;
}
fromTo(fromBuilder.build(), toBuilder.build());
return this;
}
@ -271,8 +295,20 @@ public class MarcFieldTransformer extends LinkedHashMap<String, MarcField> {
public Builder drop(String a) {
String[] s = a.split(Pattern.quote(MarcField.KEY_DELIMITER), -1);
MarcField.Builder builder = MarcField.builder()
.tag(s[0]).indicator(s[1]).subfields(s[2]);
MarcField.Builder builder = MarcField.builder();
switch (s.length) {
case 1:
builder.tag(s[0]);
break;
case 2:
builder.tag(s[0]).indicator(s[1]);
break;
case 3:
builder.tag(s[0]).indicator(s[1]).subfields(s[2]);
break;
default:
break;
}
drop(builder.build());
return this;
}

11
src/test/java/org/xbib/marc/transformer/MarcFieldTransformerTest.java
View file

@ -118,6 +118,17 @@ public class MarcFieldTransformerTest {
assertEquals(MarcField.EMPTY, b);
}
@Test
public void testDropTag() {
MarcFieldTransformer marcFieldTransformer = MarcFieldTransformer.builder()
.ignoreIndicator()
.drop("001")
.build();
MarcField a = MarcField.builder().tag("001").subfield("a", "Hello").subfield("b", "World").build();
MarcField b = marcFieldTransformer.transform(a);
assertEquals(MarcField.EMPTY, b);
}
@Test
public void testStringSpec() {
MarcFieldTransformer marcFieldTransformer = MarcFieldTransformer.builder()