X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FParser%2FSelf.pm;h=97c2e5546a9113d2eefc561fa4520444f75afbee;hb=e309421ae7b04ee2dcb71cdae2f206ffc6b6c384;hp=5311660a7369b02ae864e09c0ccc2204cd3b66b0;hpb=d9e873d0f90f1b7aec072c16a0eed37878f7f47f;p=scpubgit%2Fstemmatology.git diff --git a/lib/Text/Tradition/Parser/Self.pm b/lib/Text/Tradition/Parser/Self.pm index 5311660..97c2e55 100644 --- a/lib/Text/Tradition/Parser/Self.pm +++ b/lib/Text/Tradition/Parser/Self.pm @@ -27,16 +27,30 @@ graph. =cut -my( $IDKEY, $TOKENKEY, $TRANSPOS_KEY, $RANK_KEY, $CLASS_KEY ) - = qw/ name reading identical rank class /; +# TODO share these with Collation.pm somehow +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, $graphml_str ) = @_; + + # TODO this is begging for stream parsing instead of multiple loops. my $graph_data = Text::Tradition::Parser::GraphML::parse( $graphml_str ); my $collation = $tradition->collation; my %witnesses; - + + # Set up the graph-global attributes. They will appear in the + # hash under their accessor names. + # TODO Consider simplifying this for nodes & edges as well. + print STDERR "Setting graph globals\n"; + foreach my $gkey ( keys %{$graph_data->{'attr'}} ) { + my $val = $graph_data->{'attr'}->{$gkey}; + $collation->$gkey( $val ); + } + # Add the nodes to the graph. # TODO Are we adding extra start/end nodes? @@ -44,85 +58,92 @@ sub parse { # after the nodes & edges are created. print STDERR "Adding graph nodes\n"; foreach my $n ( @{$graph_data->{'nodes'}} ) { - # Each node is either a segment or a reading, depending on - # its class. Readings have text, segments don't. - my %node_data = %$n; + # 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 = $node_data{$CLASS_KEY} || ''; - # TODO this is a hack, fix it? - $class = 'reading' unless $class eq 'segment'; - my $method = $class eq 'segment' ? "add_$class" : "add_reading"; - my $gnode = $collation->$method( $nodeid ); - $gnode->label( $reading ); - $gnode->set_common if $class eq 'common'; - - # Now save the rest of the data, i.e. not the ID or label, + 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'; + $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; + $extra_data->{$nodeid} = \%node_data } } # Now add the edges. print STDERR "Adding graph edges\n"; foreach my $e ( @{$graph_data->{'edges'}} ) { - my %edge_data = %$e; - my $from = delete $edge_data{'source'}; - my $to = delete $edge_data{'target'}; - my $class = delete $edge_data{'class'}; - - # Whatever is left tells us what kind of edge it is. - foreach my $wkey ( keys %edge_data ) { - if( $wkey =~ /^witness/ ) { - unless( $class eq 'path' ) { - warn "Cannot add witness label to a $class edge"; - next; - } - my $wit = $edge_data{$wkey}; - unless( $witnesses{$wit} ) { - $tradition->add_witness( sigil => $wit ); - $witnesses{$wit} = 1; - } - my $label = $wkey eq 'witness_ante_corr' - ? $wit . $collation->ac_label : $wit; - $collation->add_path( $from->{$IDKEY}, $to->{$IDKEY}, $label ); - } elsif( $wkey eq 'relationship' ) { - unless( $class eq 'relationship' ) { - warn "Cannot add relationship label to a $class edge"; - next; - } - my $rel = $edge_data{$wkey}; - # TODO handle global relationships - $collation->add_relationship( $rel, $from->{$IDKEY}, $to->{$IDKEY} ); - } else { - my $seg_edge = $collation->graph->add_edge( $from->{$IDKEY}, $to->{$IDKEY} ); - $seg_edge->set_attribute( 'class', 'segment' ); - } - } + 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; + } + $witnesses{$wit} = 2 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 data\n"; - my $linear = undef; + 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} ); - # We evidently have a linear graph. - $linear = 1; $this_reading->set_identical( $other_reading ); - } elsif ( $edkey eq $RANK_KEY ) { - $this_reading->rank( $extra_data->{$nkey}->{$edkey} ); } else { warn "Unfamiliar reading node data $edkey for $nkey"; } } } - $collation->linear( $linear ); - # TODO We probably need to set the $witness->path arrays for each wit. + + # Set the $witness->path arrays for each wit. + print STDERR "Walking paths for witnesses\n"; + foreach my $wit ( $tradition->witnesses ) { + my @path = $collation->reading_sequence( $collation->start, $collation->end, + $wit->sigil ); + $wit->path( \@path ); + if( $witnesses{$wit->sigil} == 2 ) { + # Get the uncorrected path too + my @uc = $collation->reading_sequence( $collation->start, $collation->end, + $wit->sigil . $collation->ac_label, $wit->sigil ); + $wit->uncorrected_path( \@uc ); + } + } } =back