X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Flib%2Fstemmaweb%2FController%2FRelation.pm;h=08421244d8111e3ceeebb9078218f38d11440ad8;hb=a1411d50483bfd6cc561d7f8d81941cd6d6f61a9;hp=c980f8005d6d8f7ff2abafede012c3020b412db3;hpb=3ba238d4d8d644980a0ce64131bce27213cc7981;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/lib/stemmaweb/Controller/Relation.pm b/stemmaweb/lib/stemmaweb/Controller/Relation.pm
index c980f80..0842124 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Relation.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Relation.pm
@@ -1,5 +1,6 @@
 package stemmaweb::Controller::Relation;
 use Moose;
+use Module::Load;
 use namespace::autoclean;
 use TryCatch;
 
@@ -29,19 +30,6 @@ sub index :Path :Args(0) {
 	$c->stash->{'template'} = 'relate.tt';
 }
 
-=head2 help
-
- GET relation/help
-
-Returns the help window HTML.
-
-=cut
-
-sub help :Local :Args(0) {
-	my( $self, $c ) = @_;
-	$c->stash->{'template'} = 'relatehelp.tt';
-}
-
 =head2 definitions
 
  GET relation/definitions
@@ -134,9 +122,37 @@ 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;
+	$c->stash->{'text_lang'} = $tradition->language;
 	$c->stash->{'template'} = 'relate.tt';
 }
 
+=head2 help
+
+ GET relation/help/$language
+
+Returns the help window HTML.
+
+=cut
+
+sub help :Local :Args(1) {
+	my( $self, $c, $lang ) = @_;
+	# Display the morphological help for the language if it is defined.
+	if( $lang && $lang ne 'Default' ) {
+		my $mod = 'Text::Tradition::Language::' . $lang;
+		try {
+			load( $mod );
+		} catch {
+			$c->log->debug("Warning: could not load $mod");
+		}
+		my $has_mod = $mod->can('morphology_tags');
+		if( $has_mod ) {
+			my $tagset = &$has_mod;
+			$c->stash->{'tagset'} = $tagset;
+		}
+	}
+	$c->stash->{'template'} = 'relatehelp.tt';
+}
+
 =head2 relationships
 
  GET relation/$textid/relationships
@@ -282,11 +298,14 @@ sub reading :Chained('text') :PathPart :Args(1) {
 		$c->stash->{'result'} = $rdg ? _reading_struct( $rdg )
 			: { 'error' => "No reading with ID $reading_id" };
 	} elsif ( $c->request->method eq 'POST' ) {
+		my $errmsg;
 		# Are we re-lemmatizing?
 		if( $c->request->param('relemmatize') ) {
 			my $nf = $c->request->param('normal_form');
 			# TODO throw error unless $nf
 			$rdg->normal_form( $nf );
+			# TODO throw error if lemmatization fails
+			# TODO skip this if normal form hasn't changed
 			$rdg->lemmatize();
 		} else {
 			# Set all the values that we have for the reading.
@@ -294,31 +313,50 @@ sub reading :Chained('text') :PathPart :Args(1) {
 			foreach my $p ( keys %{$c->request->params} ) {
 				if( $p =~ /^morphology_(\d+)$/ ) {
 					# Set the form on the correct lexeme
+					my $morphval = $c->request->param( $p );
+					next unless $morphval;
 					my $midx = $1;
-					$c->log->debug( "Fetching lexeme $midx" );
 					my $lx = $rdg->lexeme( $midx );
-					my $strrep = $rdg->language . ' // ' 
-						. $c->request->param( $p );
+					my $strrep = $rdg->language . ' // ' . $morphval;
 					my $idx = $lx->has_form( $strrep );
 					unless( defined $idx ) {
 						# Make the word form and add it to the lexeme.
-						$c->log->debug("Adding new form for $strrep");
-						$idx = $lx->add_matching_form( $strrep ) - 1;
+						try {
+							$idx = $lx->add_matching_form( $strrep ) - 1;
+						} 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';	
+						}
 					}
-					$lx->disambiguate( $idx );
+					$lx->disambiguate( $idx ) if defined $idx;
 				} elsif( $read_write_keys{$p} ) {
-					$rdg->$p( $c->request->param( $p ) );
+					my $val = _clean_booleans( $rdg, $p, $c->request->param( $p ) );
+					$rdg->$p( $val );
 				}
 			}		
 		}
-		$m->save( $tradition );
-		$c->stash->{'result'} = _reading_struct( $rdg );
+		$m->save( $rdg );
+		$c->stash->{'result'} = $errmsg ? { 'error' => $errmsg }
+			: _reading_struct( $rdg );
 
 	}
 	$c->forward('View::JSON');
 
 }
 
+sub _clean_booleans {
+	my( $rdg, $param, $val ) = @_;
+	if( $rdg->meta->get_attribute( $param )->type_constraint->name eq 'Bool' ) {
+		$val = 1 if $val eq 'true';
+		$val = undef if $val eq 'false';
+	} 
+	return $val;
+}
+
 =head2 end
 
 Attempt to render a view, if needed.