Merge branch 'master' of https://github.com/tla/stemmaweb into nodemerge

diff --git a/lib/stemmaweb/Controller/Relation.pm b/lib/stemmaweb/Controller/Relation.pm
index 0a0579c..12c63ef 100644 (file)
--- a/lib/stemmaweb/Controller/Relation.pm
+++ b/lib/stemmaweb/Controller/Relation.pm
@@ -9,7 +9,6 @@ use TryCatch;
 
 BEGIN { extends 'Catalyst::Controller' }
 
-
 =head1 NAME
 
 stemmaweb::Controller::Relation - Controller for the relationship mapper
@@ -428,6 +427,114 @@ 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 );
+                               Text::Tradition::Error->throw_collation_error( "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 );
+                                       Text::Tradition::Error->throw_collation_error( "Layered text differs for witness " . $wit->sigil )
+                                               unless $pathtext eq $origtext{$acsig};
+                               }
+                       }
+               } catch (Text::Tradition::Error $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 }

diff --git a/root/css/relationship.css b/root/css/relationship.css
index 98f03b7..fbe46ce 100644 (file)
--- a/root/css/relationship.css
+++ b/root/css/relationship.css
@@ -233,3 +233,7 @@ user-select: none;
     background-color: #FFFFCC;
     z-index: 51; /* Cf. #update_workspace_button */
 }
+
+.error {
+    color: red;
+}

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 9a4a169..79162d9 100644 (file)
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -855,6 +855,53 @@ function merge_node( source_node_id, target_node_id ) {
     $( jq( source_node_id ) ).remove();    
 }
 
