You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/09/18 02:17:04 UTC
svn commit: r1386924 - in /lucene/dev/trunk/solr:
core/src/java/doc-files/tutorial.html webapp/web/js/scripts/analysis.js
Author: hossman
Date: Tue Sep 18 00:17:04 2012
New Revision: 1386924
URL: http://svn.apache.org/viewvc?rev=1386924&view=rev
Log:
SOLR-3519: verbose_option URL param in analysis UI, and updated tutorial links to use it
Modified:
lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html
lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
Modified: lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html?rev=1386924&r1=1386923&r2=1386924&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html (original)
+++ lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html Tue Sep 18 00:17:04 2012
@@ -596,7 +596,7 @@ There is a handy <a href="http://localho
where you can see how a text value is broken down into words by both Index time nad Query time analysis chains for a field or field type. This page shows the resulting tokens after they pass through each filter in the chains.
</p>
<p>
- <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=&analysis.fieldtype=text_en_splitting">This url</a>
+ <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=&analysis.fieldtype=text_en_splitting&verbose_output=0">This url</a>
shows the tokens created from
"<span class="codefrag">Canon Power-Shot SD500</span>"
using the
@@ -607,14 +607,14 @@ where you can see how a text value is br
<span class="codefrag">power</span>, <span class="codefrag">shot</span>
are indexed, using tokens that have the same "position".
(Compare the previous output with
- <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=&analysis.fieldtype=text_general">The tokens produced using the text_general field type</a>.)
+ <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=&analysis.fieldtype=text_general&verbose_output=0">The tokens produced using the text_general field type</a>.)
</p>
<p>
-Mousing over the section label to the left of the section will display the full name of the analyzer component at that stage of the chain. Toggling the "Verbose Output" checkbox will show/hide the detailed token attributes.
+Mousing over the section label to the left of the section will display the full name of the analyzer component at that stage of the chain. Toggling the "Verbose Output" checkbox will <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=&analysis.fieldtype=text_en_splitting&verbose_output=1">show/hide the detailed token attributes</a>.
</p>
<p>
-When both <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=power+shot+sd-500&analysis.fieldtype=text_en_splitting">Index and Query</a>
+When both <a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Canon+Power-Shot+SD500&analysis.query=power+shot+sd-500&analysis.fieldtype=text_en_splitting&verbose_output=0">Index and Query</a>
values are provided, two tables will be displayed side by side showing the
results of each chain. Terms in the Index chain results that are equivilent
to the final terms produced by the Query chain will be highlighted.
@@ -623,17 +623,16 @@ to the final terms produced by the Query
Other interesting examples:
</p>
<ul>
- <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=Four+score+and+seven+years+ago+our+fathers+brought+forth+on+this+continent+a+new+nation%2C+conceived+in+liberty+and+dedicated+to+the+proposition+that+all+men+are+created+equal.%0A&analysis.query=liberties+and+equality&analysis.fieldtype=text_en">English stemming and stop-words</a>
+ <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldvalue=A+new+nation%2C+conceived+in+liberty+and+dedicated+to+the+proposition+that+all+men+are+created+equal.%0A&analysis.query=liberties+and+equality&analysis.fieldtype=text_en&verbose_output=0">English stemming and stop-words</a>
using the <span class="codefrag">text_en</span> field type
</li>
- <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_cjk&analysis.fieldvalue=%EF%BD%B6%EF%BE%80%EF%BD%B6%EF%BE%85&analysis.query=%E3%82%AB%E3%82%BF%E3%82%AB%E3%83%8A">Half-width katakana normalization with bi-graming</a>
+ <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_cjk&analysis.fieldvalue=%EF%BD%B6%EF%BE%80%EF%BD%B6%EF%BE%85&analysis.query=%E3%82%AB%E3%82%BF%E3%82%AB%E3%83%8A&verbose_output=1">Half-width katakana normalization with bi-graming</a>
using the <span class="codefrag">text_cjk</span> field type
</li>
- <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_ja&analysis.fieldvalue=%E7%A7%81%E3%81%AF%E5%88%B6%E9%99%90%E3%82%B9%E3%83%94%E3%83%BC%E3%83%89%E3%82%92%E8%B6%85%E3%81%88%E3%82%8B%E3%80%82">Japanese morphological decomposition with part-of-speech filtering</a>
+ <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_ja&analysis.fieldvalue=%E7%A7%81%E3%81%AF%E5%88%B6%E9%99%90%E3%82%B9%E3%83%94%E3%83%BC%E3%83%89%E3%82%92%E8%B6%85%E3%81%88%E3%82%8B%E3%80%82&verbose_output=1">Japanese morphological decomposition with part-of-speech filtering</a>
using the <span class="codefrag">text_ja</span> field type
</li>
- <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_ar&analysis.fieldvalue=%D9%84%D8%A7+%D8%A3%D8%AA%D9%83%D9%84%D9%85+%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A%D8%A9
-">Arabic stop-words, normalization, and stemming</a>
+ <li><a href="http://localhost:8983/solr/#/collection1/analysis?analysis.fieldtype=text_ar&analysis.fieldvalue=%D9%84%D8%A7+%D8%A3%D8%AA%D9%83%D9%84%D9%85+%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A%D8%A9&verbose_output=1">Arabic stop-words, normalization, and stemming</a>
using the <span class="codefrag">text_ar</span> field type
</li>
</ul>
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js?rev=1386924&r1=1386923&r2=1386924&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Tue Sep 18 00:17:04 2012
@@ -15,8 +15,6 @@
limitations under the License.
*/
-var cookie_analysis_verbose = 'analysis_verbose';
-
// #/:core/analysis
sammy.get
(
@@ -26,7 +24,7 @@ sammy.get
var active_core = this.active_core;
var core_basepath = active_core.attr( 'data-basepath' );
var content_element = $( '#content' );
-
+
$.get
(
'tpl/analysis.html',
@@ -40,6 +38,8 @@ sammy.get
var analysis_result = $( '#analysis-result', analysis_element );
analysis_result.hide();
+ var verbose_link = $( '.verbose_output a', analysis_element );
+
var type_or_name = $( '#type_or_name', analysis_form );
var schema_browser_element = $( '#tor_schema' );
var schema_browser_path = $( 'p > a', active_core ).attr( 'href' ) + '/schema-browser'
@@ -133,6 +133,11 @@ sammy.get
}
}
+ if( 'undefined' !== typeof context.params.verbose_output )
+ {
+ verbose_link.trigger( 'toggle', !!context.params.verbose_output.match( /^(1|true)$/ ) );
+ }
+
if( 0 !== fields )
{
analysis_form
@@ -193,20 +198,18 @@ sammy.get
);
}
- var verbose_link = $( '.verbose_output a', analysis_element );
-
verbose_link
.die( 'toggle' )
.live
(
'toggle',
- function( event )
+ function( event, state )
{
$( this ).parent()
- .toggleClass( 'active' );
+ .toggleClass( 'active', state );
analysis_result
- .toggleClass( 'verbose_output' );
+ .toggleClass( 'verbose_output', state );
check_empty_spacer();
}
@@ -217,19 +220,13 @@ sammy.get
'click',
function( event )
{
- $.cookie( cookie_analysis_verbose, $.cookie( cookie_analysis_verbose ) ? null : true );
+ $( this ).parent()
+ .toggleClass( 'active' );
- $( this )
- .trigger( 'toggle' );
+ analysis_form.trigger( 'submit' );
}
);
- if( $.cookie( cookie_analysis_verbose ) )
- {
- verbose_link
- .trigger( 'toggle' );
- }
-
var button = $( 'button', analysis_form )
var compute_analysis_params = function()
@@ -238,6 +235,7 @@ sammy.get
var type_or_name = $( '#type_or_name', analysis_form ).val().split( '=' );
params.push( { name: 'analysis.' + type_or_name[0], value: type_or_name[1] } );
+ params.push( { name: 'verbose_output', value: $( '.verbose_output', analysis_element ).hasClass( 'active' ) ? 1 : 0 } );
return params;
}
@@ -261,10 +259,13 @@ sammy.get
'execute',
function( event )
{
+ var url = core_basepath + '/analysis/field?wt=json&analysis.showmatch=true&' + context.path.split( '?' ).pop();
+ url = url.replace( /&verbose_output=\d/, '' );
+
$.ajax
(
{
- url : core_basepath + '/analysis/field?wt=json&analysis.showmatch=true&' + context.path.split( '?' ).pop(),
+ url : url,
dataType : 'json',
beforeSend : function( xhr, settings )
{