Bug 26114: ILL should mark status=RET only if a return happened

[koha-ffzg.git] / C4 / TTParser.pm

diff --git a/C4/TTParser.pm b/C4/TTParser.pm
index a0034b6..24e7b83 100644 (file)
--- a/C4/TTParser.pm
+++ b/C4/TTParser.pm
@@ -55,15 +55,17 @@ sub peep_token{
 sub build_tokens{
     my ($self, $filename) = @_;
     $self->{filename} = $filename;
-    $self->handler(start => "start", "self, line, tagname, attr, text"); #signature is start( self, linenumber, tagname, hash of attributes, origional text )
-    $self->handler(text => "text", "self, line, text, is_cdata"); #signature is text( self, linenumber, origional text, is_cdata )
-    $self->handler(end => "end", "self, line, tag, attr, text"); #signature is end( self, linenumber, tagename, origional text )
+    $self->handler(start => "start", "self, line, tagname, attr, text"); #signature is start( self, linenumber, tagname, hash of attributes, original text )
+    $self->handler(text => "text", "self, line, text, is_cdata"); #signature is text( self, linenumber, original text, is_cdata )
+    $self->handler(end => "end", "self, line, tag, attr, text"); #signature is end( self, linenumber, tagename, original text )
     $self->handler(declaration => "declaration", "self, line, text, is_cdata"); # declaration
     $self->handler(comment => "comment", "self, line, text, is_cdata"); # comments
+    $self->handler(process => "process", "self, line, text, is_cdata"); # processing statement <?...?>
 #    $self->handler(default => "default", "self, line, text, is_cdata"); # anything else
     $self->marked_sections(1); #treat anything inside CDATA tags as text, should really make it a C4::TmplTokenType::CDATA
     $self->unbroken_text(1); #make contiguous whitespace into a single token (can span multiple lines)
-    $self->parse_file($filename);
+    open(my $fh, "<:encoding(utf8)", $filename) || die "Cannot open $filename ($!)";
+    $self->parse_file($fh);
     return $self;
 }
 
@@ -116,6 +118,15 @@ sub comment {
     push @tokens, $t;  
 }      
 
+sub process {
+    my $self = shift;
+    my $line = shift;
+    my $work = shift; #original text
+    my $is_cdata = shift;
+    my $t = C4::TmplToken->new( $work, ($is_cdata? C4::TmplTokenType::CDATA : C4::TmplTokenType::TEXT), $line, $self->{filename} );
+    push @tokens, $t;
+}
+
 sub default {
     my $self = shift;
     my $line = shift;
@@ -132,7 +143,7 @@ sub start{
     my $line = shift;
     my $tag = shift;
     my $hash = shift; #hash of attr/value pairs
-    my $text = shift; #origional text
+    my $text = shift; #original text
     my $t = C4::TmplToken->new( $text, C4::TmplTokenType::TAG, $line, $self->{filename});
     my %attr;
     # tags seem to be uses in an 'interesting' way elsewhere..