Author: gttersen
Date: 2007-04-19 17:14:59 +0200 (Thu, 19 Apr 2007)
New Revision: 4833
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddCategoryNavigationResultHandler.java
Log:
Moved NewsAggregator from nyheter.sesam skin into genericno and sesam.no
module nyheter.sesam.no can now be deleted.
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddCategoryNavigationResultHandler.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddCategoryNavigationResultHandler.java
2007-04-19 11:24:20 UTC (rev 4832)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddCategoryNavigationResultHandler.java
2007-04-19 15:14:59 UTC (rev 4833)
@@ -46,22 +46,24 @@
}
private void addCategoryNavigators(DataModel datamodel, FastSearchResult
searchResult, List<Category> categoryList) {
- final String[] categoryFields = getCategoryFieldArray();
- if (categoryFields.length > 0) {
- for (String categoryField : categoryFields) {
- Category selectedCategory = null;
- StringDataObject selectedFieldData =
datamodel.getParameters().getValue(categoryField);
- for (Category category : categoryList) {
- searchResult.addModifier(categoryField, new
Modifier(category.getDisplayName(), -1, null));
- if (selectedFieldData != null &&
selectedFieldData.getString().equals(category.getDisplayName())) {
- selectedCategory = category;
+ if (categoryList != null && categoryList.size() > 0) {
+ final String[] categoryFields = getCategoryFieldArray();
+ if (categoryFields.length > 0) {
+ for (String categoryField : categoryFields) {
+ Category selectedCategory = null;
+ StringDataObject selectedFieldData =
datamodel.getParameters().getValue(categoryField);
+ for (Category category : categoryList) {
+ searchResult.addModifier(categoryField, new
Modifier(category.getDisplayName(), -1, null));
+ if (selectedFieldData != null &&
selectedFieldData.getString().equals(category.getDisplayName())) {
+ selectedCategory = category;
+ }
}
+ if (selectedCategory != null &&
selectedCategory.getSubCategories() != null) {
+ categoryList = selectedCategory.getSubCategories();
+ } else {
+ break;
+ }
}
- if (selectedCategory != null &&
selectedCategory.getSubCategories() != null) {
- categoryList = selectedCategory.getSubCategories();
- } else {
- break;
- }
}
}
}
@@ -107,11 +109,13 @@
private List<Element> getDirectChildren(Element element, String
elementName) {
ArrayList<Element> children = new ArrayList<Element>();
- NodeList childNodes = element.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node childNode = childNodes.item(i);
- if (childNode instanceof Element &&
childNode.getNodeName().equals(elementName)) {
- children.add((Element) childNode);
+ if (element != null) {
+ NodeList childNodes = element.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node childNode = childNodes.item(i);
+ if (childNode instanceof Element &&
childNode.getNodeName().equals(elementName)) {
+ children.add((Element) childNode);
+ }
}
}
return children;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
