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

SOLR-1697 PluginInfo should load plugins w/o class attribute also 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@895909 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2010-01-05 05:38:27 +00:00
parent fc9a0a78c9
commit ca76f3b50c
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -79,6 +79,8 @@ New Features
* SOLR-1586: Add support for Geohash and Spatial Tile FieldType (Chris Mattmann, gsingers)
* SOLR-1697: PluginInfo should load plugins w/o class attribute also (noble)
Optimizations
----------------------

21
src/java/org/apache/solr/core/PluginInfo.java
View File

@ -57,19 +57,17 @@ public class PluginInfo {
}
private List<PluginInfo> loadSubPlugins(Node node) {
List<PluginInfo> children = null;
try {
//if there is another sub tag with a 'class' attribute that has to be another plugin
NodeList nodes = (NodeList) Config.xpathFactory.newXPath().evaluate("*[@class]",node, XPathConstants.NODESET);
if(nodes.getLength() > 0){
children = new ArrayList<PluginInfo>(nodes.getLength());
for (int i=0; i<nodes.getLength(); i++) {
PluginInfo pluginInfo = new PluginInfo(nodes.item(i), null, false, false);
List<PluginInfo> children = new ArrayList<PluginInfo>();
//if there is another sub tag with a non namedlist tag that has to be another plugin
NodeList nlst = node.getChildNodes();
for (int i = 0; i < nlst.getLength(); i++) {
Node nd = nlst.item(i);
if (nd.getNodeType() != Node.ELEMENT_NODE) continue;
if (NL_TAGS.contains(nd.getNodeName())) continue;
PluginInfo pluginInfo = new PluginInfo(nd, null, false, false);
if (pluginInfo.isEnabled()) children.add(pluginInfo);
}
}
} catch (XPathExpressionException e) { }
return children == null ? Collections.<PluginInfo>emptyList(): unmodifiableList(children);
return children.isEmpty() ? Collections.<PluginInfo>emptyList() : unmodifiableList(children);
}
@Override
@ -102,4 +100,5 @@ public class PluginInfo {
for (PluginInfo child : children) if(type.equals(child.type)) result.add(child);
return result;
}
private static final HashSet<String> NL_TAGS = new HashSet<String>(Arrays.asList("lst","str","int","bool","arr","float","double"));
}