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

when i added the version numbers to the Info page, I created some new temp variables in _info.jsp (assuming the numbers might be useful on other pages as well) that wound up conflicting with a temp variable already in use in distribution.jsp ... this commit cleans up _info.jsp so that only variables we want to bleed into the other JSPs do so. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@486907 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2006-12-14 00:30:34 +00:00
parent b2fcbed95b
commit c86a81b90e
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -155,6 +155,8 @@ Bug Fixes
9. field boosts weren't being applied and doc boosts were being applied to fields (klaas)
10. Multiple-doc update generates well-formed xml (klaas, SOLR-65)
11. Better parsing of pingQuery from solrconfig.xml (hossman, SOLR-70)
12. Fixed bug with "Distribution" page introduced when Versions were
added to "Info" page (hossman)
Other Changes
1. Upgrade to Lucene 2.0 nightly build 2006-06-22, lucene SVN revision 416224,

79
src/webapp/resources/admin/_info.jsp
View File

@ -43,45 +43,54 @@
InetAddress addr = InetAddress.getLocalHost();
String hostname = addr.getCanonicalHostName();
StringWriter tmp;
tmp = new StringWriter();
XML.escapeCharData(SolrConfig.config.get("admin/defaultQuery/text()", null),
tmp);
String defaultSearch = tmp.toString();
Package p;
p = SolrCore.class.getPackage();
tmp = new StringWriter();
String solrImplVersion = p.getImplementationVersion();
if (null != solrImplVersion) {
XML.escapeCharData(solrImplVersion, tmp);
solrImplVersion = tmp.toString();
}
tmp = new StringWriter();
String solrSpecVersion = p.getSpecificationVersion() ;
if (null != solrSpecVersion) {
XML.escapeCharData(solrSpecVersion, tmp);
solrSpecVersion = tmp.toString();
String defaultSearch = "";
{
StringWriter tmp = new StringWriter();
XML.escapeCharData
(SolrConfig.config.get("admin/defaultQuery/text()", null), tmp);
defaultSearch = tmp.toString();
}
p = LucenePackage.class.getPackage();
String solrImplVersion = "";
String solrSpecVersion = "";
String luceneImplVersion = "";
String luceneSpecVersion = "";
tmp = new StringWriter();
String luceneImplVersion = p.getImplementationVersion();
if (null != luceneImplVersion) {
XML.escapeCharData(luceneImplVersion, tmp);
luceneImplVersion = tmp.toString();
}
tmp = new StringWriter();
String luceneSpecVersion = p.getSpecificationVersion() ;
if (null != luceneSpecVersion) {
XML.escapeCharData(luceneSpecVersion, tmp);
luceneSpecVersion = tmp.toString();
}
{
Package p;
StringWriter tmp;
p = SolrCore.class.getPackage();
tmp = new StringWriter();
solrImplVersion = p.getImplementationVersion();
if (null != solrImplVersion) {
XML.escapeCharData(solrImplVersion, tmp);
solrImplVersion = tmp.toString();
}
tmp = new StringWriter();
solrSpecVersion = p.getSpecificationVersion() ;
if (null != solrSpecVersion) {
XML.escapeCharData(solrSpecVersion, tmp);
solrSpecVersion = tmp.toString();
}
p = LucenePackage.class.getPackage();
tmp = new StringWriter();
luceneImplVersion = p.getImplementationVersion();
if (null != luceneImplVersion) {
XML.escapeCharData(luceneImplVersion, tmp);
luceneImplVersion = tmp.toString();
}
tmp = new StringWriter();
luceneSpecVersion = p.getSpecificationVersion() ;
if (null != luceneSpecVersion) {
XML.escapeCharData(luceneSpecVersion, tmp);
luceneSpecVersion = tmp.toString();
}
}
String cwd=System.getProperty("user.dir");
String solrHome= Config.getInstanceDir();
%>