Author: ssmiweve
Date: 2008-04-21 08:44:14 +0200 (Mon, 21 Apr 2008)
New Revision: 6505
Modified:
branches/2.17/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
Log:
SEARCH-4648 - Move sesam.no code out of SyndicationGenerator
Modified:
branches/2.17/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
===================================================================
---
branches/2.17/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
2008-04-20 21:20:20 UTC (rev 6504)
+++
branches/2.17/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
2008-04-21 06:44:14 UTC (rev 6505)
@@ -324,31 +324,6 @@
final String origUri = uri.replaceAll("&?output=[^&]+",
"").replaceAll("&?feedtype=[^&]+", "");
cxt.put("uri", origUri);
- //cxt.put("channels", channels);
-
- // @todo. Specific to sesam.no. Move somewhere else. result-spi?
templates? The command?
- if ("c".equals(context.getTab().getKey())) {
-
- final String contentSource = getParameter("contentsource");
- final String newsCountry = getParameter("newsCountry");
-
- if (contentSource != null &&
contentSource.startsWith("Interna")) {
- cxt.put("newstype", "- Internasjonale nyheter");
- } else if (contentSource != null &&
contentSource.equals("Mediearkivet")) {
- cxt.put("newstype", "- Papiraviser");
- } else if (newsCountry != null &&
newsCountry.equals("Sverige")) {
- cxt.put("newstype", "- Svenske nyheter");
- } else if (newsCountry != null &&
newsCountry.equals("Island")) {
- cxt.put("newstype", "- Islandske nyheter");
- } else if (newsCountry != null &&
newsCountry.equals("Finland")) {
- cxt.put("newstype", "- Finske nyheter");
- } else if (newsCountry != null &&
newsCountry.equals("Danmark")) {
- cxt.put("newstype", "- Danske nyheter");
- } else {
- cxt.put("newstype", "- Norske nyheter");
- }
- }
-
final Template tpl = VelocityEngineFactory.getTemplate(engine,
site, templateUri);
final StringWriter writer = new StringWriter();
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
