X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb%2FController%2FRelation.pm;h=0a0579ca5977e0d1ff97644d51aff0e81b57d9f9;hb=89aae3eec7a0e23f314597cd09bd3ffc696c7412;hp=c5f3281ed05c71ef615acb6d29ba46bd6d0cb73f;hpb=eefe56ac02d1c8b96057b0846c294243d6c70736;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb/Controller/Relation.pm b/lib/stemmaweb/Controller/Relation.pm
index c5f3281..0a0579c 100644
--- a/lib/stemmaweb/Controller/Relation.pm
+++ b/lib/stemmaweb/Controller/Relation.pm
@@ -1,8 +1,10 @@
 package stemmaweb::Controller::Relation;
 use JSON qw/ to_json from_json /;
 use Moose;
+use Moose::Util::TypeConstraints qw/ find_type_constraint /;
 use Module::Load;
 use namespace::autoclean;
+use Text::Tradition::Datatypes;
 use TryCatch;
 
 BEGIN { extends 'Catalyst::Controller' }
@@ -68,9 +70,15 @@ sub main :Chained('text') :PathPart('') :Args(0) {
 	my( $self, $c ) = @_;
 	my $tradition = delete $c->stash->{'tradition'};
 	my $collation = $tradition->collation;
-	
+
+	# Stash text direction to use in JS.
+	$c->stash->{'direction'} = $collation->direction;
+
 	# Stash the relationship definitions
-	$c->stash->{'relationship_scopes'} = to_json( [ qw/ local global / ] );
+	$c->stash->{'relationship_scopes'} = 
+		to_json( find_type_constraint( 'RelationshipScope' )->values );
+	$c->stash->{'ternary_values'} = 
+		to_json( find_type_constraint( 'Ternary' )->values );
 	my @reltypeinfo;
 	foreach my $type ( sort { _typesort( $a, $b ) } $collation->relations->types ) {
 		next if $type->is_weak;
@@ -128,7 +136,7 @@ sub main :Chained('text') :PathPart('') :Args(0) {
 	$c->stash->{'startseg'} = $startseg if defined $startseg;
 	$c->stash->{'svg_string'} = $svg_str;
 	$c->stash->{'text_title'} = $tradition->name;
-	if( $tradition->can('language') ) {
+	if( $tradition->can('language') && $tradition->language ) {
 		$c->stash->{'text_lang'} = $tradition->language;
 		$c->stash->{'can_morphologize'} = 1;
 	} else {
@@ -208,6 +216,7 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 				  a_derivable_from_b => $relobj->a_derivable_from_b,
 				  b_derivable_from_a => $relobj->b_derivable_from_a,
 				  non_independent => $relobj->non_independent,
+				  is_significant => $relobj->is_significant
 				  };
 			$relhash->{'note'} = $relobj->annotation if $relobj->has_annotation;
 			push( @all_relations, $relhash );
@@ -247,6 +256,7 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 		
 			delete $opts->{scope} unless $opts->{scope};
 			delete $opts->{annotation} unless $opts->{annotation};
+			delete $opts->{is_significant} unless $opts->{is_significant};
 			$opts->{propagate} = 1;
 			
 			try {
@@ -255,7 +265,10 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 				$m->save( $tradition );
 			} catch( Text::Tradition::Error $e ) {
 				$c->response->status( '403' );
-				$c->stash->{'result'} = { 'error' => $e->message };
+				$c->stash->{'result'} = { error => $e->message };
+			} catch {
+				$c->response->status( '500' );
+				$c->stash->{'result'} = { error => "Something went wrong with the request" };
 			}
 		} elsif( $c->request->method eq 'DELETE' ) {
 			my $node = $c->request->param('source_id');
@@ -269,7 +282,10 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 			} catch( Text::Tradition::Error $e ) {
 				$c->response->status( '403' );
 				$c->stash->{'result'} = { 'error' => $e->message };
-			}	
+			} catch {
+				$c->response->status( '500' );
+				$c->stash->{'result'} = { error => "Something went wrong with the request" };
+			}
 		}
 	}
 	$c->forward('View::JSON');
@@ -389,7 +405,7 @@ sub reading :Chained('text') :PathPart :Args(1) {
 								$errmsg = $e->message;
 							} catch {
 								# Something else went wrong, probably a Moose error
-								$c->response->status( '403' );
+								$c->response->status( '500' );
 								$errmsg = 'Something went wrong with the request';	
 							}
 						}
@@ -573,7 +589,7 @@ sub duplicate :Chained('text') :PathPart :Args(0) {
 				$errmsg = $e->message;
 			} catch {
 				# Something else went wrong, probably a Moose error
-				$c->response->status( '403' );
+				$c->response->status( '500' );
 				$errmsg = 'Something went wrong with the request';	
 			}
 			if( $newrdg ) {