X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FParser%2FSelf.pm;h=8483891b9964c645437ea3d2e5e14b1855205f2f;hb=2a8127263ef278f3f14b480a12b84f9aa4f92fdc;hp=895ca4d2d8a3ffe018f1648fcd3e71bcc9d4fa86;hpb=e3196b2a34d403f922af145e2bb1b21356d5c94b;p=scpubgit%2Fstemmatology.git diff --git a/lib/Text/Tradition/Parser/Self.pm b/lib/Text/Tradition/Parser/Self.pm index 895ca4d..8483891 100644 --- a/lib/Text/Tradition/Parser/Self.pm +++ b/lib/Text/Tradition/Parser/Self.pm @@ -2,7 +2,8 @@ package Text::Tradition::Parser::Self; use strict; use warnings; -use Text::Tradition::Parser::GraphML qw/ graphml_parse populate_witness_path /; +use Text::Tradition::Parser::GraphML qw/ graphml_parse /; +use TryCatch; =head1 NAME @@ -106,122 +107,170 @@ my $t = Text::Tradition->new( 'file' => $tradition, ); -is( ref( $t ), 'Text::Tradition', "Parsed our own GraphML" ); +is( ref( $t ), 'Text::Tradition', "Parsed GraphML version 2" ); if( $t ) { is( scalar $t->collation->readings, 319, "Collation has all readings" ); - is( scalar $t->collation->paths, 2854, "Collation has all paths" ); + is( scalar $t->collation->paths, 376, "Collation has all paths" ); is( scalar $t->witnesses, 13, "Collation has all witnesses" ); } +# TODO add a relationship, add a stemma, write graphml, reparse it, check that +# the new data is there +$t->language('Greek'); +$t->add_stemma( 'dotfile' => 't/data/florilegium.dot' ); +$t->collation->add_relationship( 'w12', 'w13', + { 'type' => 'grammatical', 'scope' => 'global', + 'annotation' => 'This is some note' } ); +ok( $t->collation->get_relationship( 'w12', 'w13' ), "Relationship set" ); +my $graphml_str = $t->collation->as_graphml; + +my $newt = Text::Tradition->new( 'input' => 'Self', 'string' => $graphml_str ); +is( ref( $newt ), 'Text::Tradition', "Parsed current GraphML version" ); +if( $newt ) { + is( scalar $newt->collation->readings, 319, "Collation has all readings" ); + is( scalar $newt->collation->paths, 376, "Collation has all paths" ); + is( scalar $newt->witnesses, 13, "Collation has all witnesses" ); + is( scalar $newt->collation->relationships, 1, "Collation has added relationship" ); + is( $newt->language, 'Greek', "Tradition has correct language setting" ); + my $rel = $newt->collation->get_relationship( 'w12', 'w13' ); + ok( $rel, "Found set relationship" ); + is( $rel->annotation, 'This is some note', "Relationship has its properties" ); + is( scalar $newt->stemmata, 1, "Tradition has its stemma" ); + is( $newt->stemma(0)->witnesses, $t->stemma(0)->witnesses, "Stemma has correct length witness list" ); +} + + =end testing =cut -my( $IDKEY, $TOKENKEY, $TRANSPOS_KEY, $RANK_KEY, $CLASS_KEY, - $SOURCE_KEY, $TARGET_KEY, $WITNESS_KEY, $EXTRA_KEY, $RELATIONSHIP_KEY ) - = qw/ name reading identical rank class - source target witness extra relationship/; - sub parse { my( $tradition, $opts ) = @_; - my $graph_data = graphml_parse( $opts ); + + # Collation data is in the first graph; relationship-specific stuff + # is in the second. + my( $graph_data, $rel_data ) = graphml_parse( $opts ); my $collation = $tradition->collation; my %witnesses; - # Set up the graph-global attributes. They will appear in the - # hash under their accessor names. - print STDERR "Setting graph globals\n"; + # print STDERR "Setting graph globals\n"; $tradition->name( $graph_data->{'name'} ); - foreach my $gkey ( keys %{$graph_data->{'attr'}} ) { - my $val = $graph_data->{'attr'}->{$gkey}; - $collation->$gkey( $val ); + my $use_version; + my $tmeta = $tradition->meta; + my $cmeta = $collation->meta; + foreach my $gkey ( keys %{$graph_data->{'global'}} ) { + my $val = $graph_data->{'global'}->{$gkey}; + if( $gkey eq 'version' ) { + $use_version = $val; + } elsif( $gkey eq 'stemmata' ) { # Special case, yuck + foreach my $dotstr ( split( /\n/, $val ) ) { + $tradition->add_stemma( 'dot' => $dotstr ); + } + } elsif( $tmeta->has_attribute( $gkey ) ) { + $tradition->$gkey( $val ); + } else { + $collation->$gkey( $val ); + } } - # Add the nodes to the graph. - - my $extra_data = {}; # Keep track of data that needs to be processed - # after the nodes & edges are created. - print STDERR "Adding graph nodes\n"; - foreach my $n ( @{$graph_data->{'nodes'}} ) { - # First extract the data that we can use without reference to - # anything else. - my %node_data = %$n; # Need $n itself untouched for edge processing - my $nodeid = delete $node_data{$IDKEY}; - my $reading = delete $node_data{$TOKENKEY}; - my $class = delete $node_data{$CLASS_KEY} || ''; - my $rank = delete $node_data{$RANK_KEY}; - - # Create the node. Current valid classes are common and meta. - # Everything else is a normal reading. - my $gnode = $collation->add_reading( $nodeid ); - $gnode->text( $reading ); - $gnode->make_common if $class eq 'common'; - $gnode->is_meta( 1 ) if $class eq 'meta'; - # This is a horrible hack. - $gnode->is_lacuna( $reading =~ /^\#LACUNA/ ); - $gnode->rank( $rank ) if defined $rank; - - # Now save the data that we need for post-processing, - # if it exists. - if ( keys %node_data ) { - $extra_data->{$nodeid} = \%node_data - } + # Add the nodes to the graph. + # Note any reading IDs that were changed in order to comply with XML + # name restrictions; we have to hardcode start & end. + my %namechange = ( '#START#' => '__START__', '#END#' => '__END__' ); + + # print STDERR "Adding collation readings\n"; + foreach my $n ( @{$graph_data->{'nodes'}} ) { + # If it is the start or end node, we already have one, so + # grab the rank and go. + next if( defined $n->{'is_start'} ); + if( defined $n->{'is_end'} ) { + $collation->end->rank( $n->{'rank'} ); + next; + } + my $gnode = $collation->add_reading( $n ); + if( $gnode->id ne $n->{'id'} ) { + $namechange{$n->{'id'}} = $gnode->id; + } } # Now add the edges. - print STDERR "Adding graph edges\n"; - my $has_ante_corr = {}; + # print STDERR "Adding collation path edges\n"; foreach my $e ( @{$graph_data->{'edges'}} ) { - my $from = $e->{$SOURCE_KEY}; - my $to = $e->{$TARGET_KEY}; - my $class = $e->{$CLASS_KEY}; - - # We may have more information depending on the class. - if( $class eq 'path' ) { - # We need the witness, and whether it is an 'extra' reading path. - my $wit = $e->{$WITNESS_KEY}; - warn "No witness label on path edge!" unless $wit; - my $extra = $e->{$EXTRA_KEY}; - my $label = $wit . ( $extra ? $collation->ac_label : '' ); - $collation->add_path( $from->{$IDKEY}, $to->{$IDKEY}, $label ); - # Add the witness if we don't have it already. - unless( $witnesses{$wit} ) { - $tradition->add_witness( sigil => $wit ); - $witnesses{$wit} = 1; - } - $has_ante_corr->{$wit} = 1 if $extra; - } elsif( $class eq 'relationship' ) { - # We need the metadata about the relationship. - my $opts = { 'type' => $e->{$RELATIONSHIP_KEY} }; - $opts->{'equal_rank'} = $e->{'equal_rank'} - if exists $e->{'equal_rank'}; - $opts->{'non_correctable'} = $e->{'non_correctable'} - if exists $e->{'non_correctable'}; - $opts->{'non_independent'} = $e->{'non_independent'} - if exists $e->{'non_independent'}; - warn "No relationship type for relationship edge!" unless $opts->{'type'}; - $collation->add_relationship( $from->{$IDKEY}, $to->{$IDKEY}, $opts ); - } - } - - ## Deal with node information (transposition, relationships, etc.) that - ## needs to be processed after all the nodes are created. - print STDERR "Adding second-pass node data\n"; - foreach my $nkey ( keys %$extra_data ) { - foreach my $edkey ( keys %{$extra_data->{$nkey}} ) { - my $this_reading = $collation->reading( $nkey ); - if( $edkey eq $TRANSPOS_KEY ) { - my $other_reading = $collation->reading( $extra_data->{$nkey}->{$edkey} ); - $this_reading->set_identical( $other_reading ); - } else { - warn "Unfamiliar reading node data $edkey for $nkey"; - } - } + my $sourceid = exists $namechange{$e->{'source'}->{'id'}} + ? $namechange{$e->{'source'}->{'id'}} : $e->{'source'}->{'id'}; + my $targetid = exists $namechange{$e->{'target'}->{'id'}} + ? $namechange{$e->{'target'}->{'id'}} : $e->{'target'}->{'id'}; + my $from = $collation->reading( $sourceid ); + my $to = $collation->reading( $targetid ); + + warn "No witness label on path edge!" unless $e->{'witness'}; + my $label = $e->{'witness'} . ( $e->{'extra'} ? $collation->ac_label : '' ); + $collation->add_path( $from, $to, $label ); + + # Add the witness if we don't have it already. + unless( $witnesses{$e->{'witness'}} ) { + $tradition->add_witness( + sigil => $e->{'witness'}, 'sourcetype' => 'collation' ); + $witnesses{$e->{'witness'}} = 1; + } + $tradition->witness( $e->{'witness'} )->is_layered( 1 ) if $e->{'extra'}; } - # Set the $witness->path arrays for each wit. - populate_witness_path( $tradition, $has_ante_corr ); + ## Done with the main graph, now look at the relationships. + # Nodes are added via the call to add_reading above. We only need + # add the relationships themselves. + # TODO check that scoping does trt + $rel_data->{'edges'} ||= []; # so that the next line doesn't break on no rels + foreach my $e ( sort { _layersort_rel( $a, $b ) } @{$rel_data->{'edges'}} ) { + my $sourceid = exists $namechange{$e->{'source'}->{'id'}} + ? $namechange{$e->{'source'}->{'id'}} : $e->{'source'}->{'id'}; + my $targetid = exists $namechange{$e->{'target'}->{'id'}} + ? $namechange{$e->{'target'}->{'id'}} : $e->{'target'}->{'id'}; + my $from = $collation->reading( $sourceid ); + my $to = $collation->reading( $targetid ); + delete $e->{'source'}; + delete $e->{'target'}; + # The remaining keys are relationship attributes. + # Backward compatibility... + if( $use_version eq '2.0' || $use_version eq '3.0' ) { + delete $e->{'class'}; + $e->{'type'} = delete $e->{'relationship'} if exists $e->{'relationship'}; + } + # Add the specified relationship unless we already have done. + my $rel_exists; + if( $e->{'scope'} ne 'local' ) { + my $relobj = $collation->get_relationship( $from, $to ); + if( $relobj && $relobj->scope eq $e->{'scope'} + && $relobj->type eq $e->{'type'} ) { + $rel_exists = 1; + } + } + try { + $collation->add_relationship( $from, $to, $e ) unless $rel_exists; + } catch( Text::Tradition::Error $e ) { + warn "DROPPING $from -> $to: " . $e->message; + } + } + + # Save the text for each witness so that we can ensure consistency + # later on + $collation->text_from_paths(); +} + +## Return the relationship that comes first in priority. +my %LAYERS = ( + 'collated' => 1, + 'orthographic' => 2, + 'spelling' => 3, + ); + +sub _layersort_rel { + my( $a, $b ) = @_; + my $key = exists $a->{'type'} ? 'type' : 'relationship'; + my $at = $LAYERS{$a->{$key}} || 99; + my $bt = $LAYERS{$b->{$key}} || 99; + return $at <=> $bt; } 1;