X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb%2FController%2FRelation.pm;h=24d1de39ad040897c60513c71970d71f664e6a84;hb=d935aef8ba54569b02ab830e070bc486415643c0;hp=467ac90d8ca4e7c72dcbc48b07dc42eb71984439;hpb=217f5e6414a51ebdbdedfd3ce3656d5c731a664c;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb/Controller/Relation.pm b/lib/stemmaweb/Controller/Relation.pm
index 467ac90..24d1de3 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' }
@@ -70,7 +72,10 @@ sub main :Chained('text') :PathPart('') :Args(0) {
 	my $collation = $tradition->collation;
 	
 	# 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 +133,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 {
@@ -201,8 +206,15 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 			my $relobj = $collation->relations->get_relationship( @$p );
 			next if $relobj->type eq 'collated'; # Don't show these
 			next if $p->[0] eq $p->[1]; # HACK until bugfix
-			my $relhash = { source => $p->[0], target => $p->[1], 
-				  type => $relobj->type, scope => $relobj->scope };
+			my $relhash = { source_id => $p->[0], target_id => $p->[1], 
+				  source_text => $collation->reading( $p->[0] )->text,
+				  target_text => $collation->reading( $p->[1] )->text,
+				  type => $relobj->type, scope => $relobj->scope,
+				  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 );
 		}
@@ -215,15 +227,34 @@ sub relationships :Chained('text') :PathPart :Args(0) {
 				'error' => 'You do not have permission to modify this tradition.' };
 			$c->detach( 'View::JSON' );
 		} elsif( $c->request->method eq 'POST' ) {
-			my $node = $c->request->param('source_id');
-			my $target = $c->request->param('target_id');
-			my $relation = $c->request->param('rel_type');
-			my $note = $c->request->param('note');
-			my $scope = $c->request->param('scope');
+			my $opts = $c->request->params; 
+			
+			# Retrieve the source / target from the options
+			my $node = delete $opts->{source_id};
+			my $target = delete $opts->{target_id};
+			
+			# Make sure we didn't send a blank or invalid relationship type
+			my $relation = $opts->{type};
+			unless( $collation->get_relationship_type( $relation ) ) {
+				my $errmsg = $relation ? "No such relationship type $relation" :
+					"You must specify a relationship type";
+				$c->stash->{'result'} = { error => $errmsg };
+				$c->response->status( '400' );
+				$c->detach( 'View::JSON' );
+			}
+			
+			# Keep the data clean
+			my @booleans = qw/ a_derivable_from_b b_derivable_from_a non_independent /;
+			foreach my $k ( keys %$opts ) {
+				if( $opts->{$k} && grep { $_ eq $k } @booleans ) {
+					$opts->{$k} = 1;
+				}
+			}
 		
-			my $opts = { 'type' => $relation, 'propagate' => 1 };
-			$opts->{'scope'} = $scope if $scope;
-			$opts->{'annotation'} = $note if $note;
+			delete $opts->{scope} unless $opts->{scope};
+			delete $opts->{annotation} unless $opts->{annotation};
+			delete $opts->{is_significant} unless $opts->{is_significant};
+			$opts->{propagate} = 1;
 			
 			try {
 				my @vectors = $collation->add_relationship( $node, $target, $opts );
@@ -231,7 +262,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');
@@ -245,7 +279,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');
@@ -365,7 +402,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';	
 							}
 						}
@@ -549,7 +586,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 ) {
@@ -596,8 +633,8 @@ sub _check_permission {
 }
 
 sub _clean_booleans {
-	my( $rdg, $param, $val ) = @_;
-	if( $rdg->meta->get_attribute( $param )->type_constraint->name eq 'Bool' ) {
+	my( $obj, $param, $val ) = @_;
+	if( $obj->meta->get_attribute( $param )->type_constraint->name eq 'Bool' ) {
 		$val = 1 if $val eq 'true';
 		$val = undef if $val eq 'false';
 	}