stop saving duplicate path arrays in witnesses; get rid of relationship

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

diff --git a/lib/Text/Tradition/Parser/GraphML.pm b/lib/Text/Tradition/Parser/GraphML.pm
index c29f78a..fbc0d3a 100644 (file)
--- a/lib/Text/Tradition/Parser/GraphML.pm
+++ b/lib/Text/Tradition/Parser/GraphML.pm
@@ -2,9 +2,14 @@ package Text::Tradition::Parser::GraphML;
 
 use strict;
 use warnings;
+use Exporter 'import';
+use vars qw/ @EXPORT_OK $xpc /;
+
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 
+@EXPORT_OK = qw/ graphml_parse /;
+
 =head1 NAME
 
 Text::Tradition::Parser::GraphML
@@ -19,9 +24,7 @@ GraphML conventions of the source program.
 
 =head1 METHODS
 
-=over
-
-=item B<parse>
+=head2 B<graphml_parse>( $init_opts )
 
 parse( $init_opts );
 
@@ -31,17 +34,15 @@ and their associated data.
 
 =cut
 
-use vars qw/ $xpc $graphattr $nodedata $witnesses /;
-
 # Return graph -> nodeid -> { key1/val1, key2/val2, key3/val3 ... }
 #              -> edgeid -> { source, target, wit1/val1, wit2/val2 ...}
 
-sub parse {
+sub graphml_parse {
     my( $opts ) = @_;
 
     my $graph_hash = { 'nodes' => [],
                        'edges' => [] };
-
+                       
     my $parser = XML::LibXML->new();
     my $doc;
     if( exists $opts->{'string'} ) {
@@ -53,6 +54,7 @@ sub parse {
         return;
     }
     
+    my( $graphattr, $nodedata, $witnesses ) = ( {}, {}, {} );
     my $graphml = $doc->documentElement();
     $xpc = XML::LibXML::XPathContext->new( $graphml );
     $xpc->registerNs( 'g', 'http://graphml.graphdrawing.org/xmlns' );
@@ -77,6 +79,7 @@ sub parse {
     }
 
     my $graph_el = $xpc->find( '/g:graphml/g:graph' )->[0];
+    $graph_hash->{'name'} = $graph_el->getAttribute( 'id' );
 
     my $node_reg = {};
     
@@ -127,6 +130,7 @@ sub parse {
     return $graph_hash;
 }
 
+
 sub _lookup_node_data {
     my( $xmlnode, $key ) = @_;
     my $lookup_xpath = './g:data[@key="%s"]/child::text()';