X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb%2FController%2FRelation.pm;h=a8e63d0b1de2e88ec416af96f17e4d3f84c45fdd;hb=2a65f5c92fc04069b827194aa591a5795bc9b81b;hp=e59cd7e30d7981a1d95ebb5eeb8c641cb356c02c;hpb=088a14af970747f494c39cdb47dfad73e757a843;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb/Controller/Relation.pm b/lib/stemmaweb/Controller/Relation.pm
index e59cd7e..a8e63d0 100644
--- a/lib/stemmaweb/Controller/Relation.pm
+++ b/lib/stemmaweb/Controller/Relation.pm
@@ -1,13 +1,23 @@
 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' }
 
 
+sub throw {
+	Text::Tradition::Error->throw(
+		'ident' => 'Collation error',
+		'message' => $_[0],
+		);
+}
+
+
 =head1 NAME
 
 stemmaweb::Controller::Relation - Controller for the relationship mapper
@@ -68,9 +78,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 +144,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 +217,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 +238,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 +273,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 +290,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 +413,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';	
 							}
 						}
@@ -388,20 +436,199 @@ sub reading :Chained('text') :PathPart :Args(1) {
 
 }
 
+sub compress :Chained('text') :PathPart :Args(0) {
+	my( $self, $c ) = @_;
+	my $tradition = delete $c->stash->{'tradition'};
+	my $collation = $tradition->collation;
+	my $m = $c->model('Directory');
+
+	my @rids = $c->request->param('readings[]');
+	my @readings;
+
+	foreach my $rid (@rids) {
+		my $rdg = $collation->reading( $rid );
+
+		push @readings, $rdg;
+	}
+
+	my $len = scalar @readings;
+
+	if( $c->request->method eq 'POST' ) {
+		if( $c->stash->{'permission'} ne 'full' ) {
+			$c->response->status( '403' );
+			$c->stash->{'result'} = { 
+				'error' => 'You do not have permission to modify this tradition.' };
+			$c->detach('View::JSON');
+			return;
+		}
+
+		# Sanity check: first save the original text of each witness.
+		my %origtext;
+		foreach my $wit ( $tradition->witnesses ) {
+			$origtext{$wit->sigil} = $collation->path_text( $wit->sigil );
+			if( $wit->is_layered ) {
+				my $acsig = $wit->sigil . $collation->ac_label;
+				$origtext{$acsig} = $collation->path_text( $acsig );
+			}
+		}
+
+		my $first = 0;
+
+		for (my $i = 0; $i < $len; $i++) {
+			my $rdg = $readings[$i];
+
+			if ($rdg->is_combinable) {
+				$first = $i;
+				last;
+			}
+		}
+
+		my @nodes;
+		push @nodes, "$readings[$first]";
+
+		for (my $i = $first+1; $i < $len; $i++) {
+			my $rdg = $readings[$first];
+			my $next = $readings[$i];
+
+			last unless $next->is_combinable;
+			push @nodes, "$next";
+
+			try {
+				$collation->merge_readings( "$rdg", "$next", 1 );
+			} catch ($e) {
+				$c->stash->{result} = {
+					error_msg => $e->message,
+				};
+
+				$c->detach('View::JSON');
+			}
+		}
+		
+		try {
+			# Finally, make sure we haven't screwed anything up.
+			foreach my $wit ( $tradition->witnesses ) {
+				my $pathtext = $collation->path_text( $wit->sigil );
+				throw( "Text differs for witness " . $wit->sigil )
+					unless $pathtext eq $origtext{$wit->sigil};
+				if( $wit->is_layered ) {
+					my $acsig = $wit->sigil . $collation->ac_label;
+					$pathtext = $collation->path_text( $acsig );
+					throw( "Layered text differs for witness " . $wit->sigil )
+						unless $pathtext eq $origtext{$acsig};
+				}
+			}
+		} catch ($e) {
+			$c->stash->{result} = {
+				error_msg => $e->message,
+			};
+
+			$c->detach('View::JSON');
+		}
+
+
+		$collation->relations->rebuild_equivalence();
+		$collation->calculate_ranks();
+
+		$m->save($collation);
+
+		if ($collation->direction eq 'RL') {
+			@nodes = reverse @nodes;
+		}
+
+		$c->stash->{'result'} = {
+			success => 1,
+			nodes   => \@nodes,
+		};
+
+		$c->forward('View::JSON');
+	}
+}
+
+=head2 merge
+
+ POST relation/$textid/merge { data }
+ 
+Merges the requested readings, combining the witnesses of both readings into
+the target reading. All non-conflicting source relationships are inherited by
+the target relationship.
+
+=cut
+
+sub merge :Chained('text') :PathPart :Args(0) {
+	my( $self, $c ) = @_;
+	my $tradition = delete $c->stash->{'tradition'};
+	my $collation = $tradition->collation;
+	my $m = $c->model('Directory');
+	if( $c->request->method eq 'POST' ) {
+		if( $c->stash->{'permission'} ne 'full' ) {
+			$c->response->status( '403' );
+			$c->stash->{'result'} = { 
+				'error' => 'You do not have permission to modify this tradition.' };
+			$c->detach('View::JSON');
+			return;
+		}
+		my $errmsg;
+		my $response;
+		
+		my $main = $c->request->param('target_id');
+		my $second = $c->request->param('source_id');
+		# Find the common successor of these, so that we can detect other
+		# potentially identical readings.
+		my $csucc = $collation->common_successor( $main, $second );
+
+		# Try the merge if these are parallel readings.
+		if( $csucc->id eq $main || $csucc->id eq $second ) {
+			$errmsg = "Cannot merge readings in the same path";
+		} else {
+			try {
+				$collation->merge_readings( $main, $second );
+			} catch( Text::Tradition::Error $e ) {
+				$c->response->status( '403' );
+				$errmsg = $e->message;
+			} catch {
+				# Something else went wrong, probably a Moose error
+				$c->response->status( '403' );
+				$errmsg = 'Something went wrong with the request';	
+			}
+		}
+		
+		# Look for readings that are now identical.
+		if( $errmsg ) {
+			$response = { status => 'error', error => $errmsg };
+		} else {
+			$response = { status => 'ok' };
+			unless( $c->request->param('single') ) {
+				my @identical = $collation->identical_readings(
+					start => $main, end => $csucc->id );
+				if( @identical ) {
+					$response->{'checkalign'} = [ 
+						map { [ $_->[0]->id, $_->[1]->id ] } @identical ];
+				}
+			}
+			$m->save( $collation );
+		}
+		$c->stash->{'result'} = $response;
+		$c->forward('View::JSON');			
+	}
+}
+
 =head2 duplicate
 
