Author: gttersen
Date: 2007-05-08 22:23:44 +0200 (Tue, 08 May 2007)
New Revision: 5021
Modified:
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigationCommand.java
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NavigationCommandConfig.java
Log:
NewsAggregator changes
Modified:
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigationCommand.java
===================================================================
---
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigationCommand.java
2007-05-08 18:21:23 UTC (rev 5020)
+++
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigationCommand.java
2007-05-08 20:23:44 UTC (rev 5021)
@@ -226,17 +226,26 @@
private void addNavigationFragments(NavigationCommandConfig.Navigation
navigation, StringBuilder sb, NavigationCommandConfig.Nav navEntry) {
final Set<String> fieldFilterSet = new HashSet<String>();
for (NavigationCommandConfig.Nav nav : navigation.getNavList()) {
- StringDataObject fieldValue =
context.getDataModel().getParameters().getValue(nav.getField());
- if (!fieldFilterSet.contains(nav.getField())) {
- addPreviousField(fieldValue, sb, navEntry, nav.getField());
- fieldFilterSet.add(nav.getField());
- for (String staticKey :
nav.getStaticParameters().keySet()) {
- fieldValue =
context.getDataModel().getParameters().getValue(staticKey);
- if (!fieldFilterSet.contains(staticKey)) {
- addPreviousField(fieldValue, sb, navEntry,
staticKey);
- }
+ addNavigationFragment(fieldFilterSet, nav, sb, navEntry);
+ }
+ }
+
+ private void addNavigationFragment(Set<String> fieldFilterSet,
NavigationCommandConfig.Nav nav, StringBuilder sb, NavigationCommandConfig.Nav
navEntry) {
+ StringDataObject fieldValue =
context.getDataModel().getParameters().getValue(nav.getField());
+ if (!fieldFilterSet.contains(nav.getField())) {
+ addPreviousField(fieldValue, sb, navEntry, nav.getField());
+ fieldFilterSet.add(nav.getField());
+ for (String staticKey : nav.getStaticParameters().keySet()) {
+ fieldValue =
context.getDataModel().getParameters().getValue(staticKey);
+ if (!fieldFilterSet.contains(staticKey)) {
+ addPreviousField(fieldValue, sb, navEntry, staticKey);
}
}
+ if (nav.getChildNavs() != null) {
+ for (NavigationCommandConfig.Nav childNav :
nav.getChildNavs()) {
+ addNavigationFragment(fieldFilterSet, childNav, sb,
navEntry);
+ }
+ }
}
}
Modified:
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NavigationCommandConfig.java
===================================================================
---
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NavigationCommandConfig.java
2007-05-08 18:21:23 UTC (rev 5020)
+++
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NavigationCommandConfig.java
2007-05-08 20:23:44 UTC (rev 5021)
@@ -137,7 +137,12 @@
final List<Element> navElements =
getDirectChildren(navigationElement, NAV_ELEMENT);
navList = new ArrayList<Nav>(navElements.size());
this.navMap = new HashMap<String, Nav>();
- addNavElements(navElements, navMap);
+ for (Element navElement : navElements) {
+ Nav nav = new Nav(this, navElement);
+ navList.add(nav);
+ updateNavMap(nav, navMap);
+ updateNavMap(nav, this.navMap);
+ }
final List<Element> resetNavElements =
getDirectChildren(navigationElement, RESET_NAV_ELEMENT);
resetNavSet = new HashSet<String>(resetNavElements.size());
for (Element resetNavElement : resetNavElements) {
@@ -148,19 +153,6 @@
}
}
- private void addNavElements(List<Element> navElements, HashMap<String,
Nav> navMap) {
- for (Element navElement : navElements) {
- Nav nav = new Nav(this, navElement);
- navList.add(nav);
- updateNavMap(nav, navMap);
- updateNavMap(nav, this.navMap);
- List<Element> childNavElements = getDirectChildren(navElement,
NAV_ELEMENT);
- if (childNavElements.size() > 0) {
- addNavElements(childNavElements, navMap);
- }
- }
- }
-
private void updateNavMap(Nav nav, HashMap<String, Nav> navMap) {
navMap.put(nav.getId(), nav);
if (nav.getChildNavs() != null && nav.getChildNavs().size() > 0) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
