Remove mentioning main() (that doesn't exist anymore)
Change-Id: I1e3a2178827d254328fe5b15e6b70ffe0a01675c
diff --git a/script/tei2korapxml b/script/tei2korapxml
index 2e3aa0e..cbd0b1e 100755
--- a/script/tei2korapxml
+++ b/script/tei2korapxml
@@ -430,7 +430,7 @@
$text_id_esc = $header->id_esc;
# log output for seeing progression
- $log->notice("$0: main(): text_id=$text_id");
+ $log->notice("$0: text_id=$text_id");
$tl = 0; # reset (needed for ~ whitespace handling ~)
}
@@ -447,7 +447,6 @@
# Recursively called function to handle XML tree data
sub retr_info {
-
# recursion level
# (1 = topmost level inside retr_info() = should always be level of tag $_TEXT_BODY)
my $rl = shift;
@@ -801,7 +800,7 @@
[ 0: XML_READER_TYPE_DOCUMENT,
1: ?
- 2: [ 0: [ 0: XML_READER_TYPE_ELEMENT <- start recursion with array '$data->[2]' (see main(): retr_info( \$tree_data->[2] ))
+ 2: [ 0: [ 0: XML_READER_TYPE_ELEMENT <- start recursion with array '$data->[2]' (see retr_info( \$tree_data->[2] ))
1: 'node'
2: ?
3: HASH (attributes)
@@ -971,7 +970,7 @@
## Notes on segfault prevention
-binmode on the input handler prevents segfaulting of 'XML::LibXML::Reader' inside 'main()'
+binmode on the input handler prevents segfaulting of 'XML::LibXML::Reader' inside the main loop
(see notes on 'PerlIO layers' in 'man XML::LibXML'),
removing 'use open qw(:std :utf8)' would fix this problem too, but using binmode on input is more granular
see in perluniintro: You can switch encodings on an already opened stream by using "binmode()
diff --git a/t/script.t b/t/script.t
index 658cc79..8249f79 100644
--- a/t/script.t
+++ b/t/script.t
@@ -41,7 +41,7 @@
file => $file,
param => '-ti',
env => 'KORAPXMLTEI_DEBUG=1'
- )->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ )->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->stderr_like(qr!Debugging is activated!);
};
@@ -51,7 +51,7 @@
tmp => 'script_out',
file => $file,
param => '-ti'
- )->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ )->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->stderr_unlike(qr!Debugging is activated!);
@@ -160,7 +160,7 @@
param => "-tc='perl $cmd'",
tmp => 'script_out2'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->file_readable('GOE/AGA/00000/base/tokens.xml')
# Uncompress GOE/AGA/00000/base/tokens.xml from zip file
@@ -191,7 +191,7 @@
param => "-tk -s",
tmp => 'script_bug_check'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=WDD19_H0039\.87242!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=WDD19_H0039\.87242!)
->file_readable('WDD19/H0039/87242/struct/structure.xml');
};
@@ -209,7 +209,7 @@
param => "-tk -s",
tmp => 'script_sentence_split'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->file_readable('GOE/AGA/00000/struct/structure.xml')
->unzip_xml('GOE/AGA/00000/struct/structure.xml')
->text_is('span#s25 fs f', 's')
@@ -227,7 +227,7 @@
file => catfile($f, 'data', 'text_with_blanks.i5.xml'),
tmp => 'script_out3',
param => '-ti'
- )->stderr_like(qr!tei2korapxml: .*? text_id=CORP_DOC.00001!);
+ )->stderr_like(qr!tei2korapxml:.*? text_id=CORP_DOC.00001!);
# ~ test conservative tokenization ~
$t->unzip_xml('CORP/DOC/00001/base/tokens_conservative.xml')
@@ -304,7 +304,7 @@
param => "-ti -tc 'perl $cmd'",
tmp => 'script_tokflags'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->file_exists('GOE/AGA/00000/base/tokens_aggressive.xml')
->file_exists('GOE/AGA/00000/base/tokens_conservative.xml')
->file_exists('GOE/AGA/00000/base/tokens.xml')
@@ -355,7 +355,7 @@
stderr_like(
sub { `cat '$tplfile' | perl '$script' -ti > '$outzip'` },
- qr!tei2korapxml: .*? text_id=$text_sigle_esc!, # see above: print $fh encode_utf8($tpl);
+ qr!tei2korapxml:.*? text_id=$text_sigle_esc!, # see above: print $fh encode_utf8($tpl);
);
};
@@ -408,7 +408,7 @@
env => 'KORAPXMLTEI_INLINE=1',
tmp => 'script_tagged'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
# Check zip using xml loy
->unzip_xml('GOE/AGA/00000/tokens/morpho.xml')
@@ -491,7 +491,7 @@
tmp => 'script_tagged',
param => '--inline-tokens=myfoundry#myfile'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->file_exists_not('GOE/AGA/00000/tokens/morpho.xml', 'Morpho not generated')
@@ -511,7 +511,7 @@
tmp => 'script_tagged',
param => '--inline-tokens=myfoundry'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->file_exists_not('GOE/AGA/00000/tokens/morpho.xml', 'Morpho not generated')
@@ -536,7 +536,7 @@
# Generate zip file (unportable!)
stderr_like(
sub { `cat '$file' | KORAPXMLTEI_INLINE=1 perl '$script' > '$outzip'` },
- qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!,
+ qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!,
'Processing 1'
);
@@ -572,7 +572,7 @@
env => 'KORAPXMLTEI_INLINE=1',
tmp => 'script_utf8_enc'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->unzip_xml('GOE/AGA/00000/data.xml')
->content_like(qr/\Q"Kriegstheater"\E/)
->content_like(qr/\QTür'\E/)
@@ -583,7 +583,7 @@
env => 'KORAPXMLTEI_INLINE=1',
tmp => 'script_iso_enc'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=GOE_AGA\.00000!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=GOE_AGA\.00000!)
->unzip_xml('GOE/AGA/00000/data.xml')
->content_like(qr/\Q"Kriegstheater"\E/)
->content_like(qr/\QTür'\E/)
@@ -599,7 +599,7 @@
tmp => 'script_sigle',
file => $file,
param => "-ti"
- )->stderr_like(qr!tei2korapxml: .*? text_id=WDD19_ß0000\.10317!)
+ )->stderr_like(qr!tei2korapxml:.*? text_id=WDD19_ß0000\.10317!)
->stderr_unlike(qr!Debugging is activated!);
$t->unzip_xml('WDD19/ß0000/10317/header.xml')
@@ -620,7 +620,7 @@
file => catfile($f, 'data', 'text_with_entities.i5.xml'),
tmp => 'script_entity_replacement',
param => '-ti'
- )->stderr_like(qr!tei2korapxml: .*? text_id=CORP_DOC.00003!);
+ )->stderr_like(qr!tei2korapxml:.*? text_id=CORP_DOC.00003!);
$t->unzip_xml('CORP/DOC/00003/data.xml')
->content_like(qr!üüü Aα≈„▒░▓█╗┐┌╔═─┬╦┴╩╝┘└╚│║┼╬┤╣╠├•ˇčˆ†‡ě€ƒ…‗ıι“„▄‹‘‚—–νœŒωΩ‰φπϖř”ρ›’‘šŠσ□■▪⊂˜™▀ŸžŽ!);
diff --git a/t/test.t b/t/test.t
index a549e1e..1ef8bf9 100644
--- a/t/test.t
+++ b/t/test.t
@@ -63,7 +63,7 @@
},
param => '-ti'
)
- ->stderr_like(qr!tei2korapxml: .*? text_id=a_b\.1!)
+ ->stderr_like(qr!tei2korapxml:.*? text_id=a_b\.1!)
->file_exists('a/b/1/header.xml')
->file_exists('a/b/header.xml')
->file_exists('a/header.xml')