use strict;
use warnings;
use Getopt::Long;
+use TryCatch;
use Text::Tradition;
use Text::Tradition::Directory;
-use Text::Tradition::StemmaUtil;
+use Text::Tradition::StemmaUtil qw/ character_input phylip_pars /;
binmode STDERR, ":utf8";
binmode STDOUT, ":utf8";
eval { no warnings; binmode $DB::OUT, ":utf8"; };
-my( $informat, $inbase, $outformat, $help, $linear, $name, $HACK, $sep, $stemmafile, $dsn )
- = ( '', '', '', '', 1, 'Tradition', 0, "\t", '',
- "dbi:SQLite:dbname=stemmaweb/db/traditions.db" );
+my( $informat, $inbase, $outformat, $help, $language, $name, $sep, $stemmafile,
+ $dsn, $dbuser, $dbpass, $from, $to )
+ = ( '', '', '', '', 'Default', 'Tradition', "\t", '',
+ "dbi:SQLite:dbname=stemmaweb/db/traditions.db", undef, undef, undef, undef );
GetOptions( 'i|in=s' => \$informat,
'b|base=s' => \$inbase,
'o|out=s' => \$outformat,
- 'l|linear!' => \$linear,
+ 'l|language=s' => \$language,
'n|name=s' => \$name,
'h|help' => \$help,
's|stemma=s' => \$stemmafile,
+ 'u|user=s' => \$dbuser,
+ 'p|pass=s' => \$dbpass,
+ 'f|from=s' => \$from,
+ 't|to=s' => \$to,
'sep=s' => \$sep,
- 'hack' => \$HACK,
'dsn=s' => \$dsn,
);
help( "Output format must be one of db, graphml, svg, csv, stemma, or dot" );
}
+if( $from || $to ) {
+ help( "Subgraphs only supported in GraphML format" )
+ unless $outformat eq 'graphml';
+}
+
# Do we have a base if we need it?
if( $informat =~ /^(KUL|CollateText)$/ && !$inbase ) {
help( "$informat input needs a base text" );
# First: read the base. Make a graph, but also note which
# nodes represent line beginnings.
my %args = ( 'input' => $informat,
- 'file' => $input,
- 'linear' => $linear );
+ 'file' => $input );
$args{'base'} = $inbase if $inbase;
+$args{'language'} = $language if $language;
$args{'name'} = $name if $name;
$args{'sep_char'} = $sep if $informat eq 'Tabular';
### Custom hacking for Stone
print STDERR "Saved stemma at $stemmafile\n" if $stemma;
}
-### Custom hacking
-# Remove witnesses C, E, G in the Matthew text
-if( $HACK ) {
- my @togo = qw/ C E G /;
- $tradition->collation->clear_witness( @togo );
- $tradition->del_witness( @togo );
-}
-
# Now output what we have been asked to.
if( $outformat eq 'stemma' ) {
- my $cdata = character_input( $tradition->collation->make_alignment_table );
- my( $result, $tree ) = phylip_pars( $cdata );
- if( $result ) {
- print $tree;
- } else {
- print STDERR "Bad result: $tree";
+ my $cdata = character_input( $tradition->collation->alignment_table );
+ try {
+ print phylip_pars( $cdata );
+ } catch( Text::Tradition::Error $e ) {
+ print STDERR "Bad result: " . $e->message;
}
} elsif( $outformat eq 'db' ) {
+ my $extra_args = { 'create' => 1 };
+ $extra_args->{'user'} = $dbuser if $dbuser;
+ $extra_args->{'password'} = $dbpass if $dbpass;
my $dir = Text::Tradition::Directory->new( 'dsn' => $dsn,
- 'extra_args' => { 'create' => 1 } );
+ 'extra_args' => $extra_args );
my $scope = $dir->new_scope;
my $uuid = $dir->store( $tradition );
print STDERR "Saved tradition to database with ID $uuid\n";
} else {
my $output = "as_$outformat";
- print $tradition->collation->$output();
+ my $opts = {};
+ $opts->{'from'} = $from if $from;
+ $opts->{'to'} = $to if $to;
+ print $tradition->collation->$output( $opts );
}
sub help {