You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/05 15:22:26 UTC
svn commit: r1429287 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/app.js
solr/webapp/web/js/scripts/cores.js
Author: steffkes
Date: Sat Jan 5 14:22:26 2013
New Revision: 1429287
URL: http://svn.apache.org/viewvc?rev=1429287&view=rev
Log:
SOLR-3851: create a new core/delete an existing core should also update the main/left list of cores on the admin UI (merge r1429286)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1429287&r1=1429286&r2=1429287&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Jan 5 14:22:26 2013
@@ -202,6 +202,9 @@ Optimizations
* SOLR-4261: Percentage Infos on Dashboard have a fixed width (steffkes)
+* SOLR-3851: create a new core/delete an existing core should also update
+ the main/left list of cores on the admin UI (steffkes)
+
Bug Fixes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js?rev=1429287&r1=1429286&r2=1429287&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js Sat Jan 5 14:22:26 2013
@@ -172,6 +172,110 @@ var solr_admin = function( app_config )
}
};
+ sort_cores_data = function sort_cores_data( cores_status )
+ {
+ // build array of core-names for sorting
+ var core_names = [];
+ for( var core_name in cores_status )
+ {
+ core_names.push( core_name );
+ }
+ core_names.sort();
+
+ var core_count = core_names.length;
+ var cores = {};
+
+ for( var i = 0; i < core_count; i++ )
+ {
+ var core_name = core_names[i];
+ cores[core_name] = cores_status[core_name];
+ }
+
+ return cores;
+ };
+
+ this.set_cores_data = function set_cores_data( cores )
+ {
+ self.cores_data = sort_cores_data( cores.status );
+
+ self.menu_element
+ .empty();
+
+ var core_count = 0;
+ for( var core_name in self.cores_data )
+ {
+ core_count++;
+ var core_path = config.solr_path + '/' + core_name;
+ var classes = [];
+
+ if( !environment_basepath )
+ {
+ environment_basepath = core_path;
+ }
+
+ if( cores.status[core_name]['isDefaultCore'] )
+ {
+ classes.push( 'default' );
+ }
+
+ var core_tpl = '<li id="' + core_name.replace( /\./g, '__' ) + '" '
+ + ' class="' + classes.join( ' ' ) + '"'
+ + ' data-basepath="' + core_path + '"'
+ + ' schema="' + cores.status[core_name]['schema'] + '"'
+ + ' config="' + cores.status[core_name]['config'] + '"'
+ + '>' + "\n"
+ + ' <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
+ + ' <ul>' + "\n"
+
+ + ' <li class="ping"><a rel="' + core_path + '/admin/ping"><span>Ping</span></a></li>' + "\n"
+ + ' <li class="query"><a href="#/' + core_name + '/query"><span>Query</span></a></li>' + "\n"
+ + ' <li class="schema"><a href="#/' + core_name + '/schema"><span>Schema</span></a></li>' + "\n"
+ + ' <li class="config"><a href="#/' + core_name + '/config"><span>Config</span></a></li>' + "\n"
+ + ' <li class="replication"><a href="#/' + core_name + '/replication"><span>Replication</span></a></li>' + "\n"
+ + ' <li class="analysis"><a href="#/' + core_name + '/analysis"><span>Analysis</span></a></li>' + "\n"
+ + ' <li class="schema-browser"><a href="#/' + core_name + '/schema-browser"><span>Schema Browser</span></a></li>' + "\n"
+ + ' <li class="plugins"><a href="#/' + core_name + '/plugins"><span>Plugins / Stats</span></a></li>' + "\n"
+ + ' <li class="dataimport"><a href="#/' + core_name + '/dataimport"><span>Dataimport</span></a></li>' + "\n"
+
+ + ' </ul>' + "\n"
+ + '</li>';
+
+ self.menu_element
+ .append( core_tpl );
+ }
+
+ if( cores.initFailures )
+ {
+ var failures = [];
+ for( var core_name in cores.initFailures )
+ {
+ failures.push
+ (
+ '<li>' +
+ '<strong>' + core_name.esc() + ':</strong>' + "\n" +
+ cores.initFailures[core_name].esc() + "\n" +
+ '</li>'
+ );
+ }
+
+ if( 0 !== failures.length )
+ {
+ var init_failures = $( '#init-failures' );
+
+ init_failures.show();
+ $( 'ul', init_failures ).html( failures.join( "\n" ) );
+ }
+ }
+
+ if( 0 === core_count )
+ {
+ show_global_error
+ (
+ '<div class="message">There are no SolrCores running. <br/> Using the Solr Admin UI currently requires at least one SolrCore.</div>'
+ );
+ } // else: we have at least one core....
+ };
+
this.run = function()
{
$.ajax
@@ -186,85 +290,17 @@ var solr_admin = function( app_config )
},
success : function( response )
{
- self.cores_data = response.status;
- var core_count = 0;
+ self.set_cores_data( response );
for( var core_name in response.status )
{
- core_count++;
var core_path = config.solr_path + '/' + core_name;
- var schema = response['status'][core_name]['schema'];
- var solrconfig = response['status'][core_name]['config'];
- var classes = [];
-
if( !environment_basepath )
{
environment_basepath = core_path;
}
-
- if( response['status'][core_name]['isDefaultCore'] )
- {
- classes.push( 'default' );
- }
-
- var core_tpl = '<li id="' + core_name.replace( /\./g, '__' ) + '" '
- + ' class="' + classes.join( ' ' ) + '"'
- + ' data-basepath="' + core_path + '"'
- + ' schema="' + schema + '"'
- + ' config="' + solrconfig + '"'
- + '>' + "\n"
- + ' <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
- + ' <ul>' + "\n"
-
- + ' <li class="ping"><a rel="' + core_path + '/admin/ping"><span>Ping</span></a></li>' + "\n"
- + ' <li class="query"><a href="#/' + core_name + '/query"><span>Query</span></a></li>' + "\n"
- + ' <li class="schema"><a href="#/' + core_name + '/schema"><span>Schema</span></a></li>' + "\n"
- + ' <li class="config"><a href="#/' + core_name + '/config"><span>Config</span></a></li>' + "\n"
- + ' <li class="replication"><a href="#/' + core_name + '/replication"><span>Replication</span></a></li>' + "\n"
- + ' <li class="analysis"><a href="#/' + core_name + '/analysis"><span>Analysis</span></a></li>' + "\n"
- + ' <li class="schema-browser"><a href="#/' + core_name + '/schema-browser"><span>Schema Browser</span></a></li>' + "\n"
- + ' <li class="plugins"><a href="#/' + core_name + '/plugins"><span>Plugins / Stats</span></a></li>' + "\n"
- + ' <li class="dataimport"><a href="#/' + core_name + '/dataimport"><span>Dataimport</span></a></li>' + "\n"
-
- + ' </ul>' + "\n"
- + '</li>';
-
- self.menu_element
- .append( core_tpl );
- }
-
- if( response.initFailures )
- {
- var failures = [];
- for( var core_name in response.initFailures )
- {
- failures.push
- (
- '<li>' +
- '<strong>' + core_name.esc() + ':</strong>' + "\n" +
- response.initFailures[core_name].esc() + "\n" +
- '</li>'
- );
- }
-
- if( 0 !== failures.length )
- {
- var init_failures = $( '#init-failures' );
-
- init_failures.show();
- $( 'ul', init_failures ).html( failures.join( "\n" ) );
- }
}
- if( 0 === core_count )
- {
- show_global_error
- (
- '<div class="message">There are no SolrCores running. <br/> Using the Solr Admin UI currently requires at least one SolrCore.</div>'
- );
- return;
- } // else: we have at least one core....
-
var system_url = environment_basepath + '/admin/system?wt=json';
$.ajax
(
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js?rev=1429287&r1=1429286&r2=1429287&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js Sat Jan 5 14:22:26 2013
@@ -36,7 +36,7 @@ sammy.bind
},
success : function( response, text_status, xhr )
{
- app.cores_data = response.status;
+ app.set_cores_data( response );
params.callback( app.cores_data );
},
error : function( xhr, text_status, error_thrown)
@@ -189,7 +189,7 @@ sammy.get
// index-data
$( '.lastModified dd', index_data_element )
- .html( core_data.index.lastModified );
+ .html( core_data.index.lastModified || '-' );
$( '.version dd', index_data_element )
.html( core_data.index.version );
@@ -201,7 +201,7 @@ sammy.get
.html( core_data.index.maxDoc );
$( '.deletedDocs dd', index_data_element )
- .html( core_data.index.deletedDocs );
+ .html( core_data.index.deletedDocs || '-' );
$( '.optimized dd', index_data_element )
.addClass( !core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );