From: Tara L Andrews Date: Sat, 7 Apr 2012 23:55:48 +0000 (+0200) Subject: add rudimentary logic for text segmentation in lemmatizer X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=93daee8323463d0056cb8b6f076345fd496fc4cc;p=scpubgit%2Fstemmatology.git add rudimentary logic for text segmentation in lemmatizer --- diff --git a/stemmaweb/lib/stemmaweb/Controller/Relation.pm b/stemmaweb/lib/stemmaweb/Controller/Relation.pm index cd67f6a..2671473 100644 --- a/stemmaweb/lib/stemmaweb/Controller/Relation.pm +++ b/stemmaweb/lib/stemmaweb/Controller/Relation.pm @@ -69,33 +69,66 @@ sub definitions :Local :Args(0) { sub text :Chained('/') :PathPart('relation') :CaptureArgs(1) { my( $self, $c, $textid ) = @_; - $c->stash->{'tradition'} = $c->model('Directory')->tradition( $textid ); + # If the tradition has more than 500 ranks or so, split it up. + my $tradition = $c->model('Directory')->tradition( $textid ); + my $length = $tradition->collation->end->rank; + if( $length > 700 ) { + # Segment the tradition in order not to overload the browser. + # Split it up into units of 500 ranks, but have each segment show + # 550 ranks so that overlap works. + my @divs; + my $r = 0; + while( $r + 50 < $length ) { + push( @divs, $r ); + $r += 500; + } + $c->stash->{'textsegments'} = []; + foreach my $start ( @divs ) { + my $seg = { 'start' => $start }; + $seg->{'end'} = $start + 550 > $length ? $length : $start + 550; + push( @{$c->stash->{'textsegments'}}, $seg ); + } + } + $c->stash->{'textid'} = $textid; + $c->stash->{'tradition'} = $tradition; } sub main :Chained('text') :PathPart('') :Args(0) { my( $self, $c ) = @_; + my $startseg = $c->req->param('start'); my $tradition = delete $c->stash->{'tradition'}; my $collation = $tradition->collation; - my $svg_str = $collation->as_svg; + my $svgopts; + if( $startseg ) { + # Only render the subgraph from startseg to +500 or end, + # whichever is less. + $svgopts = { 'from' => $startseg }; + $svgopts->{'to'} = $startseg + 550 + if $startseg + 550 < $collation->end->rank; + } elsif( exists $c->stash->{'textsegments'} ) { + # This is the unqualified load of a long tradition. We implicitly start + # at zero, but go only as far as 550. + $svgopts = { 'to' => 550 }; + } + my $svg_str = $collation->as_svg( $svgopts ); $svg_str =~ s/\n//gs; $c->stash->{'svg_string'} = $svg_str; $c->stash->{'text_title'} = $tradition->name; $c->stash->{'template'} = 'relate.tt'; - } =head2 relationships - GET $textid/relationships + GET relation/$textid/relationships Returns the list of relationships defined for this text. - POST $textid/relationships { request } + POST relation/$textid/relationships { request } Attempts to define the requested relationship within the text. Returns 200 on success or 403 on error. - DELETE $textid/relationships { request } + DELETE relation/$textid/relationships { request } =cut diff --git a/stemmaweb/root/css/relationship.css b/stemmaweb/root/css/relationship.css index bed28ee..ef19de0 100644 --- a/stemmaweb/root/css/relationship.css +++ b/stemmaweb/root/css/relationship.css @@ -32,6 +32,10 @@ body { height: 55px; padding-top: 40px; } +.segment_guide { + padding-left: 30px; + padding-right: 30px; +} h1.title a:link, h1.title a:visited, h1.title a:active { color: #666; font-weight: bold; diff --git a/stemmaweb/root/js/relationship.js b/stemmaweb/root/js/relationship.js index 7921b1d..d569c16 100644 --- a/stemmaweb/root/js/relationship.js +++ b/stemmaweb/root/js/relationship.js @@ -1,8 +1,13 @@ function getTextPath() { var currpath = window.location.pathname + // Get rid of trailing slash if( currpath.lastIndexOf('/') == currpath.length - 1 ) { currpath = currpath.slice( 0, currpath.length - 1) }; + // Get rid of query parameters + if( currpath.lastIndexOf('?') != -1 ) { + currpath = currpath.slice( 0, currpath.lastIndexOf('?') ); + }; var path_elements = currpath.split('/'); var textid = path_elements.pop(); var basepath = path_elements.join( '/' ); @@ -50,7 +55,7 @@ function svgEnlargementLoaded() { var transform = 'rotate(0) scale(' + scale + ') translate(4 ' + translate + ')'; svg_g.setAttribute('transform', transform); //used to calculate min and max zoom level: - start_element_height = $("#svgenlargement .node title:contains('#START#')").siblings('ellipse')[0].getBBox().height; + start_element_height = $("#svgenlargement .node title:contains('START#')").siblings('ellipse')[0].getBBox().height; add_relations( function() { $('#loading_overlay').hide(); }); } @@ -63,7 +68,9 @@ function add_relations( callback_fn ) { function(data) { $.each(data, function( index, rel_info ) { var type_index = $.inArray(rel_info.type, rel_types); - if( type_index != -1 ) { + var source_found = get_ellipse( rel_info.source ); + var target_found = get_ellipse( rel_info.target ); + if( type_index != -1 && source_found.size() && target_found.size() ) { var relation = relation_manager.create( rel_info.source, rel_info.target, type_index ); relation.data( 'type', rel_info.type ); relation.data( 'scope', rel_info.scope ); diff --git a/stemmaweb/root/src/relate.tt b/stemmaweb/root/src/relate.tt index 89ca08c..87e311c 100644 --- a/stemmaweb/root/src/relate.tt +++ b/stemmaweb/root/src/relate.tt @@ -16,6 +16,13 @@ $(function() {

Relationship mapper

[% text_title %]

+
+[% FOREACH segment IN textsegments -%] + + [% segment.start %] – [% segment.end %] + +[% END -%] +