1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563
|
#!/usr/bin/perl
# $Revision$
use warnings;
use strict;
use Getopt::Long;
use Pod::Usage;
use XML::DOM;
use Text::Diff;
my ($verbose, $help);
my $count = 1;
my $base;
my $output;
GetOptions (
"verbose" => \$verbose,
"help|?" => \$help,
"count" => \$count,
"base=s" => \$base,
"output=s" => \$output) or exit 1;
pod2usage(-exitval => 1, -verbose => 2) if $help;
if (scalar @ARGV != 2)
{
print STDERR
"I need exactly 2 filenames to operate. For help use --help.\n";
exit 1
}
if (defined $output)
{
$output = uc $output;
unless ($output =~
/^FILES|UNMODIFIED|ADDED|DELETED|MODIFIED_(LA1|LA2|MULTIMATCH)$/)
{
print STDERR "Invalid category: $output\n";
exit 1
}
}
my $parser = new XML::DOM::Parser;
print STDERR "Parsing $ARGV[0]... " if $verbose;
my $doc1 = $parser->parsefile ($ARGV[0]);
my @entries1 = $doc1->getElementsByTagName ("entry");
my $entries1 = scalar @entries1;
print STDERR $entries1, " entries\nParsing $ARGV[1]... " if $verbose;
my $doc2 = $parser->parsefile ($ARGV[1]);
undef $parser;
my @entries2 = $doc2->getElementsByTagName ("entry");
my $entries2 = scalar @entries2;
print STDERR $entries2, " entries\n" if $verbose;
sub pretty_print
{
my ($node, $indent) = @_;
my $type = $node->getNodeType;
return $node->getNodeValue if $type == TEXT_NODE;
if ($type == ELEMENT_NODE)
{
$indent = 0 unless defined $indent;
my $contents = undef;
for my $c ($node->getChildNodes)
{
my $cpp = pretty_print ($c, $indent+2);
if (defined $contents) { $contents .= $cpp; next }
$contents = $cpp
}
my $attrs = '';
for my $a ($node->getAttributes->getValues)
{
$attrs .= ' ' . $a->getNodeName . '=' . $a->getNodeValue
}
return ' ' x $indent
. '<' . $node->getNodeName . $attrs . '/>' unless defined $contents;
return ' ' x $indent
. '<' . $node->getNodeName . $attrs . '>'
. ($node->getFirstChild->getNodeType == ELEMENT_NODE ? "\n" : '')
. $contents
. ($node->getLastChild->getNodeType == ELEMENT_NODE ? ' ' x $indent : '')
. '</' . $node->getNodeName . ">\n"
}
die "Unhandled node type: ", $node->getNodeType
}
my (@unmodified, @added, @deleted, @modified_form, @modified_senses,
@modified_multimatch, %entry2form, %entry2senses, %entry2complete,
%complete2entry1, %form2entry1, %senses2entry1,
%complete2entry2, %form2entry2, %senses2entry2);
# adds an entry to an arrayref
sub put
{
my ($hashref, $index, $entry) = @_;
if (exists $hashref->{$index})
{ push @{ $hashref->{$index} }, $entry }
else
{ $hashref->{$index} = [ $entry ] }
}
# deletes an entry from an arrayref
# the entry may occur only once
sub remove
{
my ($hashref, $index, $entry) = @_;
die join ' ', caller unless defined $hashref && defined $index;
return unless exists $hashref->{$index};
my @entries = @{ $hashref->{$index} };
my $count = scalar @entries;
if ($count == 1)
{
return unless $entries[$#entries] eq $entry;
delete $hashref->{$index};
return
}
for (my $i=0; $i <= $count ; $i++)
{
next unless exists $entries[$i];
next unless $entries[$i] == $entry;
delete $entries[$i];
return
}
warn "No entry removed";
}
# Removes the entries in $entry2arrayref from the $x2entryhashrefs given.
# Each $x2entryhashref argument must be followed by an $entry2xhashref.
sub removeall
{
my $entryarrayref = shift;
while(my $x2entryhashref = shift)
{
my $entry2x = shift;
die unless defined $entry2x;
for my $entry (@$entryarrayref)
{ remove $x2entryhashref, $entry2x->{$entry}, $entry }
}
}
sub find_unmodified_or_modified
{
my $found = 0;
for (keys %complete2entry1)
{
next if 1 < scalar @{ $complete2entry1{$_} };
next unless exists $complete2entry2{$_};
next if 1 != scalar @{ $complete2entry2{$_} };
my $entry1 = $complete2entry1{$_}->[0];
my $entry2 = $complete2entry2{$_}->[0];
push @unmodified, $entry1;
delete $complete2entry1{$_};
delete $complete2entry2{$_};
remove \%form2entry1, $entry2form{$entry1}, $entry1;
remove \%form2entry2, $entry2form{$entry1}, $entry2;
remove \%senses2entry1, $entry2senses{$entry1}, $entry1;
remove \%senses2entry2, $entry2senses{$entry1}, $entry2;
$found++
}
for (keys %form2entry1)
{
next if 1 < scalar @{ $form2entry1{$_} };
next unless exists $form2entry2{$_};
next if 1 != scalar @{ $form2entry2{$_} };
my $entry1 = $form2entry1{$_}->[0];
my $entry2 = $form2entry2{$_}->[0];
push @modified_senses, [ $entry1, $entry2 ] ;
remove \%complete2entry1, $entry2complete{$entry1}, $entry1;
remove \%complete2entry2, $entry2complete{$entry2}, $entry2;
delete $form2entry1{$_};
delete $form2entry2{$_};
remove \%senses2entry1, $entry2senses{$entry1}, $entry1;
remove \%senses2entry2, $entry2senses{$entry2}, $entry2;
$found++
}
for (keys %senses2entry1)
{
next if 1 < scalar @{ $senses2entry1{$_} };
next unless exists $senses2entry2{$_};
next if 1 != scalar @{ $senses2entry2{$_} };
my $entry1 = $senses2entry1{$_}->[0];
my $entry2 = $senses2entry2{$_}->[0];
push @modified_form, [ $entry1, $entry2 ] ;
remove \%complete2entry1, $entry2complete{$entry1}, $entry1;
remove \%complete2entry2, $entry2complete{$entry2}, $entry2;
remove \%form2entry1, $entry2form{$entry1}, $entry1;
remove \%form2entry2, $entry2form{$entry2}, $entry2;
delete $senses2entry1{$_};
delete $senses2entry2{$_};
$found++
}
print STDERR "$found entries matched\n" if $verbose;
return $found
}
sub find_added_deleted
{
print STDERR "Finding added and deleted entries... " if $verbose;
# an entry was deleted/added when no match
# for it exists in the other file
# since single matches should be sorted out by now,
# only multimatches remain to be skipped
for (keys %complete2entry1)
{
# the next line should never apply
next if exists $complete2entry2{$_};
my $skip = 0;
for my $entry1 (@{ $complete2entry1{$_} })
{
next unless exists $form2entry2{ $entry2form{$entry1} }
|| exists $senses2entry2{ $entry2senses{$entry1} };
$skip = 1;
last
}
next if $skip;
push @deleted, @{ $complete2entry1{$_} };
removeall $complete2entry1{$_},
\%form2entry1, \%entry2form,
\%senses2entry1, \%entry2senses;
delete $complete2entry1{$_}
}
for (keys %complete2entry2)
{
next if exists $complete2entry1{$_};
my $skip = 0;
for my $entry2 (@{ $complete2entry2{$_} })
{
next unless exists $form2entry1{ $entry2form{$entry2} }
|| exists $senses2entry1{ $entry2senses{$entry2} };
$skip = 1;
last
}
next if $skip;
push @added, @{ $complete2entry2{$_} };
removeall $complete2entry2{$_},
\%form2entry2, \%entry2form,
\%senses2entry2, \%entry2senses;
delete $complete2entry2{$_}
}
print STDERR "\n" if $verbose;
}
# Actually there is nothing more to find. We just put together the remains
# of the lists.
sub find_modified_multimatch
{
print STDERR "Collecting the multimatches... " if $verbose;
my (@from1, @from2);
for (values %complete2entry1)
{ push @from1, @$_ }
for (values %complete2entry2)
{ push @from2, @$_ }
push @modified_multimatch, [ @from1 ], [ @from2 ];
print STDERR "\n" if $verbose;
}
sub cache_toStrings
{
my ($entries, $complete2entry, $form2entry, $senses2entry) = @_;
for (@$entries)
{
# a complete comparison key is easy (if canonicalised XML is used)
my $scomplete = $_->toString ();
put $complete2entry, $scomplete, $_;
$entry2complete{$_} = $scomplete;
# comparison key for form: concat <form> and <gramGrp> child nodes
# comparison key for senses: concatenate all other child nodes
my @children = $_->getChildNodes ();
my $ssenses = my $sforms = '';
for my $child (@children)
{
if ($child->getTagName () =~ /^form|gramGrp$/)
{
$sforms .= $child->toString ();
next
}
$ssenses .= $child->toString ()
}
put $form2entry, $sforms, $_;
$entry2form{$_} = $sforms;
put $senses2entry, $ssenses, $_;
$entry2senses{$_} = $ssenses
}
}
print STDERR "Caching results of toString()..." if $verbose;
cache_toStrings \@entries1,
\%complete2entry1, \%form2entry1, \%senses2entry1;
undef @entries1;
cache_toStrings \@entries2,
\%complete2entry2, \%form2entry2, \%senses2entry2;
undef @entries2;
print STDERR "\n" if $verbose;
my $i = 1;
do
{
print STDERR "Comparison iteration ", $i, "... " if $verbose;
$i++
}
while find_unmodified_or_modified;
find_added_deleted;
find_modified_multimatch;
print STDERR "Finished comparison.\n" if $verbose;
undef %complete2entry1;
undef %form2entry1;
undef %senses2entry1;
undef %complete2entry2;
undef %form2entry2;
undef %senses2entry2;
if ($count)
{
my $unmodified = scalar @unmodified;
my $added = scalar @added;
my $deleted = scalar @deleted;
my $modified_form = scalar @modified_form;
my $modified_senses = scalar @modified_senses;
my $mm1 = scalar @{ $modified_multimatch[0] };
my $mm2 = scalar @{ $modified_multimatch[1] };
print "Unmodified:\t\t$unmodified\n";
print "Added:\t\t\t$added\n";
print "Deleted:\t\t$deleted\n";
print "Modified <form>:\t$modified_form\n";
print "Modified <sense>s:\t$modified_senses\n";
print "Modified multimatch:\t$mm1 + $mm2\n";
my $sum1 =
$unmodified + $deleted + $modified_form + $modified_senses + $mm1;
my $sum2 =
$unmodified + $added + $modified_form + $modified_senses + $mm2;
print STDERR "file1: unmod + del + mod_form + mod_sense + mm1 = ", $sum1,
($sum1 == $entries1 ? ' OK' : ' MISMATCH') . " \n" if $verbose;
print STDERR "file2: unmod + add + mod_form + mod_sense + mm2 = ", $sum2,
($sum2 == $entries2 ? ' OK' : ' MISMATCH') . " \n" if $verbose;
}
sub print_category_fh
{
my ($fh, $category) = @_;
print STDERR "Outputting category $category... " if defined $verbose and $verbose>1;
if ($category eq 'UNMODIFIED')
{
print $fh pretty_print $_ for (@unmodified)
}
elsif ($category eq 'ADDED')
{
print $fh pretty_print $_ for (@added)
}
elsif ($category eq 'DELETED')
{
print $fh pretty_print $_ for (@deleted)
}
elsif ($category eq 'MODIFIED_LA1')
{
for (@modified_form)
{
my $pretty1 = pretty_print $_->[0];
my $pretty2 = pretty_print $_->[1];
my %options = ();
my $diff = diff \$pretty1, \$pretty2, \%options;
print $fh $diff
}
}
elsif ($category eq 'MODIFIED_LA2')
{
for (@modified_senses)
{
my $pretty1 = pretty_print $_->[0];
my $pretty2 = pretty_print $_->[1];
my %options = ();
my $diff = diff \$pretty1, \$pretty2, \%options;
print $fh $diff
}
}
elsif ($category eq 'MODIFIED_MULTIMATCH')
{
# output entry sets
print $fh "<file1>\n";
print STDERR "file1... " if $verbose;
print $fh pretty_print $_ for (@{ $modified_multimatch[0] });
print $fh "</file1>\n<file2>\n";
print STDERR "file2... " if $verbose;
print $fh pretty_print $_ for (@{ $modified_multimatch[1] });
print $fh "</file2>\n"
}
else { warn "Invalid category: $category" }
print STDERR "done.\n" if defined $verbose and $verbose>1
}
sub print_category_file
{
my ($filename, $category) = @_;
my $fh;
unless (open $fh, '>:utf8', $filename)
{
print STDERR "Could not open $filename for writing: $!\n";
return
}
print STDERR "Writing $filename... " if $verbose;
print_category_fh $fh, $category;
close $fh;
print STDERR "OK\n" if $verbose
}
exit unless defined $output;
$base = $ARGV[0] . '-' . $ARGV[1] unless defined $base;
if ($output eq 'FILES')
{
print_category_file $base . '-unmodified.teipart', 'UNMODIFIED';
undef @unmodified;
print_category_file $base . '-added.teipart', 'ADDED';
undef @added;
print_category_file $base . '-deleted.teipart', 'DELETED';
undef @deleted;
print_category_file $base . '-modified_la1.udiff', 'MODIFIED_LA1';
undef @modified_form;
print_category_file $base . '-modified_la2.udiff', 'MODIFIED_LA2';
undef @modified_senses;
print_category_file $base . '-modified_multimatch.xml',
'MODIFIED_MULTIMATCH';
exit
}
# print only category in $output to STDOUT
open my $fh, '>:utf8',' -' or die;
print_category_fh $fh, $output;
close $fh;
# __DATA__, keep a file1 and a file2 and the outfiles
# XXX testcases, call with a commandline switch
__END__
=head1 NAME
teidiff - Compare the entries in two TEI XML dictionary files
=head1 SYNOPSIS
teidiff [options] file1 file2
Options:
--base Basename for output files
--[no]count Print number of added/modified/deleted entries to STDOUT
--help This manual page
--output Entry category to print to STDOUT
--verbose Tell what I'm doing
=head1 OPTIONS
=over 8
=item B<--base BASENAME>
Basename of output files. Default: F<file1-file2>
=item B<--[no]count>
Print number of added/modified/deleted entries to STDOUT. Default: on.
=item B<--help>
Print this manual page and exit.
=item B<--verbose>
Print information about the current work performed to STDERR.
=item B<--output CATEGORY>
Can be set to the string "FILES" or a category of entries to output to
STDOUT. By default nothing is output. If "FILES" is used, the
filenames will follow the scheme F<BASENAME-CATEGORY.(diff|teipart)>
The following categories are allowed:
=over 4
=item UNMODIFIED
Unmodified entries. They appear exactly the same in both versions of
the dictionary.
=item ADDED
Entries not present in file1, but in file2. They were added in
F<file2>.
=item DELETED
Entries present in file1, but not in file2. They were deleted in
F<file2>.
=item MODIFIED_LA1
Entries where the contents of the <form> element were modified, but
the contents of the <sense> elements are unmodified.
=item MODIFIED_LA2
Entries where the contents of the <sense> element(s) were modified,
but the contents of the <form> elements are unmodified.
=item MODIFIED_MULTIMATCH
Entries where the contents of the <form> or <sense> elements were modified (but
not both at the same time), but a corresponding entry was not found, because
multiple matches exist ("multimatch").
This category is output as two sets - the entries from file1 and the entries
from file2. One could build finer sets, consisting of only the entries
between which the multimatch relationship exists. But this information is
not useful enough for implementation currently.
=back
=back
=head1 DESCRIPTION
This program parses the given input files and compares the entries
in them, putting them in B<categories>. One or all categories can be
output.
=head1 NOTES
Normally ignorable blank space should not account for differences.
C<xmllint> can be used as a filter to drop ignorable blank spaces:
xmllint --noblanks infile.xml >outfile.xml
C<xmllint> also comes with a C<--c14n> option, but using it is unadvisable,
because it adds default attributes, bloating the file submerging
relevant differences in a sea of explicitness.
=head1 TODO
Integrating the functionality of this command line tool into
FreeDict-Editor would facilitate comfortable browsing of the
differences.
=head1 AUTHOR AND LICENCE
Author: Michael Bunk, 2006
This is free software, licensed under GPL.
=cut
|