Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3205: Improved Error-Handling on Analysis 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1300009 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Matheis 2012-03-13 08:51:53 +00:00
parent 993908d5d5
commit 3a7ca0841d
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
solr/webapp/web/js/scripts/analysis.js
View File

@ -176,7 +176,6 @@ sammy.get
array.push( { name: 'analysis.showmatch', value: 'true' } );
var type_or_name = $( '#type_or_name', form ).val().split( '=' );
array.push( { name: 'analysis.' + type_or_name[0], value: type_or_name[1] } );
},
success : function( response, status_text, xhr, form )
@ -213,24 +212,21 @@ sammy.get
}
else
{
var error_message = error_thrown.match( /^(.+Exception):\s+(.*)$/ );
$( '#analysis-error', analysis_element )
.show();
if( error_message )
var response = null;
try
{
$( '#analysis-error .head a span', analysis_element )
.text( error_message[1] );
eval( 'response = ' + xhr.responseText + ';' );
}
catch( e )
{
console.error( e );
}
$( '#analysis-error .body', analysis_element )
.text( error_message[2].replace( /(\s+at\s+)/g, " at\n" ) );
}
else
{
$( '#analysis-error .head a span', analysis_element )
.text( error_thrown );
}
$( '#analysis-error .body', analysis_element )
.text( response ? response.error.msg : xhr.responseText );
}
},
complete : function()
@ -276,7 +272,7 @@ sammy.get
var colspan = 1;
var elements = analysis_data[type][i+1];
var elements_count = global_elements_count;
if( !elements[0] || !elements[0].positionHistory )
{
colspan = elements_count;
@ -312,8 +308,7 @@ sammy.get
content += '<tr class="step">' + "\n";
// analyzer
var analyzer_name = analysis_data[type][i]
.replace( /(\$1)+$/g, '' );
var analyzer_name = analysis_data[type][i].replace( /(\$1)+$/g, '' );
var analyzer_short = -1 !== analyzer_name.indexOf( '$' )
? analyzer_name.split( '$' )[1]
@ -321,8 +316,8 @@ sammy.get
analyzer_short = analyzer_short.match( /[A-Z]/g ).join( '' );
content += '<td class="part analyzer"><div>' + "\n";
content += '<abbr title="' + analysis_data[type][i] + '">' + "\n";
content += analyzer_short + '</abbr></div></td>' + "\n";
content += '<abbr title="' + analysis_data[type][i].esc() + '">' + "\n";
content += analyzer_short.esc() + '</abbr></div></td>' + "\n";
// legend
content += '<td class="part legend"><div class="holder">' + "\n";