allow relationship colors in SVG download; work around inability to close Download...

[scpubgit/stemmaweb.git] / lib / stemmaweb / Controller / Root.pm

diff --git a/lib/stemmaweb/Controller/Root.pm b/lib/stemmaweb/Controller/Root.pm
index 8fa2489..c772122 100644 (file)
--- a/lib/stemmaweb/Controller/Root.pm
+++ b/lib/stemmaweb/Controller/Root.pm
@@ -396,21 +396,6 @@ sub stemma :Local :Args(2) {
        if( $c->req->method eq 'POST' ) {
                if( $ok eq 'full' ) {
                        my $dot = $c->request->body_params->{'dot'};
-                       # Graph::Reader::Dot does not handle bare unicode. We get around this
-                       # by wrapping all words in double quotes, as long as they aren't already
-                       # wrapped, and as long as they aren't the initial '(di)?graph .*'.
-                       # Horrible HACK.
-                       my @dlines = split( "\n", $dot );
-                       my $wdot = '';
-                       foreach( @dlines ) {
-                               unless( /^(di)?graph/ ) { # Skip the first line
-                                       s/(?<!")\b(\w+)\b(?!")/"$1"/g;
-                               }
-                               $wdot .= "$_\n";
-                       }
-                       # $dot =~ s/(?<!")\b(?!(?:digraph|stemma)\b)(\w+)\b(?!")/"$1"/g;
-                       $dot = $wdot;
-                       print STDERR "$dot\n";
                        try {
                                if( $stemmaid eq 'n' ) {
                                        # We are adding a new stemma.
@@ -528,26 +513,39 @@ sub stemmaroot :Local :Args(2) {
 
 =head2 download
 
- GET /download/$textid
+ GET /download/$textid/$format
  
-Returns the full XML definition of the tradition and its stemmata, if any.
+Returns a file for download of the tradition in the requested format.
  
 =cut
 
-sub download :Local :Args(1) {
-       my( $self, $c, $textid ) = @_;
+sub download :Local :Args(2) {
+       my( $self, $c, $textid, $format ) = @_;
        my $tradition = $c->model('Directory')->tradition( $textid );
        unless( $tradition ) {
                return _json_error( $c, 404, "No tradition with ID $textid" );
        }
        my $ok = _check_permission( $c, $tradition );
        return unless $ok;
+
+       my $outmethod = "as_" . lc( $format );
+       my $view = "View::$format";
+       $c->stash->{'name'} = $tradition->name();
+       $c->stash->{'download'} = 1;
+       my @outputargs;
+       if( $format eq 'SVG' ) {
+               # Send the list of colors through to the backend.
+               # TODO Think of some way not to hard-code this.
+               push( @outputargs, { 'show_relations' => 'all',
+                       'graphcolors' => [ "#5CCCCC", "#67E667", "#F9FE72", "#6B90D4", 
+                               "#FF7673", "#E467B3", "#AA67D5", "#8370D8", "#FFC173" ] } );
+       }
        try {
-               $c->stash->{'result'} = $tradition->collation->as_graphml();
+               $c->stash->{'result'} = $tradition->collation->$outmethod( @outputargs );
        } catch( Text::Tradition::Error $e ) {
                return _json_error( $c, 500, $e->message );
        }
-       $c->forward('View::GraphML');
+       $c->forward( $view );
 }
 
 ####################