Minor improvements by introducing getters and setters instead of combinators in tokenizer
Change-Id: I31425a3ac991efb131d33a18b6ff012098ddeac8
diff --git a/lib/KorAP/XML/Annotation/Talismane/Dependency.pm b/lib/KorAP/XML/Annotation/Talismane/Dependency.pm
index ea7bbf3..efd301e 100644
--- a/lib/KorAP/XML/Annotation/Talismane/Dependency.pm
+++ b/lib/KorAP/XML/Annotation/Talismane/Dependency.pm
@@ -14,10 +14,10 @@
my ($stream, $source, $tokens) = @_;
# Get MultiTermToken from stream for source
- my $mtt = $stream->pos($source->pos);
+ my $mtt = $stream->pos($source->get_pos);
# Serialized information from token
- my $content = $source->hash;
+ my $content = $source->get_hash;
# Get relation information
my $rel = $content->{rel};
@@ -40,18 +40,18 @@
term => '>:talismane/d:' . $label,
pti => 32, # term-to-term relation
payload =>
- '<i>' . $target->pos # . # right part token position
+ '<i>' . $target->get_pos # . # right part token position
# '<s>0' . # $source_term->tui . # left part tui
# '<s>0' # . $target_term->tui # right part tui
);
- my $target_mtt = $stream->pos($target->pos);
+ my $target_mtt = $stream->pos($target->get_pos);
$target_mtt->add(
term => '<:talismane/d:' . $label,
pti => 32, # term-to-term relation
payload =>
- '<i>' . $source->pos # . # left part token position
+ '<i>' . $source->get_pos # . # left part token position
# '<s>0' . # $source_term->tui . # left part tui
# '<s>0' # . $target_term->tui # right part tui
);
@@ -63,23 +63,23 @@
term => '>:talismane/d:' . $label,
pti => 33, # term-to-element relation
payload =>
- '<i>' . $target->o_start . # end position
- '<i>' . $target->o_end . # end position
- '<i>' . $target->p_start . # right part start position
- '<i>' . $target->p_end # . # right part end position
+ '<i>' . $target->get_o_start . # end position
+ '<i>' . $target->get_o_end . # end position
+ '<i>' . $target->get_p_start . # right part start position
+ '<i>' . $target->get_p_end # . # right part end position
# '<s>0' . # $source_term->tui . # left part tui
# '<s>0' # . $target_span->tui # right part tui
);
- my $target_mtt = $stream->pos($target->p_start);
+ my $target_mtt = $stream->pos($target->get_p_start);
$target_mtt->add(
term => '<:talismane/d:' . $label,
pti => 34, # element-to-term relation
payload =>
- '<i>' . $target->o_start . # end position
- '<i>' . $target->o_end . # end position
- '<i>' . $target->p_end . # right part end position
- '<i>' . $source->pos # . # left part token position
+ '<i>' . $target->get_o_start . # end position
+ '<i>' . $target->get_o_end . # end position
+ '<i>' . $target->get_p_end . # right part end position
+ '<i>' . $source->get_pos # . # left part token position
# '<s>0' . # $source_term->tui . # left part tui
# '<s>0' # . $target_span->tui # right part tui
diff --git a/lib/KorAP/XML/Annotation/Talismane/Morpho.pm b/lib/KorAP/XML/Annotation/Talismane/Morpho.pm
index 85a0786..bd5c30b 100644
--- a/lib/KorAP/XML/Annotation/Talismane/Morpho.pm
+++ b/lib/KorAP/XML/Annotation/Talismane/Morpho.pm
@@ -9,9 +9,9 @@
layer => 'morpho',
cb => sub {
my ($stream, $token) = @_;
- my $mtt = $stream->pos($token->pos);
+ my $mtt = $stream->pos($token->get_pos);
- my $content = $token->hash->{fs}->{f};
+ my $content = $token->get_hash->{fs}->{f};
my $found;