From 2048e73d2f669c1d50bd29477b7d54e89b90029c Mon Sep 17 00:00:00 2001 From: "Lange, Dr. Herbert" <herbert.lange@uni-hamburg.de> Date: Mon, 16 May 2022 11:03:19 +0200 Subject: [PATCH] update variable name --- .../validation/quest/EXMARaLDATierFinder.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/uni_hamburg/corpora/validation/quest/EXMARaLDATierFinder.java b/src/main/java/de/uni_hamburg/corpora/validation/quest/EXMARaLDATierFinder.java index 7568f56a..9a65105f 100644 --- a/src/main/java/de/uni_hamburg/corpora/validation/quest/EXMARaLDATierFinder.java +++ b/src/main/java/de/uni_hamburg/corpora/validation/quest/EXMARaLDATierFinder.java @@ -20,8 +20,9 @@ public class EXMARaLDATierFinder extends TierFinder { public EXMARaLDATierFinder(Properties properties) { super(properties); - if (attribute == null || attribute.isEmpty()) { - attribute = "id"; + // Use default attribute + if (attribute_name == null || attribute_name.isEmpty()) { + attribute_name = "id"; } } @@ -44,16 +45,16 @@ public class EXMARaLDATierFinder extends TierFinder { List<String> tierIds = new ArrayList<>(); if (cd instanceof EXMARaLDATranscriptionData) { Document dom = ((EXMARaLDATranscriptionData) cd).getJdom(); - tierIds.addAll(((List<Attribute>) Collections.checkedList(XPath.newInstance( - String.format("//tier[contains(@%s,\"%s\")]/@id", - attribute, pattern)).selectNodes(dom), Attribute.class)) + String xpath = String.format("//tier[contains(@%s,\"%s\")]/@id", + attribute_name, pattern); + tierIds.addAll(((List<Attribute>) Collections.checkedList(XPath.newInstance(xpath).selectNodes(dom), Attribute.class)) .stream().map(Attribute::getValue).collect(Collectors.toList())); } else if (cd instanceof EXMARaLDASegmentedTranscriptionData) { Document dom = ((EXMARaLDASegmentedTranscriptionData) cd).getJdom(); tierIds.addAll(((List<Attribute>) Collections.checkedList(XPath.newInstance( String.format("//segmented-tier[contains(@%s,\"%s\")]/@id", - attribute, pattern)).selectNodes(dom), Attribute.class)) + attribute_name, pattern)).selectNodes(dom), Attribute.class)) .stream().map(Attribute::getValue).collect(Collectors.toList())); } // Add found tiers to frequency list -- GitLab