Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 34553 invoked from network); 15 Jul 2010 05:46:55 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Jul 2010 05:46:55 -0000 Received: (qmail 65369 invoked by uid 500); 15 Jul 2010 05:46:54 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 65358 invoked by uid 99); 15 Jul 2010 05:46:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jul 2010 05:46:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jul 2010 05:46:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 200AF23888CE; Thu, 15 Jul 2010 05:45:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964307 - in /lucene/dev/branches/branch_3x/solr: CHANGES.txt src/webapp/web/admin/ src/webapp/web/admin/index.jsp Date: Thu, 15 Jul 2010 05:45:57 -0000 To: commits@lucene.apache.org From: koji@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100715054557.200AF23888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: koji Date: Thu Jul 15 05:45:56 2010 New Revision: 964307 URL: http://svn.apache.org/viewvc?rev=964307&view=rev Log: SOLR-1791: Fix messed up core names on admin gui Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/ (props changed) lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=964307&r1=964306&r2=964307&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original) +++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Thu Jul 15 05:45:56 2010 @@ -298,6 +298,8 @@ Bug Fixes * SOLR-1981: Solr will now fail correctly if solr.xml attempts to specify multiple cores that have the same name (hossman) +* SOLR-1791: Fix messed up core names on admin gui (yonik via koji) + Other Changes ---------------------- Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 15 05:45:56 2010 @@ -0,0 +1,6 @@ +/lucene/dev/trunk/solr/src/webapp/web/admin:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,956715,957465,957520,957707,960367,960374,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267, 964306 +/lucene/java/branches/lucene_2_4/solr/src/webapp/web/admin:748824 +/lucene/java/branches/lucene_2_9/solr/src/webapp/web/admin:817269-818600,825998,829134,829881,831036,896850,909334 +/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/webapp/web/admin:818601-821336 +/lucene/java/branches/lucene_3_0/solr/src/webapp/web/admin:880793,896906 +/lucene/solr/trunk/src/webapp/web/admin:922950-923910,923912-925091 Modified: lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp?rev=964307&r1=964306&r2=964307&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp (original) +++ lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/index.jsp Thu Jul 15 05:45:56 2010 @@ -58,11 +58,16 @@ <%-- List the cores (that arent this one) so we can switch --%> <% org.apache.solr.core.CoreContainer cores = (org.apache.solr.core.CoreContainer)request.getAttribute("org.apache.solr.CoreContainer"); if (cores!=null) { - Collection names = cores.getCores(); + Collection names = cores.getCoreNames(); if (names.size() > 1) {%>Cores:
<% - for (SolrCore name : names) { - if(name.equals(core.getName())) continue; - %>[<%=name%>]<% + String url = request.getContextPath(); + for (String name : names) { + String lname = name.length()==0 ? cores.getDefaultCoreName() : name; // use the real core name rather than the default + if(name.equals(core.getName())) { + %>[<%=lname%>]<% + } else { + %>[<%=lname%>]<% + } }%><% }}%>