checkpoint, not sure what is here

[scpubgit/stemmatology.git] / lib / Text / Tradition / Parser / Self.pm

diff --git a/lib/Text/Tradition/Parser/Self.pm b/lib/Text/Tradition/Parser/Self.pm
index 781a739..6baca63 100644 (file)
--- a/lib/Text/Tradition/Parser/Self.pm
+++ b/lib/Text/Tradition/Parser/Self.pm
@@ -27,11 +27,12 @@ graph.
 
 =cut
 
-my( $IDKEY, $TOKENKEY, $TRANSPOS_KEY, $POSITION_KEY ) 
-    = qw/ name reading identical position /;
+my( $IDKEY, $TOKENKEY, $TRANSPOS_KEY, $POSITION_KEY, $CLASS_KEY ) 
+    = qw/ name reading identical position class /;
 
 sub parse {
     my( $tradition, $graphml_str ) = @_;
+    $DB::single = 1;
     my $graph_data = Text::Tradition::Parser::GraphML::parse( $graphml_str );
 
     my $collation = $tradition->collation;
@@ -41,13 +42,20 @@ sub parse {
 
     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'}} ) {
-       # Could use a better way of registering these
+       # Each node is either a segment or a reading, depending on
+       # its class.  Readings have text, segments don't.
        my %node_data = %$n;
        my $nodeid = delete $node_data{$IDKEY};
        my $reading = delete $node_data{$TOKENKEY};
-       my $gnode = $collation->add_reading( $nodeid );
-       $gnode->text( $reading );
+       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,
        # if it exists.
@@ -57,14 +65,20 @@ sub parse {
     }
        
     # 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 );
@@ -73,26 +87,33 @@ sub parse {
                my $label = $wkey eq 'witness_ante_corr' 
                    ? $wit . $collation->ac_label : $wit;
                $collation->add_path( $from->{$IDKEY}, $to->{$IDKEY}, $label );
-           } else {
+           } 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' );
            }
        }
     }
 
     ## 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;
     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} );
-               if( $collation->linear ) {
-                   $this_reading->set_identical( $other_reading );
-               } else {
-                   $collation->merge_readings( $other_reading, $this_reading );
-               }
+               # We evidently have a linear graph.
+               $linear = 1;
+               $this_reading->set_identical( $other_reading );
            } elsif ( $edkey eq $POSITION_KEY ) {
                $this_reading->position( $extra_data->{$nkey}->{$edkey} );
            } else {
@@ -100,12 +121,13 @@ sub parse {
            }
        }
     }
+    $collation->linear( $linear );
 
     # We know what the beginning and ending nodes are, no need to
     # search or reset.
     my $end_node = $collation->reading( '#END#' );
-    $DB::single = 1;
     # Walk the paths and make reading sequences for our witnesses.
+    # No need to calculate positions as we have them already.
     $collation->walk_witness_paths( $end_node );
 }