store morphology as string rather than as L::F::Structure

[scpubgit/stemmatology.git] / stemmaweb / lib / stemmaweb / Controller / Relation.pm

diff --git a/stemmaweb/lib/stemmaweb/Controller/Relation.pm b/stemmaweb/lib/stemmaweb/Controller/Relation.pm
index 8ec7673..22a1d07 100644 (file)
--- a/stemmaweb/lib/stemmaweb/Controller/Relation.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Relation.pm
@@ -145,7 +145,6 @@ sub help :Local :Args(1) {
                        $c->log->debug("Warning: could not load $mod");
                }
                my $has_mod = $mod->can('morphology_tags');
-               $DB::single = 1;
                if( $has_mod ) {
                        my $tagset = &$has_mod;
                        $c->stash->{'tagset'} = $tagset;
@@ -299,12 +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.
@@ -321,17 +322,23 @@ sub reading :Chained('text') :PathPart :Args(1) {
                                        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;
+                                               }
                                        }
-                                       $lx->disambiguate( $idx );
+                                       $lx->disambiguate( $idx ) if defined $idx;
                                } elsif( $read_write_keys{$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');