- POST relation/$textid/duplicate/$id/ { witnesses }
+ POST relation/$textid/duplicate { data }
  
-Duplicates the given reading, detaching the witnesses specified in the list to use
-the new reading instead of the old. The 'witnesses' param should be a JSON array.
+Duplicates the requested readings, detaching the witnesses specified in
+the list to use the new reading(s) instead of the old. The data to be
+passed should be a JSON structure:
+
+ { readings: rid1,rid2,rid3,...
+   witnesses: [ wit1, ... ] }
 
 =cut
 
-sub duplicate :Chained('text') :PathPart :Args(1) {
-	my( $self, $c, $reading_id ) = @_;
+sub duplicate :Chained('text') :PathPart :Args(0) {
+	my( $self, $c ) = @_;
 	my $tradition = delete $c->stash->{'tradition'};
 	my $collation = $tradition->collation;
-	my $rdg = $collation->reading( $reading_id );
 	my $m = $c->model('Directory');
 	if( $c->request->method eq 'POST' ) {
 		if( $c->stash->{'permission'} ne 'full' ) {
@@ -413,27 +640,88 @@ sub duplicate :Chained('text') :PathPart :Args(1) {
 		}
 		my $errmsg;
 		my $response = {};
-		if( $c->request->param('witnesses') ) {
-			my $witlist = from_json( $c->request->param('witnesses') );
+		# Sort out which readings need to be duplicated from the set given, and
+		# ensure that all the given wits bear each relevant reading.
+		
+		my %wits = ();
+		map { $wits{$_} = 1 } $c->request->param('witnesses[]');
+		my %rdgranks = ();
+		foreach my $rid ( $c->request->param('readings[]') ) {
+			my $numwits = 0;
+			my $rdg = $collation->reading( $rid );
+			foreach my $rwit ( $rdg->witnesses( $rid ) ) {
+				$numwits++ if exists $wits{$rwit};
+			}
+			next unless $numwits; # Disregard readings with none of our witnesses
+			if( $numwits < keys( %wits ) ) {
+				$errmsg = "Reading $rid contains some but not all of the specified witnesses.";
+				last;
+			} elsif( exists $rdgranks{ $rdg->rank } ) {
+				$errmsg = "More than one reading would be detached along with $rid at rank " . $rdg->rank;
+				last;
+			} else {
+				$rdgranks{ $rdg->rank } = $rid;
+			}
+		}
+		
+		# Now check that the readings make a single sequence.
+		unless( $errmsg ) {
+			my $prior;
+			foreach my $rank ( sort { $a <=> $b } keys %rdgranks ) {
+				my $rid = $rdgranks{$rank};
+				if( $prior ) {
+					# Check that there is only one path between $prior and $rdg.
+					foreach my $wit ( keys %wits ) {
+						unless( $collation->prior_reading( $rid, $wit ) eq $prior ) {
+							$errmsg = "Diverging witness paths from $prior to $rid at $wit";
+							last;
+						}
+					}
+				}
+				$prior = $rid;
+			}
+		}
+		
+		# Abort if we've run into a problem.
+		if( $errmsg ) {
+			$c->stash->{'result'} = { 'error' => $errmsg };
+			$c->response->status( '403' );
+			$c->forward('View::JSON');
+			return;
+		}
+		
+		# Otherwise, do the dirty work.
+		my @witlist = keys %wits;
+		my @deleted_relations;
+		foreach my $rank ( sort { $a <=> $b } keys %rdgranks ) {
 			my $newrdg;
+			my $reading_id = $rdgranks{$rank};
+			my @delrels;
 			try {
-				$newrdg = $collation->duplicate_reading( $reading_id, @$witlist );
+				( $newrdg, @delrels ) = 
+					$collation->duplicate_reading( $reading_id, @witlist );
 			} catch( Text::Tradition::Error $e ) {
 				$c->response->status( '403' );
 				$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 ) {
-				$response = { reading => $newrdg->id, witnesses => $witlist };
+				my $data = _reading_struct( $newrdg );
+				$data->{'orig_rdg'} = $reading_id;
+				$response->{"$newrdg"} = $data;
+				push( @deleted_relations, @delrels );
 			}
+		} 
+		if( $errmsg ) {
+			$c->stash->{'result'} = { 'error' => $errmsg };
 		} else {
-			$c->response->status( '403' );
-			$errmsg = "At least one witness must be specified for a duplication";
+			$m->save( $collation );
+			$response->{'DELETED'} = \@deleted_relations;
+			$c->stash->{'result'} = $response;
 		}
-		$c->stash->{'result'} = $errmsg ? { 'error' => $errmsg } : $response;
 	}
 	$c->forward('View::JSON');
 }
@@ -464,8 +752,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';
 	}