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

SOLR-1635: Fixed error message when numeric values can't be parsed by DOMUtils 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@888622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2009-12-08 23:06:23 +00:00
parent cec9fcb247
commit 8bbf9488b7
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -117,6 +117,9 @@ Bug Fixes
in a multivalued field when term positions (term vectors) are stored.
(Chris Harris via yonik)
* SOLR-1635: Fixed error message when numeric values can't be parsed by
DOMUtils - notably for plugin init params in solrconfig.xml.
(hossman)
Other Changes
----------------------

62
src/common/org/apache/solr/common/util/DOMUtil.java
View File

@ -108,40 +108,60 @@ public class DOMUtil {
return lst;
}
/**
* Examines a Node from the DOM representation of a NamedList and adds the
* contents of that node to both the specified NamedList and List passed
* as arguments.
*
* @param nd The Node whose type will be used to determine how to parse the
* text content. If there is a 'name' attribute it will be used
* when adding to the NamedList
* @param nlst A NamedList to add the item to with name if application.
* If this param is null it will be ignored.
* @param arr A List to add the item to.
* If this param is null it will be ignored.
*/
@SuppressWarnings("unchecked")
public static void addToNamedList(Node nd, NamedList nlst, List arr) {
// Nodes often include whitespace, etc... so just return if this
// is not an Element.
if (nd.getNodeType() != Node.ELEMENT_NODE) return;
String type = nd.getNodeName();
final String type = nd.getNodeName();
String name = null;
if (nd.hasAttributes()) {
NamedNodeMap attrs = nd.getAttributes();
Node nameNd = attrs.getNamedItem("name");
if (nameNd != null) name=nameNd.getNodeValue();
}
final String name = getAttr(nd, "name");
Object val=null;
if ("str".equals(type)) {
val = getText(nd);
} else if ("int".equals(type)) {
val = Integer.valueOf(getText(nd));
} else if ("long".equals(type)) {
val = Long.valueOf(getText(nd));
} else if ("float".equals(type)) {
val = Float.valueOf(getText(nd));
} else if ("double".equals(type)) {
val = Double.valueOf(getText(nd));
} else if ("bool".equals(type)) {
val = StrUtils.parseBool(getText(nd));
} else if ("lst".equals(type)) {
if ("lst".equals(type)) {
val = childNodesToNamedList(nd);
} else if ("arr".equals(type)) {
val = childNodesToList(nd);
} else {
final String textValue = getText(nd);
try {
if ("str".equals(type)) {
val = textValue;
} else if ("int".equals(type)) {
val = Integer.valueOf(textValue);
} else if ("long".equals(type)) {
val = Long.valueOf(textValue);
} else if ("float".equals(type)) {
val = Float.valueOf(textValue);
} else if ("double".equals(type)) {
val = Double.valueOf(textValue);
} else if ("bool".equals(type)) {
val = StrUtils.parseBool(textValue);
}
// :NOTE: Unexpected Node names are ignored
// :TODO: should we generate an error here?
} catch (NumberFormatException nfe) {
throw new SolrException
(SolrException.ErrorCode.SERVER_ERROR,
"Value " + (null != name ? ("of '" +name+ "' ") : "") +
"can not be parsed as '" +type+ "': \"" + textValue + "\"",
nfe);
}
}
if (nlst != null) nlst.add(name,val);