Author: gttersen
Date: 2007-03-21 21:21:20 +0100 (Wed, 21 Mar 2007)
New Revision: 4602
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
Log:
Category navigation implemented JIRA(AGGREG-83)
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
2007-03-21 19:15:39 UTC (rev 4601)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
2007-03-21 20:21:20 UTC (rev 4602)
@@ -41,7 +41,6 @@
public class NewsAggregatorSearchCommand extends NavigatableESPFastCommand {
private static final Logger LOG =
Logger.getLogger(NewsAggregatorSearchCommand.class);
- private static final String PARAM_GEONAV = "geonav";
private static final String PARAM_CLUSTER_ID = "clusterId";
/**
@@ -62,7 +61,7 @@
if (clusterId == null) {
return getPageResult(config, xmlFile);
} else {
- return getClusterResult(config, clusterId);
+ return getClusterResult(config, clusterId, xmlFile);
}
}
@@ -98,7 +97,16 @@
return newString;
}
- private SearchResult getClusterResult(NewsAggregatorSearchConfiguration
config, StringDataObject clusterId) {
+ private SearchResult getClusterResult(NewsAggregatorSearchConfiguration
config, StringDataObject clusterId, String xmlFile) {
+ try {
+ final NewsAggregatorXmlParser newsAggregatorXmlParser = new
NewsAggregatorXmlParser();
+ final InputStream inputStream = getInputStream(config, xmlFile);
+ return newsAggregatorXmlParser.parseCluster(config, inputStream,
clusterId.getString(), this);
+ } catch (IOException e) {
+ LOG.debug("Falling back to search instead of xml parse", e);
+ } catch (JDOMException e) {
+ LOG.debug("Falling back to search instead of xml parse", e);
+ }
return search(config, clusterId.getString());
}
@@ -177,7 +185,7 @@
}
} catch (NullPointerException e) {
// The doc count is not 100% accurate.
- LOG.debug("Error finding document " + e);
+ LOG.debug("Error finding document ", e);
break;
}
}
@@ -425,7 +433,6 @@
private int handleCluster(NewsAggregatorSearchConfiguration config,
Element cluster, SearchCommand searchCommand, SearchResult searchResult) {
final SearchResultItem searchResultItem = new
BasicSearchResultItem();
- int hitCount = 0;
searchResultItem.addField("size",
Integer.toString(Integer.parseInt(cluster.getAttributeValue(ATTRIBUTE_FULL_COUNT))
- 1));
searchResultItem.addField(PARAM_CLUSTER_ID,
cluster.getAttributeValue(ATTRIBUTE_CLUSTERID));
@@ -443,7 +450,6 @@
handleEntry(nestedEntry, nestedResultItem);
addResult(config, nestedResultItem, nestedSearchResult,
searchCommand);
}
-
}
searchResultItem.addNestedSearchResult("entries",
nestedSearchResult);
searchResult.addResult(searchResultItem);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
