You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/03/10 16:05:21 UTC
svn commit: r1454862 [48/49] - in /lucene/dev/branches/lucene4258: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/demo/
dev-tools/idea/lucene/facet/ dev-tools/idea/lucene/highlighter/ dev-to...
Modified: lucene/dev/branches/lucene4258/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/branches/lucene4258/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Sun Mar 10 15:04:57 2013
@@ -20,7 +20,6 @@ package org.apache.solr.util;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.CoreContainer;
@@ -38,22 +37,11 @@ import org.apache.solr.response.QueryRes
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.servlet.DirectSolrConnection;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
import org.apache.solr.common.util.NamedList.NamedListEntry;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
@@ -70,11 +58,9 @@ import java.util.Map;
*
*
*/
-public class TestHarness {
+public class TestHarness extends BaseTestHarness {
String coreName;
protected volatile CoreContainer container;
- private final ThreadLocal<DocumentBuilder> builderTL = new ThreadLocal<DocumentBuilder>();
- private final ThreadLocal<XPath> xpathTL = new ThreadLocal<XPath>();
public UpdateRequestHandler updater;
/**
@@ -138,32 +124,6 @@ public class TestHarness {
}
}
- private DocumentBuilder getXmlDocumentBuilder() {
- try {
- DocumentBuilder builder = builderTL.get();
- if (builder == null) {
- builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- builderTL.set(builder);
- }
- return builder;
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private XPath getXpath() {
- try {
- XPath xpath = xpathTL.get();
- if (xpath == null) {
- xpath = XPathFactory.newInstance().newXPath();
- xpathTL.set(xpath);
- }
- return xpath;
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
// Creates a container based on infos needed to create one core
static class Initializer extends CoreContainer.Initializer {
String coreName;
@@ -191,7 +151,7 @@ public class TestHarness {
hostPort = System.getProperty("hostPort");
hostContext = "solr";
defaultCoreName = CoreContainer.DEFAULT_DEFAULT_CORE_NAME;
- initShardHandler(null);
+ initShardHandler();
initZooKeeper(System.getProperty("zkHost"), 10000);
}
};
@@ -271,55 +231,6 @@ public class TestHarness {
/**
- * Validates that an "update" (add, commit or optimize) results in success.
- *
- * :TODO: currently only deals with one add/doc at a time, this will need changed if/when SOLR-2 is resolved
- *
- * @param xml The XML of the update
- * @return null if successful, otherwise the XML response to the update
- */
- public String validateUpdate(String xml) throws SAXException {
- return checkUpdateStatus(xml, "0");
- }
-
- /**
- * Validates that an "update" (add, commit or optimize) results in success.
- *
- * :TODO: currently only deals with one add/doc at a time, this will need changed if/when SOLR-2 is resolved
- *
- * @param xml The XML of the update
- * @return null if successful, otherwise the XML response to the update
- */
- public String validateErrorUpdate(String xml) throws SAXException {
- try {
- return checkUpdateStatus(xml, "1");
- } catch (SolrException e) {
- // return ((SolrException)e).getMessage();
- return null; // success
- }
- }
-
- /**
- * Validates that an "update" (add, commit or optimize) results in success.
- *
- * :TODO: currently only deals with one add/doc at a time, this will need changed if/when SOLR-2 is resolved
- *
- * @param xml The XML of the update
- * @return null if successful, otherwise the XML response to the update
- */
- public String checkUpdateStatus(String xml, String code) throws SAXException {
- try {
- String res = update(xml);
- String valid = validateXPath(res, "//int[@name='status']="+code );
- return (null == valid) ? null : res;
- } catch (XPathExpressionException e) {
- throw new RuntimeException
- ("?!? static xpath has bug?", e);
- }
- }
-
-
- /**
* Validates a "query" response against an array of XPath test strings
*
* @param req the Query to process
@@ -397,43 +308,6 @@ public class TestHarness {
}
}
-
- /**
- * A helper method which valides a String against an array of XPath test
- * strings.
- *
- * @param xml The xml String to validate
- * @param tests Array of XPath strings to test (in boolean mode) on the xml
- * @return null if all good, otherwise the first test that fails.
- */
- public String validateXPath(String xml, String... tests)
- throws XPathExpressionException, SAXException {
-
- if (tests==null || tests.length == 0) return null;
-
- Document document=null;
- try {
- document = getXmlDocumentBuilder().parse(new ByteArrayInputStream
- (xml.getBytes("UTF-8")));
- } catch (UnsupportedEncodingException e1) {
- throw new RuntimeException("Totally weird UTF-8 exception", e1);
- } catch (IOException e2) {
- throw new RuntimeException("Totally weird io exception", e2);
- }
-
- for (String xp : tests) {
- xp=xp.trim();
- Boolean bool = (Boolean) getXpath().evaluate(xp, document,
- XPathConstants.BOOLEAN);
-
- if (!bool) {
- return xp;
- }
- }
- return null;
-
- }
-
/**
* Shuts down and frees any resources
*/
@@ -451,114 +325,6 @@ public class TestHarness {
}
}
- /**
- * A helper that creates an xml <doc> containing all of the
- * fields and values specified
- *
- * @param fieldsAndValues 0 and Even numbered args are fields names odds are field values.
- */
- public static StringBuffer makeSimpleDoc(String... fieldsAndValues) {
-
- try {
- StringWriter w = new StringWriter();
- w.append("<doc>");
- for (int i = 0; i < fieldsAndValues.length; i+=2) {
- XML.writeXML(w, "field", fieldsAndValues[i+1], "name",
- fieldsAndValues[i]);
- }
- w.append("</doc>");
- return w.getBuffer();
- } catch (IOException e) {
- throw new RuntimeException
- ("this should never happen with a StringWriter", e);
- }
- }
-
- /**
- * Generates a delete by query xml string
- * @param q Query that has not already been xml escaped
- * @param args The attributes of the delete tag
- */
- public static String deleteByQuery(String q, String... args) {
- try {
- StringWriter r = new StringWriter();
- XML.writeXML(r, "query", q);
- return delete(r.getBuffer().toString(), args);
- } catch(IOException e) {
- throw new RuntimeException
- ("this should never happen with a StringWriter", e);
- }
- }
-
- /**
- * Generates a delete by id xml string
- * @param id ID that has not already been xml escaped
- * @param args The attributes of the delete tag
- */
- public static String deleteById(String id, String... args) {
- try {
- StringWriter r = new StringWriter();
- XML.writeXML(r, "id", id);
- return delete(r.getBuffer().toString(), args);
- } catch(IOException e) {
- throw new RuntimeException
- ("this should never happen with a StringWriter", e);
- }
- }
-
- /**
- * Generates a delete xml string
- * @param val text that has not already been xml escaped
- * @param args 0 and Even numbered args are params, Odd numbered args are XML escaped values.
- */
- private static String delete(String val, String... args) {
- try {
- StringWriter r = new StringWriter();
- XML.writeUnescapedXML(r, "delete", val, (Object[])args);
- return r.getBuffer().toString();
- } catch(IOException e) {
- throw new RuntimeException
- ("this should never happen with a StringWriter", e);
- }
- }
-
- /**
- * Helper that returns an <optimize> String with
- * optional key/val pairs.
- *
- * @param args 0 and Even numbered args are params, Odd numbered args are values.
- */
- public static String optimize(String... args) {
- return simpleTag("optimize", args);
- }
-
- private static String simpleTag(String tag, String... args) {
- try {
- StringWriter r = new StringWriter();
-
- // this is annoying
- if (null == args || 0 == args.length) {
- XML.writeXML(r, tag, null);
- } else {
- XML.writeXML(r, tag, null, (Object[])args);
- }
- return r.getBuffer().toString();
- } catch (IOException e) {
- throw new RuntimeException
- ("this should never happen with a StringWriter", e);
- }
- }
-
- /**
- * Helper that returns an <commit> String with
- * optional key/val pairs.
- *
- * @param args 0 and Even numbered args are params, Odd numbered args are values.
- */
- public static String commit(String... args) {
- return simpleTag("commit", args);
- }
-
public LocalRequestFactory getRequestFactory(String qtype,
int start,
int limit) {
Modified: lucene/dev/branches/lucene4258/solr/testlogging.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/testlogging.properties?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/testlogging.properties (original)
+++ lucene/dev/branches/lucene4258/solr/testlogging.properties Sun Mar 10 15:04:57 2013
@@ -7,8 +7,8 @@ java.util.logging.ConsoleHandler.formatt
#.level=SEVERE
.level=INFO
-#org.apache.solr.update.processor.LogUpdateProcessor=FINEST
-#org.apache.solr.update.processor.DistributedUpdateProcessor=FINEST
+#org.apache.solr.update.processor.LogUpdateProcessor.level=FINEST
+#org.apache.solr.update.processor.DistributedUpdateProcessor.level=FINEST
#org.apache.solr.update.PeerSync.level=FINEST
#org.apache.solr.core.CoreContainer.level=FINEST
#org.apache.solr.cloud.RecoveryStrategy.level=FINEST
Modified: lucene/dev/branches/lucene4258/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/build.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/build.xml (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/build.xml Sun Mar 10 15:04:57 2013
@@ -44,7 +44,7 @@
implementation.title="org.apache.solr"
spec.version="${solr.spec.version}"/>
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
- <war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
+ <war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"
manifest="${manifest.file}">
<lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
@@ -54,8 +54,8 @@
<lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
<lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
<lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
- <include name="apache-solr-solrj-${version}.jar" />
- <include name="apache-solr-core-${version}.jar" />
+ <include name="solr-solrj-${version}.jar" />
+ <include name="solr-core-${version}.jar" />
</lib>
<fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions -->
<fileset dir="web" excludes="${exclude.from.war}"/>
@@ -64,7 +64,7 @@
</target>
<target name="dist-maven" depends="dist, filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom">
- <m2-deploy jar.file="${dist}/apache-solr-${version}.war"
+ <m2-deploy jar.file="${dist}/solr-${version}.war"
pom.xml="${filtered.pom.templates.dir}/solr/webapp/pom.xml"/>
</target>
</project>
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/WEB-INF/web.xml?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/WEB-INF/web.xml (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/WEB-INF/web.xml Sun Mar 10 15:04:57 2013
@@ -125,6 +125,15 @@
<param-value>${context}/#/~logging</param-value>
</init-param>
</servlet>
+
+ <servlet>
+ <servlet-name>SchemaRestApi</servlet-name>
+ <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
+ <init-param>
+ <param-name>org.restlet.application</param-name>
+ <param-value>org.apache.solr.rest.SchemaRestApi</param-value>
+ </init-param>
+ </servlet>
<servlet-mapping>
<servlet-name>RedirectOldAdminUI</servlet-name>
@@ -153,6 +162,11 @@
<servlet-name>LoadAdminUI</servlet-name>
<url-pattern>/admin.html</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>SchemaRestApi</servlet-name>
+ <url-pattern>/schema/*</url-pattern>
+ </servlet-mapping>
<mime-mapping>
<extension>.xsl</extension>
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/admin.html?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/admin.html (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/admin.html Sun Mar 10 15:04:57 2013
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<!--
@@ -110,8 +111,12 @@ limitations under the License.
</ul>
- <ul id="menu-selector">
- </ul>
+ <div id="core-selector">
+ <select data-placeholder="Core Selector"></select>
+ </div>
+ <div id="core-menu">
+ <ul></ul>
+ </div>
</div>
</div>
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/analysis.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/analysis.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/analysis.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/analysis.css Sun Mar 10 15:04:57 2013
@@ -82,10 +82,9 @@
float: right;
}
-#content #analysis .settings button.loader
+#content #analysis .settings button span
{
- background-position: 2px 50%;
- padding-left: 21px;
+ background-image: url( ../../img/ico/funnel.png );
}
#content #analysis .settings .verbose_output
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/cloud.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/cloud.css Sun Mar 10 15:04:57 2013
@@ -18,7 +18,7 @@
{
background-color: #f00;
background-image: url( ../../img/ico/construction.png );
- background-position: 10px 50%;
+ background-position: 10px 12px;
color: #fff;
font-weight: bold;
margin-bottom: 20px;
@@ -26,6 +26,13 @@
padding-left: 35px;
}
+#content #cloud #error .msg
+{
+ font-style: italic;
+ font-weight: normal;
+ margin-top: 10px;
+}
+
#content #cloud #debug
{
background-color: #fff;
@@ -224,11 +231,39 @@
color: #00f;
}
+#content #cloud #legend
+{
+ border: 1px solid #f0f0f0;
+ padding: 10px;
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
+
+#content #cloud #legend li
+{
+ padding-left: 15px;
+ position: relative;
+}
+
+#content #cloud #legend li svg
+{
+ position: absolute;
+ left: 0;
+ top: 2px;
+}
+
+#content #graph-content
+{
+ min-height: 400px;
+}
+
#content #graph-content .node
{
fill: #333;
}
+#content #cloud #legend circle,
#content #graph-content .node circle
{
fill: #fff;
@@ -258,6 +293,7 @@
stroke-width: 1.5px;
}
+#content #cloud #legend .gone circle,
#content #graph-content .node.gone circle,
#content #graph-content .link.gone
{
@@ -269,8 +305,16 @@
fill: #f0f0f0;
}
+#content #cloud #legend ul .gone
+{
+ color: #e0e0e0;
+}
+
+#content #cloud #legend .recovery_failed,
+#content #cloud #legend .recovery_failed circle,
#content #graph-content .node.recovery_failed circle
{
+ color: #C43C35;
stroke: #C43C35;
}
@@ -279,8 +323,11 @@
fill: #C43C35;
}
+#content #cloud #legend .down,
+#content #cloud #legend .down circle,
#content #graph-content .node.down circle
{
+ color: #c48f00;
stroke: #c48f00;
}
@@ -289,8 +336,11 @@
fill: #c48f00;
}
+#content #cloud #legend .recovering,
+#content #cloud #legend .recovering circle,
#content #graph-content .node.recovering circle
{
+ color: #d5dd00;
stroke: #d5dd00;
}
@@ -299,8 +349,11 @@
fill: #d5dd00;
}
+#content #cloud #legend .active,
+#content #cloud #legend .active circle,
#content #graph-content .node.active circle
{
+ color: #57A957;
stroke: #57A957;
}
@@ -309,11 +362,17 @@
fill: #57A957;
}
+#content #cloud #legend .leader circle,
#content #graph-content .node.leader circle
{
fill: #000;
}
+#content #cloud #legend .leader circle
+{
+ stroke: #fff;
+}
+
#content #graph-content .link.lvl-2,
#content #graph-content .link.leader
{
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/common.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/common.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/common.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/common.css Sun Mar 10 15:04:57 2013
@@ -172,7 +172,7 @@ ul
#header
{
padding-bottom: 10px;
- position: absolute;
+ position: fixed;
z-index: 42;
}
@@ -340,12 +340,6 @@ ul
width: 100%;
}
-#content > pre
-{
- max-height: 600px;
- overflow: auto;
-}
-
#content .block
{
margin-bottom: 10px;
@@ -417,6 +411,16 @@ pre.syntax .hexcolor
color: #40a070;
}
+pre.syntax.language-json .number
+{
+ color: blue;
+}
+
+pre.syntax.language-json .literal
+{
+ color: firebrick;
+}
+
pre.syntax .string,
pre.syntax .tag .value,
pre.syntax .phpdoc,
@@ -425,6 +429,11 @@ pre.syntax .tex .formula
color: #d14;
}
+pre.syntax.language-json .string
+{
+ color: green;
+}
+
pre.syntax .title,
pre.syntax .id
{
@@ -464,6 +473,12 @@ pre.syntax .lisp .body
color: #008080;
}
+pre.syntax.language-json .attribute
+{
+ color: black;
+ font-weight: bold;
+}
+
pre.syntax .regexp
{
color: #009926;
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dashboard.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dashboard.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dashboard.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dashboard.css Sun Mar 10 15:04:57 2013
@@ -108,8 +108,8 @@
#content #dashboard #system h2 { background-image: url( ../../img/ico/server.png ); }
#content #dashboard #statistics h2 { background-image: url( ../../img/ico/chart.png ); }
#content #dashboard #replication h2 { background-image: url( ../../img/ico/node.png ); }
-#content #dashboard #replication.is-master h2 { background-image: url( ../../img/ico/node-master.png ); }
-#content #dashboard #replication.is-slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
+#content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); }
+#content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
#content #dashboard #dataimport h2 { background-image: url( ../../img/ico/document-import.png ); }
#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dataimport.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dataimport.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dataimport.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/dataimport.css Sun Mar 10 15:04:57 2013
@@ -29,7 +29,7 @@
#content #dataimport #form #navigation .current a
{
- background-image: url( ../../img/ico/document-import.png );
+ background-image: url( ../../img/ico/status.png );
}
#content #dataimport #form form
@@ -60,27 +60,41 @@
width: 100%;
}
+#content #dataimport #form input
+{
+ width: 98%;
+}
+
#content #dataimport #form button
{
margin-top: 10px;
}
-#content #dataimport #form button.loader
+#content #dataimport #form .execute span
{
- background-position: 2px 50%;
- padding-left: 23px;
+ background-image: url( ../../img/ico/document-import.png );
+}
+
+#content #dataimport #form .refresh-status span
+{
+ background-image: url( ../../img/ico/arrow-circle.png );
+}
+
+#content #dataimport #form .refresh-status span.success
+{
+ background-image: url( ../../img/ico/tick.png );
}
#content #dataimport #form #start
{
float: left;
- margin-right: 2%;
- width: 49%;
+ width: 47%;
}
#content #dataimport #form #rows
{
- width: 49%;
+ float: right;
+ width: 47%;
}
#content #dataimport #form .checkbox input
@@ -89,9 +103,33 @@
width: auto;
}
+#content #dataimport #form #auto-refresh-status
+{
+ margin-top: 20px;
+}
+
+#content #dataimport #form #auto-refresh-status a
+{
+ background-image: url( ../../img/ico/ui-check-box-uncheck.png );
+ background-position: 0 50%;
+ color: #c0c0c0;
+ display: block;
+ padding-left: 21px;
+}
+
+#content #dataimport #form #auto-refresh-status a.on,
+#content #dataimport #form #auto-refresh-status a:hover
+{
+ color: #333;
+}
+
+#content #dataimport #form #auto-refresh-status a.on
+{
+ background-image: url( ../../img/ico/ui-check-box.png );
+}
+
#content #dataimport #current_state
{
- display: none;
padding: 10px;
margin-bottom: 20px;
}
@@ -101,14 +139,14 @@
display: none !important;
}
-#content #dataimport #current_state .time,
+#content #dataimport #current_state .last_update,
#content #dataimport #current_state .info
{
display: block;
padding-left: 21px;
}
-#content #dataimport #current_state .time
+#content #dataimport #current_state .last_update
{
color: #c0c0c0;
font-size: 11px;
@@ -117,6 +155,30 @@
#content #dataimport #current_state .info
{
background-position: 0 1px;
+ position: relative;
+}
+
+#content #dataimport #current_state .info .details span
+{
+ color: #c0c0c0;
+}
+
+#content #dataimport #current_state .info .abort-import
+{
+ display: none;
+ position: absolute;
+ right: 0px;
+ top: 0px;
+}
+
+#content #dataimport #current_state .info .abort-import span
+{
+ background-image: url( ../../img/ico/cross.png );
+}
+
+#content #dataimport #current_state .info .abort-import.success span
+{
+ background-image: url( ../../img/ico/tick.png );
}
#content #dataimport #current_state.indexing
@@ -124,6 +186,16 @@
background-color: #f9f9f9;
}
+#content #dataimport #current_state.indexing .info
+{
+ background-image: url( ../../img/ico/hourglass.png );
+}
+
+#content #dataimport #current_state.indexing .info .abort-import
+{
+ display: block;
+}
+
#content #dataimport #current_state.success
{
background-color: #e6f3e6;
@@ -139,6 +211,21 @@
color: #080;
}
+#content #dataimport #current_state.aborted
+{
+ background-color: #f3e6e6;
+}
+
+#content #dataimport #current_state.aborted .info
+{
+ background-image: url( ../../img/ico/slash.png );
+}
+
+#content #dataimport #current_state.aborted .info strong
+{
+ color: #800;
+}
+
#content #dataimport #current_state.failure
{
background-color: #f3e6e6;
@@ -146,7 +233,7 @@
#content #dataimport #current_state.failure .info
{
- background-image: url( ../../img/ico/slash.png );
+ background-image: url( ../../img/ico/cross-button.png );
}
#content #dataimport #current_state.failure .info strong
@@ -154,7 +241,17 @@
color: #800;
}
-#content #dataimport #config-error
+#content #dataimport #current_state.idle
+{
+ background-color: #e6e6ff;
+}
+
+#content #dataimport #current_state.idle .info
+{
+ background-image: url( ../../img/ico/information.png );
+}
+
+#content #dataimport #error
{
background-color: #f00;
background-image: url( ../../img/ico/construction.png );
@@ -167,37 +264,43 @@
padding-left: 35px;
}
-#content #dataimport #config h2
+#content #dataimport .block h2
{
border-color: #c0c0c0;
padding-left: 5px;
position: relative;
}
-#content #dataimport #config.hidden h2
+#content #dataimport .block.hidden h2
{
border-color: #fafafa;
}
-#content #dataimport #config h2 a.toggle
+#content #dataimport .block h2 a.toggle
{
background-image: url( ../../img/ico/toggle-small.png );
background-position: 0 50%;
padding-left: 21px;
}
-#content #dataimport #config.hidden h2 a.toggle
+#content #dataimport .block.hidden h2 a.toggle
{
background-image: url( ../../img/ico/toggle-small-expand.png );
}
+#content #dataimport #config h2 a.r
+{
+ background-position: 3px 50%;
+ display: block;
+ float: right;
+ margin-left: 10px;
+ padding-left: 24px;
+ padding-right: 3px;
+}
+
#content #dataimport #config h2 a.reload_config
{
background-image: url( ../../img/ico/arrow-circle.png );
- padding-left: 21px;
- position: absolute;
- right: 5px;
- top: 5px;
}
#content #dataimport #config h2 a.reload_config.success
@@ -210,13 +313,72 @@
background-image: url( ../../img/ico/slash.png );
}
-#content #dataimport #config.hidden .content
+#content #dataimport #config h2 a.debug_mode
+{
+ background-image: url( ../../img/ico/hammer.png );
+ color: #c0c0c0;
+}
+
+#content #dataimport #config.debug_mode h2 a.debug_mode
+{
+ background-color: #ff0;
+ background-image: url( ../../img/ico/hammer-screwdriver.png );
+ color: #333;
+}
+
+#content #dataimport .block.hidden .content
{
display: none;
}
+#content #dataimport #config .content
+{
+ padding: 5px 2px;
+}
+
#content #dataimport #dataimport_config .loader
{
background-position: 0 50%;
padding-left: 21px;
+}
+
+#content #dataimport #dataimport_config .formatted
+{
+ border: 1px solid #fff;
+ display: block;
+ padding: 2px;
+}
+
+#content #dataimport .debug_mode #dataimport_config .formatted
+{
+ display: none;
+}
+
+#content #dataimport #dataimport_config .editable
+{
+ display: none;
+}
+
+#content #dataimport .debug_mode #dataimport_config .editable
+{
+ display: block;
+}
+
+#content #dataimport #dataimport_config .editable textarea
+{
+ font-family: monospace;
+ height: 120px;
+ min-height: 60px;
+ width: 100%;
+}
+
+#content #dataimport #debug_response
+{
+ display: none;
+}
+
+#content #dataimport #debug_response em
+{
+ color: #c0c0c0;
+ font-style: normal;
}
\ No newline at end of file
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/index.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/index.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/index.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/index.css Sun Mar 10 15:04:57 2013
@@ -98,11 +98,6 @@
padding-bottom: 3px;
}
-#content #index .data li.odd
-{
- color: #c0c0c0;
-}
-
#content #index .data li dt
{
float: left;
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/menu.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/menu.css Sun Mar 10 15:04:57 2013
@@ -1,19 +1,38 @@
#menu-wrapper
{
- position: absolute;
- top: 90px;
+ position: fixed;
+ top: 120px;
width: 150px;
}
.has-environment #menu-wrapper
{
- top: 130px;
+ top: 160px;
}
#menu-wrapper a
{
display: block;
padding: 4px 2px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+#core-selector
+{
+ margin-top: 20px;
+ padding-right: 10px;
+}
+
+#core-selector a
+{
+ padding: 0;
+ padding-left: 8px;
+}
+
+#core-selector select
+{
+ width: 100%;
}
#menu-wrapper .active p
@@ -119,32 +138,27 @@
display: none;
}
-#menu-selector
-{
- margin-top: 20px;
-}
-
-#menu-selector p
+#core-menu p
{
border-top: 1px solid #f0f0f0;
}
-#menu-selector li:first-child p
+#core-menu li:first-child p
{
border-top: 0;
}
-#menu-selector p a
+#core-menu p a
{
background-image: url( ../../img/ico/status-offline.png );
}
-#menu-selector .active p a
+#core-menu .active p a
{
background-image: url( ../../img/ico/box.png );
}
-#menu-selector ul,
+#core-menu ul,
#menu ul
{
display: none;
@@ -152,7 +166,7 @@
padding-bottom: 10px;
}
-#menu-selector .active ul,
+#core-menu .active ul,
#menu .active ul
{
display: block;
@@ -163,7 +177,7 @@
border-bottom: 0;
}
-#menu-selector ul li a,
+#core-menu ul li a,
#menu ul li a
{
background-position: 7px 50%;
@@ -173,20 +187,20 @@
padding-left: 26px;
}
-#menu-selector ul li:last-child a,
+#core-menu ul li:last-child a,
#menu ul li:last-child a
{
border-bottom: 0;
}
-#menu-selector ul li a:hover,
+#core-menu ul li a:hover,
#menu ul li a:hover
{
background-color: #f0f0f0;
color: #333;
}
-#menu-selector ul li.active a,
+#core-menu ul li.active a,
#menu ul li.active a
{
background-color: #d0d0d0;
@@ -211,7 +225,7 @@
#menu #cloud.global .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
#menu #cloud.global .dump a { background-image: url( ../../img/ico/download-cloud.png ); }
-#menu-selector .ping.error a
+#core-menu .ping.error a
{
background-color: #ffcccc;
@@ -220,17 +234,18 @@
cursor: help;
}
-#menu-selector .query a { background-image: url( ../../img/ico/magnifier.png ); }
-#menu-selector .schema a { background-image: url( ../../img/ico/table.png ); }
-#menu-selector .config a { background-image: url( ../../img/ico/gear.png ); }
-#menu-selector .analysis a { background-image: url( ../../img/ico/funnel.png ); }
-#menu-selector .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
-#menu-selector .replication a { background-image: url( ../../img/ico/node.png ); }
-#menu-selector .distribution a { background-image: url( ../../img/ico/node-select.png ); }
-#menu-selector .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
-#menu-selector .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
-#menu-selector .plugins a { background-image: url( ../../img/ico/block.png ); }
-#menu-selector .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
+#core-menu .overview a { background-image: url( ../../img/ico/home.png ); }
+#core-menu .query a { background-image: url( ../../img/ico/magnifier.png ); }
+#core-menu .schema a { background-image: url( ../../img/ico/table.png ); }
+#core-menu .config a { background-image: url( ../../img/ico/gear.png ); }
+#core-menu .analysis a { background-image: url( ../../img/ico/funnel.png ); }
+#core-menu .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
+#core-menu .replication a { background-image: url( ../../img/ico/node.png ); }
+#core-menu .distribution a { background-image: url( ../../img/ico/node-select.png ); }
+#core-menu .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
+#core-menu .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
+#core-menu .plugins a { background-image: url( ../../img/ico/block.png ); }
+#core-menu .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
#content #navigation
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/query.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/query.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/query.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/query.css Sun Mar 10 15:04:57 2013
@@ -26,16 +26,22 @@
width: 100%;
}
+#content #query #form input,
+#content #query #form textarea
+{
+ width: 98%;
+}
+
#content #query #form #start
{
float: left;
- margin-right: 2%;
- width: 49%;
+ width: 45%;
}
#content #query #form #rows
{
- width: 49%;
+ float: right;
+ width: 45%;
}
#content #query #form .checkbox input
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/schema-browser.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/schema-browser.css?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/schema-browser.css (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/css/styles/schema-browser.css Sun Mar 10 15:04:57 2013
@@ -45,6 +45,11 @@
padding-bottom: 15px;
}
+#content #schema-browser #related .ukf-dsf dt
+{
+ display: none;
+}
+
#content #schema-browser #related dl
{
margin-top: 15px;
@@ -140,11 +145,60 @@
width: 100px;
}
-#content #schema-browser #data #field .field-options .options dd
+#content #schema-browser #data #field .field-options .flags
{
- margin-right: 5px;
+ margin-top: 10px;
+ margin-bottom: 20px;
+}
+
+#content #schema-browser #data #field .field-options .flags thead td
+{
+ color: #c0c0c0;
+ padding-right: 5px;
+ width: 100px;
+}
+
+#content #schema-browser #data #field .field-options .flags tbody td,
+#content #schema-browser #data #field .field-options .flags th
+{
+ padding: 2px 5px;
+}
+
+#content #schema-browser #data #field .field-options .flags thead td,
+#content #schema-browser #data #field .field-options .flags tbody th
+{
+ padding-left: 0;
+}
+
+#content #schema-browser #data #field .field-options .flags thead th,
+#content #schema-browser #data #field .field-options .flags tbody td
+{
+ border-left: 1px solid #f0f0f0;
+}
+
+#content #schema-browser #data #field .field-options .flags tbody th,
+#content #schema-browser #data #field .field-options .flags tbody td
+{
+ border-top: 1px solid #f0f0f0;
+}
+
+#content #schema-browser #data #field .field-options .flags tbody .check
+{
+ background-color: #fafdfa;
+ background-image: url( ../../img/ico/tick.png );
+ background-position: 50% 50%;
+ text-align: center;
}
+#content #schema-browser #data #field .field-options .flags tbody .check span
+{
+ display: none;
+}
+
+#content #schema-browser #data #field .field-options .flags tbody .text
+{
+ color: #c0c0c0;
+}
#content #schema-browser #data #field .field-options .analyzer,
#content #schema-browser #data #field .field-options .analyzer li,
@@ -336,7 +390,8 @@
color: #333;
}
-#content #schema-browser #data #field .topterms-holder
+#content #schema-browser #data #field .topterms-holder,
+#content #schema-browser #data #field .histogram-holder
{
border-left: 1px solid #f0f0f0;
display: none;
@@ -394,12 +449,12 @@
margin-bottom: 5px;
}
+/* possible overwrite with inline style */
#content #schema-browser .topterms-holder li p
{
background-color: #999;
color: #fff;
float: left;
- width: 25px;
}
#content #schema-browser .topterms-holder li p span
@@ -409,6 +464,7 @@
text-align: right;
}
+/* possible overwrite with inline style */
#content #schema-browser .topterms-holder li ul
{
margin-left: 30px;
@@ -438,51 +494,66 @@
background-color: #c0c0c0;
}
-#content #schema-browser #data #field .histogram-holder
+#content #schema-browser #data #field .histogram-holder ul
{
- border-left: 1px solid #f0f0f0;
- display: none;
- float: left;
- padding-left: 20px;
- padding-right: 20px;
+ margin-left: 25px;
}
-#content #schema-browser #data #field .histogram-holder .histogram
+#content #schema-browser #data #field .histogram-holder li
{
- height: 150px;
+ margin-bottom: 2px;
+ position: relative;
+ width: 150px;
}
-#content #schema-browser #data #field .histogram-holder .histogram.single canvas
+#content #schema-browser #data #field .histogram-holder li.odd
+{
+ background-color: #f0f0f0;
+}
+
+#content #schema-browser #data #field .histogram-holder li dl,
+#content #schema-browser #data #field .histogram-holder li dt
+{
+ padding-top: 1px;
+ padding-bottom: 1px;
+}
+
+#content #schema-browser #data #field .histogram-holder li dl
{
background-color: #c0c0c0;
+ min-width: 1px;
}
-#content #schema-browser #data #field .histogram-holder dt,
-#content #schema-browser #data #field .histogram-holder dd
+#content #schema-browser #data #field .histogram-holder li dt
{
- float: left;
- font-size: 10px;
- text-align: center;
+ color: #a0a0a0;
+ position: absolute;
+ overflow: hidden;
+ left: -25px;
+ top: 0px;
}
-#content #schema-browser #data #field .histogram-holder span
+#content #schema-browser #data #field .histogram-holder li dt span
{
- background-color: #f0f0f0;
display: block;
- width: 20px;
+ padding-right: 4px;
+ text-align: right;
}
-#content #schema-browser #data #field .histogram-holder dt
+#content #schema-browser #data #field .histogram-holder li dd
{
- padding-right: 1px;
+ clear: left;
+ float: left;
+ margin-left: 2px;
+ white-space: nowrap;
}
-#content #schema-browser #data #field .histogram-holder dd
+#content #schema-browser #data #field .histogram-holder li:hover dl
{
- padding-right: 3px;
+ background-color: #b0b0b0;
}
-#content #schema-browser #data #field .histogram-holder dd span
+#content #schema-browser #data #field .histogram-holder li:hover dt
{
- width: 25px;
-}
+ color: #333;
+}
\ No newline at end of file
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/console.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/console.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/console.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/console.js Sun Mar 10 15:04:57 2013
@@ -15,13 +15,15 @@
limitations under the License.
*/
-if( 'undefined' === typeof( console ) )
+window.console = window.console || {};
+
+var names = ["log", "debug", "info", "warn", "error",
+ "assert", "dir", "dirxml", "group", "groupEnd", "time",
+ "timeEnd", "count", "trace", "profile", "profileEnd"];
+
+var i = 0;
+var l = names.length;
+for( i = 0; i < l; i++ )
{
- var console = {
- log : function() {},
- debug : function() {},
- dump : function() {},
- error : function() {},
- warn : function(){}
- };
-}
\ No newline at end of file
+ window.console[names[i]] = window.console[names[i]] || function() {};
+}
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/highlight.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/highlight.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/highlight.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/lib/highlight.js Sun Mar 10 15:04:57 2013
@@ -1 +1 @@
-var hljs=new function(){var p={};var a={};function n(c){return c.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function k(s,r){if(!s){return false}for(var c=0;c<s.length;c++){if(s[c]==r){return true}}return false}function e(s,r,c){var t="m"+(s.cI?"i":"")+(c?"g":"");return new RegExp(r,t)}function j(r){for(var c=0;c<r.childNodes.length;c++){node=r.childNodes[c];if(node.nodeName=="CODE"){return node}if(!(node.nodeType==3&&node.nodeValue.match(/\s+/))){return null}}}function h(u,t){var s="";for(var r=0;r<u.childNodes.length;r++){if(u.childNodes[r].nodeType==3){var c=u.childNodes[r].nodeValue;if(t){c=c.replace(/\n/g,"")}s+=c}else{if(u.childNodes[r].nodeName=="BR"){s+="\n"}else{s+=h(u.childNodes[r])}}}s=s.replace(/\r/g,"\n");return s}function b(t){var r=t.className.split(/\s+/);r=r.concat(t.parentNode.className.split(/\s+/));for(var c=0;c<r.length;c++){var s=r[c].replace(/^language-/,"");if(p[s]||s=="no-highlight"){return s}}}function d(c){var r=[];(function(
t,u){for(var s=0;s<t.childNodes.length;s++){if(t.childNodes[s].nodeType==3){u+=t.childNodes[s].nodeValue.length}else{if(t.childNodes[s].nodeName=="BR"){u+=1}else{r.push({event:"start",offset:u,node:t.childNodes[s]});u=arguments.callee(t.childNodes[s],u);r.push({event:"stop",offset:u,node:t.childNodes[s]})}}}return u})(c,0);return r}function m(z,A,y){var s=0;var x="";var u=[];function v(){if(z.length&&A.length){if(z[0].offset!=A[0].offset){return(z[0].offset<A[0].offset)?z:A}else{return(z[0].event=="start"&&A[0].event=="stop")?A:z}}else{return z.length?z:A}}function t(E){var F="<"+E.nodeName.toLowerCase();for(var C=0;C<E.attributes.length;C++){var D=E.attributes[C];F+=" "+D.nodeName.toLowerCase();if(D.nodeValue!=undefined){F+='="'+n(D.nodeValue)+'"'}}return F+">"}function B(C){return"</"+C.nodeName.toLowerCase()+">"}while(z.length||A.length){var w=v().splice(0,1)[0];x+=n(y.substr(s,w.offset-s));s=w.offset;if(w.event=="start"){x+=t(w.node);u.push(w.node)}else{if(w.event=="stop
"){var r=u.length;do{r--;var c=u[r];x+=B(c)}while(c!=w.node);u.splice(r,1);while(r<u.length){x+=t(u[r]);r++}}}}x+=y.substr(s);return x}function g(K,E){function A(r,N){for(var M=0;M<N.sm.length;M++){if(N.sm[M].bR.test(r)){return N.sm[M]}}return null}function x(M,r){if(D[M].e&&D[M].eR.test(r)){return 1}if(D[M].eW){var N=x(M-1,r);return N?N+1:0}return 0}function y(r,M){return M.iR&&M.iR.test(r)}function B(P,O){var N=[];for(var M=0;M<P.sm.length;M++){N.push(P.sm[M].b)}var r=D.length-1;do{if(D[r].e){N.push(D[r].e)}r--}while(D[r+1].eW);if(P.i){N.push(P.i)}return e(O,"("+N.join("|")+")",true)}function t(N,M){var O=D[D.length-1];if(!O.t){O.t=B(O,I)}O.t.lastIndex=M;var r=O.t.exec(N);if(r){return[N.substr(M,r.index-M),r[0],false]}else{return[N.substr(M),"",true]}}function c(P,r){var M=I.cI?r[0].toLowerCase():r[0];for(var O in P.keywordGroups){if(!P.keywordGroups.hasOwnProperty(O)){continue}var N=P.keywordGroups[O].hasOwnProperty(M);if(N){return[O,N]}}return false}function G(N,Q){if(!Q
.k||!Q.l){return n(N)}if(!Q.lR){var P="("+Q.l.join("|")+")";Q.lR=e(I,P,true)}var O="";var R=0;Q.lR.lastIndex=0;var M=Q.lR.exec(N);while(M){O+=n(N.substr(R,M.index-R));var r=c(Q,M);if(r){u+=r[1];O+='<span class="'+r[0]+'">'+n(M[0])+"</span>"}else{O+=n(M[0])}R=Q.lR.lastIndex;M=Q.lR.exec(N)}O+=n(N.substr(R,N.length-R));return O}function L(r,N){if(N.subLanguage&&a[N.subLanguage]){var M=g(N.subLanguage,r);u+=M.keyword_count;C+=M.r;return M.value}else{return G(r,N)}}function J(N,r){var M=N.nM?"":'<span class="'+N.displayClassName+'">';if(N.rB){s+=M;N.buffer=""}else{if(N.eB){s+=n(r)+M;N.buffer=""}else{s+=M;N.buffer=r}}D[D.length]=N}function F(M,O,R){var P=D[D.length-1];if(R){s+=L(P.buffer+M,P);return false}var S=A(O,P);if(S){s+=L(P.buffer+M,P);J(S,O);C+=S.r;return S.rB}var r=x(D.length-1,O);if(r){var T=P.nM?"":"</span>";if(P.rE){s+=L(P.buffer+M,P)+T}else{if(P.eE){s+=L(P.buffer+M,P)+T+n(O)}else{s+=L(P.buffer+M+O,P)+T}}while(r>1){T=D[D.length-2].nM?"":"</span>";s+=T;r--;D.length--}va
r Q=D[D.length-1];D.length--;D[D.length-1].buffer="";if(Q.starts){for(var N=0;N<I.m.length;N++){if(I.m[N].cN==Q.starts){J(I.m[N],"");break}}}return P.rE}if(y(O,P)){throw"Illegal"}}var I=p[K];var D=[I.dM];var C=0;var u=0;var s="";try{var w=0;I.dM.buffer="";do{var z=t(E,w);var v=F(z[0],z[1],z[2]);w+=z[0].length;if(!v){w+=z[1].length}}while(!z[2]);if(D.length>1){throw"Illegal"}return{language:K,r:C,keyword_count:u,value:s}}catch(H){if(H=="Illegal"){return{language:null,r:0,keyword_count:0,value:n(E)}}else{throw H}}}function i(){function r(y,x){if(y.compiled){return}if(y.b){y.bR=e(x,"^"+y.b)}if(y.e){y.eR=e(x,"^"+y.e)}if(y.i){y.iR=e(x,"^(?:"+y.i+")")}if(y.r==undefined){y.r=1}if(!y.displayClassName){y.displayClassName=y.cN}if(!y.cN){y.nM=true}for(var w in y.k){if(!y.k.hasOwnProperty(w)){continue}if(y.k[w] instanceof Object){y.keywordGroups=y.k}else{y.keywordGroups={keyword:y.k}}break}y.sm=[];if(y.c){for(var v=0;v<y.c.length;v++){if(y.c[v] instanceof Object){y.sm.push(y.c[v])}else{
for(var u=0;u<x.m.length;u++){if(x.m[u].cN==y.c[v]){y.sm.push(x.m[u])}}}}}y.compiled=true;for(var v=0;v<y.sm.length;v++){r(y.sm[v],x)}}for(var t in p){if(!p.hasOwnProperty(t)){continue}var c=[p[t].dM].concat(p[t].m);for(var s=0;s<c.length;s++){r(c[s],p[t])}}}function f(){if(f.called){return}f.called=true;i();a=p}function q(v,A,r){f();var C=h(v,r);var t=b(v);if(t=="no-highlight"){return}if(t){var y=g(t,C)}else{var y={language:"",keyword_count:0,r:0,value:n(C)};var z=y;for(var B in a){if(!a.hasOwnProperty(B)){continue}var w=g(B,C);if(w.keyword_count+w.r>z.keyword_count+z.r){z=w}if(w.keyword_count+w.r>y.keyword_count+y.r){z=y;y=w}}}var u=v.className;if(!u.match(y.language)){u=u?(u+" "+y.language):y.language}var c=d(v);if(c.length){var s=document.createElement("pre");s.innerHTML=y.value;y.value=m(c,d(s),C)}if(A){y.value=y.value.replace(/^((<[^>]+>|\t)+)/gm,function(D,G,F,E){return G.replace(/\t/g,A)})}if(r){y.value=y.value.replace(/\n/g,"<br>")}if(/MSIE [678]/.test(navigator.use
rAgent)&&v.tagName=="CODE"&&v.parentNode.tagName=="PRE"){var s=v.parentNode;var x=document.createElement("div");x.innerHTML="<pre><code>"+y.value+"</code></pre>";v=x.firstChild.firstChild;x.firstChild.cN=s.cN;s.parentNode.replaceChild(x.firstChild,s)}else{v.innerHTML=y.value}v.className=u;v.dataset={};v.dataset.result={language:y.language,kw:y.keyword_count,re:y.r};if(z&&z.language){v.dataset.second_best={language:z.language,kw:z.keyword_count,re:z.r}}}function l(){if(l.called){return}l.called=true;f();if(arguments.length){for(var c=0;c<arguments.length;c++){if(p[arguments[c]]){a[arguments[c]]=p[arguments[c]]}}}var s=document.getElementsByTagName("pre");for(var c=0;c<s.length;c++){var r=j(s[c]);if(r){q(r,hljs.tabReplace)}}}function o(){var c=arguments;var r=function(){l.apply(null,c)};if(window.addEventListener){window.addEventListener("DOMContentLoaded",r,false);window.addEventListener("load",r,false)}else{if(window.attachEvent){window.attachEvent("onload",r)}else{window.on
load=r}}}this.LANGUAGES=p;this.initHighlightingOnLoad=o;this.highlightBlock=q;this.initHighlighting=l;this.IMR="\\b|\\B";this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="\\b(0x[A-Za-z0-9]+|\\d+(\\.\\d+)?)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:["escape"],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:["escape"],r:0};this.BE={cN:"escape",b:"\\\\.",e:this.IMR,nM:true,r:0};this.CLCM={cN:"comment",b:"//",e:"$",r:0};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NUMBER_MODE={cN:"number",b:this.NR,e:this.IMR,r:0};this.CNM={cN:"number",b:this.CNR,e:this.IMR,r:0};this.inherit=function(c,t){var s={};for(var r in c){s[r]=c[r]}if(t){for(var r in t){s[r]=t[r]}}return s}}();var initHighlightingOnLoad=hljs.initHighlightingOnLoad;(funct
ion(){var d="[A-Za-z0-9\\._:-]+";var k={cN:"pi",b:"<\\?",e:"\\?>",r:10};var i={cN:"doctype",b:"<!DOCTYPE",e:">",r:10};var j={cN:"comment",b:"<!--",e:"-->"};var g={cN:"tag",b:"</?",e:"/?>",c:["title","tag_internal"]};var e={cN:"title",b:d,e:hljs.IMR};var b={cN:"tag_internal",b:hljs.IMR,eW:true,nM:true,c:["attribute","value_container"],r:0};var f={cN:"attribute",b:d,e:hljs.IMR,r:0};var a={cN:"value_container",b:'="',rB:true,e:'"',nM:true,c:[{cN:"value",b:'"',eW:true}]};var c={cN:"value_container",b:"='",rB:true,e:"'",nM:true,c:[{cN:"value",b:"'",eW:true}]};hljs.LANGUAGES.xml={dM:{c:["pi","doctype","comment","cdata","tag"]},cI:true,m:[{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},k,i,j,g,hljs.inherit(e,{r:1.75}),b,f,a,c]};var h={code:1,kbd:1,font:1,noscript:1,style:1,img:1,title:1,menu:1,tt:1,tr:1,param:1,li:1,tfoot:1,th:1,input:1,td:1,dl:1,blockquote:1,fieldset:1,big:1,dd:1,abbr:1,optgroup:1,dt:1,button:1,isindex:1,p:1,small:1,div:1,dir:1,em:1,frame:1,meta:1,sub:1,bdo:1,la
bel:1,acronym:1,sup:1,body:1,basefont:1,base:1,br:1,address:1,strong:1,legend:1,ol:1,script:1,caption:1,s:1,col:1,h2:1,h3:1,h1:1,h6:1,h4:1,h5:1,table:1,select:1,noframes:1,span:1,area:1,dfn:1,strike:1,cite:1,thead:1,head:1,option:1,form:1,hr:1,"var":1,link:1,b:1,colgroup:1,ul:1,applet:1,del:1,iframe:1,pre:1,frameset:1,ins:1,tbody:1,html:1,samp:1,map:1,object:1,a:1,xmlns:1,center:1,textarea:1,i:1,q:1,u:1,section:1,nav:1,article:1,aside:1,hgroup:1,header:1,footer:1,figure:1,figurecaption:1,time:1,mark:1,wbr:1,embed:1,video:1,audio:1,source:1,canvas:1,datalist:1,keygen:1,output:1,progress:1,meter:1,details:1,summary:1,command:1};hljs.LANGUAGES.html={dM:{c:["comment","pi","doctype","vbscript","tag"]},cI:true,m:[{cN:"tag",b:"<style",e:">",l:[hljs.IR],k:{style:1},c:["tag_internal"],starts:"css"},{cN:"tag",b:"<script",e:">",l:[hljs.IR],k:{script:1},c:["tag_internal"],starts:"javascript"},{cN:"css",e:"</style>",rE:true,subLanguage:"css"},{cN:"javascript",e:"<\/script>",rE:true,subLa
nguage:"javascript"},{cN:"vbscript",b:"<%",e:"%>",subLanguage:"vbscript"},j,k,i,hljs.inherit(g),hljs.inherit(e,{l:[hljs.IR],k:h}),hljs.inherit(b),f,a,c,{cN:"value_container",b:"=",e:hljs.IMR,c:[{cN:"unquoted_value",displayClassName:"value",b:"[^\\s/>]+",e:hljs.IMR}]}]}})();
\ No newline at end of file
+var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";
var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{fo
r(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.ex
ec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u
=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={la
nguage:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string
",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.ruby=function(e){var a="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var g={keyword:"and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include"};var c={cN:"yardoctag",b:"@[A-Za-z]+"};var k=[{cN:"comment",b:"#",e:"$",c:[c]},{cN:"comment",b:"^\\=begin",e:"^\\=end",c:[c],r:10},{cN:"comment",b:"^__END__",
e:"\\n$"}];var d={cN:"subst",b:"#\\{",e:"}",l:a,k:g};var i=[e.BE,d];var b=[{cN:"string",b:"'",e:"'",c:i,r:0},{cN:"string",b:'"',e:'"',c:i,r:0},{cN:"string",b:"%[qw]?\\(",e:"\\)",c:i},{cN:"string",b:"%[qw]?\\[",e:"\\]",c:i},{cN:"string",b:"%[qw]?{",e:"}",c:i},{cN:"string",b:"%[qw]?<",e:">",c:i,r:10},{cN:"string",b:"%[qw]?/",e:"/",c:i,r:10},{cN:"string",b:"%[qw]?%",e:"%",c:i,r:10},{cN:"string",b:"%[qw]?-",e:"-",c:i,r:10},{cN:"string",b:"%[qw]?\\|",e:"\\|",c:i,r:10}];var h={cN:"function",bWK:true,e:" |$|;",k:"def",c:[{cN:"title",b:j,l:a,k:g},{cN:"params",b:"\\(",e:"\\)",l:a,k:g}].concat(k)};var f=k.concat(b.concat([{cN:"class",bWK:true,e:"$|;",k:"class module",c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+e.IR+"::)?"+e.IR}]}].concat(k)},h,{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:b.concat([{b:j}]),r:0},{cN:"symbol",b:a+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0
-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:k.concat([{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[e.BE,d]}]),r:0}]));d.c=f;h.c[1].c=f;return{l:a,k:g,c:f}}(hljs);hljs.LANGUAGES.diff=function(a){return{c:[{cN:"chunk",b:"^\\@\\@ +\\-\\d+,\\d+ +\\+\\d+,\\d+ +\\@\\@$",r:10},{cN:"chunk",b:"^\\*\\*\\* +\\d+,\\d+ +\\*\\*\\*\\*$",r:10},{cN:"chunk",b:"^\\-\\-\\- +\\d+,\\d+ +\\-\\-\\-\\-$",r:10},{cN:"header",b:"Index: ",e:"$"},{cN:"header",b:"=====",e:"=====$"},{cN:"header",b:"^\\-\\-\\-",e:"$"},{cN:"header",b:"^\\*{3} ",e:"$"},{cN:"header",b:"^\\+\\+\\+",e:"$"},{cN:"header",b:"\\*{5}",e:"\\*{5}$"},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}}(hljs);hljs.LANGUAGES.javascript=function(a){return{k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let
yield const",literal:"true false null undefined NaN Infinity"},c:[a.ASM,a.QSM,a.CLCM,a.CBLCLM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBLCLM,{cN:"regexp",b:"/",e:"/[gim]*",i:"\\n",c:[{b:"\\\\/"}]},{b:"<",e:">;",sL:"xml"}],r:0},{cN:"function",bWK:true,e:"{",k:"function",c:[{cN:"title",b:"[A-Za-z$_][0-9A-Za-z$_]*"},{cN:"params",b:"\\(",e:"\\)",c:[a.CLCM,a.CBLCLM],i:"[\"'\\(]"}],i:"\\[|%"}]}}(hljs);hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,s
L:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.php=function(a){var e={cN:"variable",b:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"};var b=[a.inherit(a.ASM,{i:null}),a.inherit(a.QSM,{i:null}),{cN:"string",b:'b"',e:'"',c:[a.BE]},{cN:"string",b:"b'",e:"'",c:[a.BE]}];var c=[a.BNM,a.CNM];var d={cN:"title",b:a.UIR};return{cI:true,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return implements parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception php_user_filter default die require __FUNCTION__ enddeclare final try this switch continue endfor endif declare unset true
false namespace trait goto instanceof insteadof __DIR__ __NAMESPACE__ __halt_compiler",c:[a.CLCM,a.HCM,{cN:"comment",b:"/\\*",e:"\\*/",c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"}]},{cN:"comment",eB:true,b:"__halt_compiler.+?;",eW:true},{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[a.BE]},{cN:"preprocessor",b:"<\\?php",r:10},{cN:"preprocessor",b:"\\?>"},e,{cN:"function",bWK:true,e:"{",k:"function",i:"\\$|\\[|%",c:[d,{cN:"params",b:"\\(",e:"\\)",c:["self",e,a.CBLCLM].concat(b).concat(c)}]},{cN:"class",bWK:true,e:"{",k:"class",i:"[:\\(\\$]",c:[{bWK:true,eW:true,k:"extends",c:[d]},d]},{b:"=>"}].concat(b).concat(c)}}(hljs);hljs.LANGUAGES.python=function(a){var f={cN:"prompt",b:"^(>>>|\\.\\.\\.) "};var c=[{cN:"string",b:"(u|b)?r?'''",e:"'''",c:[f],r:10},{cN:"string",b:'(u|b)?r?"""',e:'"""',c:[f],r:10},{cN:"string",b:"(u|r|ur)'",e:"'",c:[a.BE],r:10},{cN:"string",b:'(u|r|ur)"',e:'"',c:[a.BE],r:10},{cN:"string",b:"(b|br)'",e:"'",c:[a.BE]},{cN:"string",b:'(b|br)"',e:'"',c:[a.BE]}].concat
([a.ASM,a.QSM]);var e={cN:"title",b:a.UIR};var d={cN:"params",b:"\\(",e:"\\)",c:["self",a.CNM,f].concat(c)};var b={bWK:true,e:":",i:"[${=;\\n]",c:[e,d],r:10};return{k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10",built_in:"None True False Ellipsis NotImplemented"},i:"(</|->|\\?)",c:c.concat([f,a.HCM,a.inherit(b,{cN:"function",k:"def"}),a.inherit(b,{cN:"class",k:"class"}),a.CNM,{cN:"decorator",b:"@",e:"$"},{b:"\\b(print|exec)\\("}])}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/main.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/main.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/main.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/main.js Sun Mar 10 15:04:57 2013
@@ -20,11 +20,11 @@ require
[
'lib/order!lib/console',
'lib/order!jquery',
+ 'lib/order!lib/jquery.autogrow',
'lib/order!lib/jquery.cookie',
'lib/order!lib/jquery.form',
'lib/order!lib/jquery.jstree',
'lib/order!lib/jquery.sammy',
- 'lib/order!lib/jquery.sparkline',
'lib/order!lib/jquery.timeago',
'lib/order!lib/jquery.blockUI',
'lib/order!lib/highlight',
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/require.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/require.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/require.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/require.js Sun Mar 10 15:04:57 2013
@@ -9359,7 +9359,9 @@ jQuery.extend({
}
done( 0, statusText );
return this;
- }
+ },
+
+ url : s.url
};
// Callback for when everything is done
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/analysis.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/analysis.js Sun Mar 10 15:04:57 2013
@@ -18,7 +18,7 @@
// #/:core/analysis
sammy.get
(
- /^#\/([\w\d-]+)\/(analysis)$/,
+ new RegExp( app.core_regex_base + '\\/(analysis)$' ),
function( context )
{
var active_core = this.active_core;
@@ -42,7 +42,7 @@ sammy.get
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'
+ var schema_browser_path = app.core_menu.find( '.schema-browser a' ).attr( 'href' );
var schema_browser_map = { 'fieldname' : 'field', 'fieldtype' : 'type' };
type_or_name
@@ -129,7 +129,7 @@ sammy.get
{
fields++;
$( '[name="' + key + '"]', analysis_form )
- .val( decodeURIComponent( context.params[key].replace( /\+/g, '%20' ) ) );
+ .val( context.params[key].replace( /\+/g, ' ' ) );
}
}
@@ -269,7 +269,7 @@ sammy.get
dataType : 'json',
beforeSend : function( xhr, settings )
{
- loader.show( button );
+ loader.show( $( 'span', button ) );
button.attr( 'disabled', true );
},
success : function( response, status_text, xhr, form )
@@ -325,7 +325,7 @@ sammy.get
},
complete : function()
{
- loader.hide( $( 'button', analysis_form ) );
+ loader.hide( $( 'span', button ) );
button.removeAttr( 'disabled' );
}
}
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/app.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/app.js Sun Mar 10 15:04:57 2013
@@ -82,11 +82,7 @@ var sammy = $.sammy
{},
function( context )
{
- if( app.timeout )
- {
- console.debug( 'Clearing Timeout #' + app.timeout );
- clearTimeout( app.timeout );
- }
+ app.clear_timeout();
var menu_wrapper = $( '#menu-wrapper' );
@@ -96,20 +92,26 @@ var sammy = $.sammy
$( 'li.active', menu_wrapper )
.removeClass( 'active' );
- if( this.params.splat )
+ // global dashboard doesn't have params.splat
+ if( !this.params.splat )
{
- var selector = '~' === this.params.splat[0][0]
- ? '#' + this.params.splat[0].replace( /^~/, '' ) + '.global'
- : '#menu-selector #' + this.params.splat[0];
-
- var active_element = $( selector, menu_wrapper );
-
- if( 0 === active_element.size() )
- {
- this.app.error( 'There exists no core with name "' + this.params.splat[0] + '"' );
- return false;
- }
+ this.params.splat = [ '~index' ];
+ }
+ var selector = '~' === this.params.splat[0][0]
+ ? '#' + this.params.splat[0].replace( /^~/, '' ) + '.global'
+ : '#core-selector #' + this.params.splat[0].replace( /\./g, '__' );
+
+ var active_element = $( selector, menu_wrapper );
+
+ if( 0 === active_element.size() )
+ {
+ this.app.error( 'There exists no core with name "' + this.params.splat[0] + '"' );
+ return false;
+ }
+
+ if( active_element.hasClass( 'global' ) )
+ {
active_element
.addClass( 'active' );
@@ -119,10 +121,28 @@ var sammy = $.sammy
.addClass( 'active' );
}
- if( !active_element.hasClass( 'global' ) )
+ $( '#core-selector option[selected]' )
+ .removeAttr( 'selected' )
+ .trigger( 'liszt:updated' );
+
+ $( '#core-selector .chzn-container > a' )
+ .addClass( 'chzn-default' );
+ }
+ else
+ {
+ active_element
+ .attr( 'selected', 'selected' )
+ .trigger( 'liszt:updated' );
+
+ if( !this.params.splat[1] )
{
- this.active_core = active_element;
+ this.params.splat[1] = 'overview';
}
+
+ $( '#core-menu .' + this.params.splat[1] )
+ .addClass( 'active' );
+
+ this.active_core = active_element;
}
}
);
@@ -131,7 +151,7 @@ var sammy = $.sammy
var solr_admin = function( app_config )
{
- self = this,
+ that = this,
menu_element = null,
@@ -147,11 +167,20 @@ var solr_admin = function( app_config )
plugin_data = null,
- this.menu_element = $( '#menu-selector' );
- this.config = config;
+ this.menu_element = $( '#core-selector select' );
+ this.core_menu = $( '#core-menu ul' );
+ this.config = config;
this.timeout = null;
+ this.core_regex_base = '^#\\/([\\w\\d-\\.]+)';
+
+ browser = {
+ locale : null,
+ language : null,
+ country : null
+ };
+
show_global_error = function( error )
{
var main = $( '#main' );
@@ -170,12 +199,129 @@ 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 )
+ {
+ that.cores_data = sort_cores_data( cores.status );
+
+ that.menu_element
+ .empty();
+
+ var core_list = [];
+ core_list.push( '<option></option>' );
+
+ var core_count = 0;
+ for( var core_name in that.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 = '<option '
+ + ' id="' + core_name.replace( /\./g, '__' ) + '" '
+ + ' class="' + classes.join( ' ' ) + '"'
+ + ' data-basepath="' + core_path + '"'
+ + ' schema="' + cores.status[core_name]['schema'] + '"'
+ + ' config="' + cores.status[core_name]['config'] + '"'
+ + ' value="#/' + core_name + '"'
+ + ' title="' + core_name + '"'
+ + '>'
+ + core_name
+ + '</option>';
+
+ core_list.push( core_tpl );
+ }
+
+ that.menu_element
+ .append( core_list.join( "\n" ) );
+
+ 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()
{
+ var navigator_language = navigator.userLanguage || navigator.language;
+ var language_match = navigator_language.match( /^(\w{2})([-_](\w{2}))?$/ );
+ if( language_match )
+ {
+ if( language_match[1] )
+ {
+ browser.language = language_match[1].toLowerCase();
+ }
+ if( language_match[3] )
+ {
+ browser.country = language_match[3].toUpperCase();
+ }
+ if( language_match[1] && language_match[3] )
+ {
+ browser.locale = browser.language + '_' + browser.country
+ }
+ }
+
$.ajax
(
{
- url : config.solr_path + config.core_admin_path + '?wt=json',
+ url : config.solr_path + config.core_admin_path + '?wt=json&indexInfo=false',
dataType : 'json',
beforeSend : function( arr, form, options )
{
@@ -184,85 +330,63 @@ var solr_admin = function( app_config )
},
success : function( response )
{
- self.cores_data = response.status;
- var core_count = 0;
+ that.set_cores_data( response );
+
+ that.menu_element
+ .chosen()
+ .off( 'change' )
+ .on
+ (
+ 'change',
+ function( event )
+ {
+ location.href = $( 'option:selected', this ).val();
+ return false;
+ }
+ )
+ .on
+ (
+ 'liszt:updated',
+ function( event )
+ {
+ var core_name = $( 'option:selected', this ).text();
+
+ if( core_name )
+ {
+ that.core_menu
+ .html
+ (
+ '<li class="overview"><a href="#/' + core_name + '"><span>Overview</span></a></li>' + "\n" +
+ '<li class="ping"><a rel="' + that.config.solr_path + '/' + core_name + '/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"
+ )
+ .show();
+ }
+ else
+ {
+ that.core_menu
+ .hide()
+ .empty();
+ }
+ }
+ );
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 + '" '
- + ' 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
(
@@ -274,7 +398,7 @@ var solr_admin = function( app_config )
},
success : function( response )
{
- self.dashboard_values = response;
+ that.dashboard_values = response;
var environment_args = null;
var cloud_args = null;
@@ -284,9 +408,13 @@ var solr_admin = function( app_config )
var command_line_args = response.jvm.jmx.commandLineArgs.join( ' | ' );
environment_args = command_line_args.match( /-Dsolr.environment=((dev|test|prod)?[\w\d]*)/i );
- cloud_args = command_line_args.match( /-Dzk/i );
}
+ if( response.mode )
+ {
+ cloud_args = response.mode.match( /solrcloud/i );
+ }
+
// title
$( 'title', document )
@@ -361,7 +489,99 @@ var solr_admin = function( app_config )
}
}
);
- }
+ };
+
+ this.convert_duration_to_seconds = function convert_duration_to_seconds( str )
+ {
+ var seconds = 0;
+ var arr = new String( str || '' ).split( '.' );
+ var parts = arr[0].split( ':' ).reverse();
+ var parts_count = parts.length;
+
+ for( var i = 0; i < parts_count; i++ )
+ {
+ seconds += ( parseInt( parts[i], 10 ) || 0 ) * Math.pow( 60, i );
+ }
+
+ // treat more or equal than .5 as additional second
+ if( arr[1] && 5 <= parseInt( arr[1][0], 10 ) )
+ {
+ seconds++;
+ }
+
+ return seconds;
+ };
+
+ this.convert_seconds_to_readable_time = function convert_seconds_to_readable_time( seconds )
+ {
+ seconds = parseInt( seconds || 0, 10 );
+ var minutes = Math.floor( seconds / 60 );
+ var hours = Math.floor( minutes / 60 );
+
+ var text = [];
+ if( 0 !== hours )
+ {
+ text.push( hours + 'h' );
+ seconds -= hours * 60 * 60;
+ minutes -= hours * 60;
+ }
+
+ if( 0 !== minutes )
+ {
+ text.push( minutes + 'm' );
+ seconds -= minutes * 60;
+ }
+
+ if( 0 !== seconds )
+ {
+ text.push( ( '0' + seconds ).substr( -2 ) + 's' );
+ }
+
+ return text.join( ' ' );
+ };
+
+ this.clear_timeout = function clear_timeout()
+ {
+ if( !app.timeout )
+ {
+ return false;
+ }
+
+ console.debug( 'Clearing Timeout #' + this.timeout );
+ clearTimeout( this.timeout );
+ this.timeout = null;
+ };
+
+ this.format_json = function format_json( json_str )
+ {
+ if( JSON.stringify && JSON.parse )
+ {
+ json_str = JSON.stringify( JSON.parse( json_str ), undefined, 2 );
+ }
+
+ return json_str;
+ };
+
+ this.format_number = function format_number( number )
+ {
+ var sep = {
+ 'de_CH' : '\'',
+ 'de' : '.',
+ 'en' : ',',
+ 'es' : '.',
+ 'it' : '.',
+ 'ja' : ',',
+ 'sv' : ' ',
+ 'tr' : '.',
+ '_' : '' // fallback
+ };
+
+ return ( number || 0 ).toString().replace
+ (
+ /\B(?=(\d{3})+(?!\d))/g,
+ sep[ browser.locale ] || sep[ browser.language ] || sep['_']
+ );
+ };
};
Modified: lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/cloud.js?rev=1454862&r1=1454861&r2=1454862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/branches/lucene4258/solr/webapp/web/js/scripts/cloud.js Sun Mar 10 15:04:57 2013
@@ -15,6 +15,27 @@
limitations under the License.
*/
+var zk_error = function zk_error( xhr, text_status, error_thrown )
+{
+ var zk = null;
+ try
+ {
+ eval( 'zk = ' + xhr.responseText + ';' );
+ }
+ catch( e ) {}
+
+ var message = '<p class="txt">Loading of "<code>' + xhr.url + '</code>" '
+ + 'failed (HTTP-Status <code>' + xhr.status + '</code>)</p>' + "\n";
+
+ if( zk.error )
+ {
+ message += '<p class="msg">"' + zk.error.esc() + '"</p>' + "\n";
+ }
+
+ this.closest( '#cloud' )
+ .html( '<div class="block" id="error">' + message + '</div>' );
+};
+
var init_debug = function( cloud_element )
{
var debug_element = $( '#debug', cloud_element );
@@ -415,7 +436,7 @@ var prepare_graph = function( graph_elem
var shard = {
name: s,
data: {
- type : 'shard',
+ type : 'shard'
},
children: nodes
};
@@ -425,7 +446,7 @@ var prepare_graph = function( graph_elem
var collection = {
name: c,
data: {
- type : 'collection',
+ type : 'collection'
},
children: shards
};
@@ -633,19 +654,7 @@ var init_tree = function( tree_element )
}
);
},
- error : function( xhr, text_status, error_thrown )
- {
- var message = 'Loading of <code>' + app.config.zookeeper_path + '</code> failed with "' + text_status + '" '
- + '(<code>' + error_thrown.message + '</code>)';
-
- if( 200 !== xhr.status )
- {
- message = 'Loading of <code>' + app.config.zookeeper_path + '</code> failed with HTTP-Status ' + xhr.status + ' ';
- }
-
- this
- .html( '<div class="block" id="error">' + message + '</div>' );
- },
+ error : zk_error,
complete : function( xhr, text_status )
{
}
@@ -710,8 +719,20 @@ sammy.get
}
);
- $( 'a[href="' + context.path + '"]', navigation_element )
- .trigger( 'activate' );
+ $.ajax
+ (
+ {
+ url : app.config.solr_path + '/zookeeper?wt=json',
+ dataType : 'json',
+ context : cloud_element,
+ success : function( response, text_status, xhr )
+ {
+ $( 'a[href="' + context.path + '"]', navigation_element )
+ .trigger( 'activate' );
+ },
+ error : zk_error
+ }
+ );
}
);