You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2006/12/14 01:30:34 UTC

svn commit: r486907 - in /incubator/solr/trunk: CHANGES.txt src/webapp/resources/admin/_info.jsp

Author: hossman
Date: Wed Dec 13 16:30:34 2006
New Revision: 486907

URL: http://svn.apache.org/viewvc?view=rev&rev=486907
Log:
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.

Modified:
    incubator/solr/trunk/CHANGES.txt
    incubator/solr/trunk/src/webapp/resources/admin/_info.jsp

Modified: incubator/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/CHANGES.txt?view=diff&rev=486907&r1=486906&r2=486907
==============================================================================
--- incubator/solr/trunk/CHANGES.txt (original)
+++ incubator/solr/trunk/CHANGES.txt Wed Dec 13 16:30:34 2006
@@ -155,6 +155,8 @@
  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,

Modified: incubator/solr/trunk/src/webapp/resources/admin/_info.jsp
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/src/webapp/resources/admin/_info.jsp?view=diff&rev=486907&r1=486906&r2=486907
==============================================================================
--- incubator/solr/trunk/src/webapp/resources/admin/_info.jsp (original)
+++ incubator/solr/trunk/src/webapp/resources/admin/_info.jsp Wed Dec 13 16:30:34 2006
@@ -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();
+  String defaultSearch = "";
+  { 
+    StringWriter tmp = new StringWriter();
+    XML.escapeCharData
+      (SolrConfig.config.get("admin/defaultQuery/text()", null), tmp);
+    defaultSearch = tmp.toString();
   }
-  tmp = new StringWriter();
-  String solrSpecVersion = p.getSpecificationVersion() ;
-  if (null != solrSpecVersion) {
-    XML.escapeCharData(solrSpecVersion, tmp);
-    solrSpecVersion = tmp.toString();
-  }
-
-  p = LucenePackage.class.getPackage();
 
-  tmp = new StringWriter();
-  String luceneImplVersion = p.getImplementationVersion();
-  if (null != luceneImplVersion) {
-    XML.escapeCharData(luceneImplVersion, tmp);
-    luceneImplVersion = tmp.toString();
+  String solrImplVersion = "";
+  String solrSpecVersion = "";
+  String luceneImplVersion = "";
+  String luceneSpecVersion = "";
+
+  { 
+    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();
+    }
   }
-  tmp = new StringWriter();
-  String luceneSpecVersion = p.getSpecificationVersion() ;
-  if (null != luceneSpecVersion) {
-    XML.escapeCharData(luceneSpecVersion, tmp);
-    luceneSpecVersion = tmp.toString();
-  }
-
+  
   String cwd=System.getProperty("user.dir");
   String solrHome= Config.getInstanceDir();
 %>