+function compress_nodes(readings) {
+    //add text of other readings to 1st reading
+
+    var first = get_ellipse(readings[0]);
+    var first_title = first.parent().find('text')[0];
+
+    for (var i = 1; i < readings.length; i++) {
+        var cur         = get_ellipse(readings[i]);
+        var cur_title   = cur.parent().find('text')[0];
+
+        first_title.textContent += " " + cur_title.textContent;
+    };
+
+    //delete all others
+    for (var i = 1; i < readings.length; i++) {
+        var node = get_ellipse(readings[i]);
+        var rid = readings[i-1] + '->' + readings[i];
+
+        //[].slice.call(s.getElementsByTagName('title')).find(function(elem){return elem.textContent=='r64.2->r66.2'}).parentNode.remove()
+
+        var titles = svg_root.getElementsByTagName('title');
+        var titlesArray = [].slice.call(titles);
+
+        if (titlesArray.length > 0) {
+            var title = titlesArray.find(function(elem){
+                return elem.textContent === rid;
+            });
+
+            if (title && title.parentNode) {
+                title.parentNode.remove();
+            }
+        }
+
+        var x = parseInt(first[0].getAttribute('cx'), 10);
+
+        first[0].setAttribute('rx', 4.5 * first_title.textContent.length);
+
+        if (text_direction !== "BI") {
+            first[0].setAttribute('cx', x +  first_title.textContent.length + 20);
+            first_title.setAttribute('x', first[0].getAttribute('cx'));
+        }
+
+        merge_node(readings[i], readings[0]);
+        //node.parent().remove();
+    }
+}
+
 function Marquee() {
     
     var self = this;
@@ -946,17 +993,53 @@ function Marquee() {
             if( $('ellipse[fill="#9999ff"]').size() > 0 ) {
                 //add intersection of witnesses sets to the multi select form and open it
                 $('#detach_collated_form').empty();
+
                 $.each( readings, function( index, value ) {
                   $('#detach_collated_form').append( $('<input>').attr(
                     "type", "hidden").attr("name", "readings[]").attr(
                     "value", value ) );
-               });
-                               $.each( witnesses, function( index, value ) {
+                });
+                $.each( witnesses, function( index, value ) {
                     $('#detach_collated_form').append( 
                       '<input type="checkbox" name="witnesses[]" value="' + value 
                       + '">' + value + '<br>' ); 
                 });
                 $('#multiple_selected_readings').attr('value', readings.join(',') ); 
+
+                if ($('#action-merge')[0].checked) {
+                    $('#detach_collated_form').hide();
+                    $('#multipleselect-form-text').hide();
+
+                    $('#detach_btn').hide();
+                    $('#merge_btn').show();
+                } else {
+                    $('#detach_collated_form').show();
+                    $('#multipleselect-form-text').show();
+
+                    $('#detach_btn').show();
+                    $('#merge_btn').hide();
+                }
+
+                $('#action-detach').change(function() {
+                    if ($('#action-detach')[0].checked) {
+                        $('#detach_collated_form').show();
+                        $('#multipleselect-form-text').show();
+
+                        $('#detach_btn').show();
+                        $('#merge_btn').hide();
+                    }
+                });
+
+                $('#action-merge').change(function() {
+                    if ($('#action-merge')[0].checked) {
+                        $('#detach_collated_form').hide();
+                        $('#multipleselect-form-text').hide();
+
+                        $('#detach_btn').hide();
+                        $('#merge_btn').show();
+                    }
+                });
+
                 $('#multipleselect-form').dialog( 'open' );
             }
             self.svg_rect.remove( $('#marquee') );
@@ -1242,11 +1325,16 @@ $(document).ready(function () {
     width: 250,
     modal: true,
     buttons: {
-        Cancel: function() { $( this ).dialog( "close" ); },
-        Detach: function ( evt ) { 
+        Cancel: function() {
+            document.getElementById('duplicate-merge-error').innerHTML = "";
+            $( this ).dialog( "close" );
+        },
+        Detach: function ( evt ) {
+            evt.target.id = 'detach_btn';
+
             var self = $(this);
-                       var mybuttons = $(evt.target).closest('button').parent().find('button');
-                       mybuttons.button( 'disable' );
+            var mybuttons = $(evt.target).closest('button').parent().find('button');
+            mybuttons.button( 'disable' );
             var form_values = $('#detach_collated_form').serialize();
             ncpath = getTextURL( 'duplicate' );
             var jqjson = $.post( ncpath, form_values, function(data) {
@@ -1254,6 +1342,33 @@ $(document).ready(function () {
                 mybuttons.button("enable");
                 self.dialog( "close" );
             } );
+        },
+        Merge: function (evt) {
+            evt.target.id = 'merge_btn';
+
+            var self = $(this);
+            var mybuttons = $(evt.target).closest('button').parent().find('button');
+            mybuttons.button('disable');
+
+            var ncpath = getTextURL('compress');
+            var form_values = $('#detach_collated_form').serialize();
+
+            var jqjson = $.post(ncpath, form_values, function(data) {
+                if (data.success) {
+                    document.getElementById('duplicate-merge-error').innerHTML = "";
+
+                    if (data.nodes) {
+                        compress_nodes(data.nodes);
+                    }
+
+                    mybuttons.button('enable');
+                    self.dialog('close');
+                } else if (data.error_msg) {
+                    document.getElementById('duplicate-merge-error').innerHTML = data.error_msg;
+                    mybuttons.button('enable');
+
+                }
+            });
         }
     },
     create: function(event, ui) {
@@ -1268,6 +1383,11 @@ $(document).ready(function () {
         $("#dialog_overlay").height( $("#enlargement_container").height() );
         $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
         $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+
+        var mybuttons = $(this).parent().find('button');
+
+        mybuttons[1].id = 'detach_btn';
+        mybuttons[2].id = 'merge_btn';
     },
     close: function() { 
         marquee.unselect();

diff --git a/root/src/relate.tt b/root/src/relate.tt
index 4d9d4e4..016ae38 100644 (file)
--- a/root/src/relate.tt
+++ b/root/src/relate.tt
@@ -109,6 +109,22 @@ $(document).ready(function () {
 
        <div id="multipleselect-form" title="Multiple nodes selected...">
                <div id="multipleselect-form-status"></div>
+       
+               <div class="error" id="duplicate-merge-error">
+               </div>
+
+               Detach or merge?<br/>
+               
+               <form autocomplete="off">
+                       <label>
+                               <input id="action-detach" checked name='option' type='radio' /> Detach
+                       </label>
+
+                       <label>
+                               <input id="action-merge" name='option' type='radio' /> Merge
+                       </label>
+               </form>
+
                <div id="multipleselect-form-text">Select witness(es) to detach:</div>
                <form id="detach_collated_form" action="#">
                </form>