X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb%2FController%2FRoot.pm;h=66a0d92bea1c67cef525c59776a3535145c53baf;hb=7e48fe7e26e40815f826968cf9d6b48f0aa21a1d;hp=bc86c30baffe246d91ed6646b9538e1c58723188;hpb=c599ad4307cca3d42523b1eb7848941bfb45aca0;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb/Controller/Root.pm b/lib/stemmaweb/Controller/Root.pm
index bc86c30..66a0d92 100644
--- a/lib/stemmaweb/Controller/Root.pm
+++ b/lib/stemmaweb/Controller/Root.pm
@@ -123,12 +123,15 @@ sub newtradition :Local :Args(0) {
 	my $name = $c->request->param('name') || 'Uploaded tradition';
 	my $lang = $c->request->param( 'language' ) || 'Default';
 	my $public = $c->request->param( 'public' ) ? 1 : undef;
+	my $direction = $c->request->param('direction') || 'LR';
+
 	my( $ext ) = $upload->filename =~ /\.(\w+)$/;
 	my %newopts = (
 		'name' => $name,
 		'language' => $lang,
 		'public' => $public,
-		'file' => $upload->tempname
+		'file' => $upload->tempname,
+		'direction' => $direction,
 		);
 
 	my $tradition;
@@ -317,6 +320,10 @@ sub textinfo :Local :Args(1) {
 		public => $tradition->public || 0,
 		owner => $tradition->user ? $tradition->user->email : undef,
 		witnesses => [ map { $_->sigil } $tradition->witnesses ],
+		# TODO Send them all with appropriate parameters so that the
+		# client side can choose what to display.
+		reltypes => [ map { $_->name } grep { !$_->is_weak && $_->is_colocation }
+			$tradition->collation->relationship_types ]
 	};
 	## TODO Make these into callbacks in the other controllers maybe?
 	if( $tradition->can('language') ) {
@@ -445,7 +452,7 @@ sub stemma :Local :Args(2) {
 		$c->stash->{'result'} = $stemma->as_svg();
 		$c->forward('View::SVG');
 	} else { # JSON
-		$c->stash->{'result'} = { _stemma_info( $stemma, $stemmaid ) };
+		$c->stash->{'result'} = _stemma_info( $stemma, $stemmaid );
 		$c->forward('View::JSON');
 	}
 }
@@ -513,26 +520,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 );
 }
 
 ####################