save and display relationship annotations

[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 54830ac..832a447 100644 (file)
--- a/stemmaweb/lib/stemmaweb/Controller/Relation.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Relation.pm
@@ -97,9 +97,10 @@ sub relationships :Chained('text') :PathPart :Args(0) {
                my @all_relations;
                foreach my $p ( @pairs ) {
                        my $relobj = $collation->relations->get_relationship( @$p );
-                       push( @all_relations, 
-                               { source => $p->[0], target => $p->[1], 
-                                 type => $relobj->type, scope => $relobj->scope } );
+                       my $relhash = { source => $p->[0], target => $p->[1], 
+                                 type => $relobj->type, scope => $relobj->scope };
+                       $relhash->{'note'} = $relobj->annotation if $relobj->has_annotation;
+                       push( @all_relations, $relhash );
                }
                $c->stash->{'result'} = \@all_relations;
        } elsif( $c->request->method eq 'POST' ) {
@@ -110,8 +111,8 @@ sub relationships :Chained('text') :PathPart :Args(0) {
                my $scope = $c->request->param('scope');
        
                my $opts = { 'type' => $relation,
-                                        'scope' => $scope,
-                                        'annotation' => $note };
+                                        'scope' => $scope };
+               $opts->{'annotation'} = $note if $note;
                
                try {
                        my @vectors = $collation->add_relationship( $node, $target, $opts );