Author: magnuse
Date: 2006-05-17 22:15:37 +0200 (Wed, 17 May 2006)
New Revision: 2928
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQuery.java
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
trunk/src/java/no/schibstedsok/front/searchportal/view/config/SearchTab.java
trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
getSourceParameters replaced w/ navigation hints.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQuery.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQuery.java
2006-05-17 17:52:47 UTC (rev 2927)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQuery.java
2006-05-17 20:15:37 UTC (rev 2928)
@@ -63,8 +63,6 @@
SearchTab getSearchTab();
- String getSourceParameters(final String source);
-
List<Modifier> getSources();
TokenEvaluatorFactory getTokenEvaluatorFactory();
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
2006-05-17 17:52:47 UTC (rev 2927)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
2006-05-17 20:15:37 UTC (rev 2928)
@@ -506,34 +506,7 @@
return tokenEvaluatorFactory;
}
- // TODO Find some other way to do this. Really do!
- public String getSourceParameters(final String source) {
-
- LOG.trace("getSourceParameters() Source=" + source);
-
- if (source.equals("Norske nettsider")) {
- return "c=n";
- } else if (source.startsWith("Nyhets")) {
- return "c=m&nav_sources=contentsourcenavigator";
- } else if (source.startsWith("Bild")) {
- return "c=p";
- } else if (source.startsWith("Person")) {
- return "c=w";
- } else if (source.startsWith("Norske blogger")) {
- return "c=b";
- } else if (source.startsWith("Bedrift")) {
- return "c=y";
- } else if (source.equals("Internasjonale nettsider")) {
- return "c=g";
- } else {
- return "c=d";
- }
- }
-
public Query getQuery() {
return queryObj;
}
-
-
-
}
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/view/config/SearchTab.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/view/config/SearchTab.java
2006-05-17 17:52:47 UTC (rev 2927)
+++
trunk/src/java/no/schibstedsok/front/searchportal/view/config/SearchTab.java
2006-05-17 20:15:37 UTC (rev 2928)
@@ -27,6 +27,9 @@
private static final Logger LOG = Logger.getLogger(SearchTab.class);
private static final String ERR_ENRICHMENT_BY_COMMAND_NON_EXISTENT
= "No enrichment, in this SearchTab, is linked to the command ";
+ private static final String ERR_NAVIGATION_HINT_NOT_FOUND
+ = "Navigation hint not found for ";
+
// Attributes ----------------------------------------------------
@@ -431,7 +434,7 @@
* Returns the navigator hint matching name. Returns null if no navigator
* hint matches.
*/
- public NavigatorHint getNavigatorHint(String name) {
+ public NavigatorHint getNavigationHint(String name) {
for (NavigatorHint hint : navigators) {
switch(hint.match) {
case EQUAL:
@@ -446,9 +449,12 @@
return hint;
}
}
+
+ LOG.error(ERR_NAVIGATION_HINT_NOT_FOUND + name);
+
return null;
}
-
+
public String toString(){
return id + (inherit != null ? " --> " + inherit.toString() : "");
}
Modified: trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2006-05-17
17:52:47 UTC (rev 2927)
+++ trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2006-05-17
20:15:37 UTC (rev 2928)
@@ -352,10 +352,10 @@
if(i!=1) {%>
<tr><td colspan="2" class="nopad"><img
src="../images/pix.gif" width="100%" height="1" alt="" /></td></tr>
<% } %>
- <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%=query.getSourceParameters(e.getName())%>");'>
+ <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%="c=" +
query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix()%>");'>
<td class="nav_pad_icon">
<img <% if (e.getName().startsWith("Persons"))
{ %> src="../images/menu/person.gif" <% } else if
(e.getName().startsWith("Netts")) { %> src="../images/menu/nettsok.gif" <% } %>
class="nav_icon" align="left" alt="" />
- <% String x = "?q=" + qURLEncoded + "&" +
query.getSourceParameters(e.getName()); %>
+ <% String x = "?q=" + qURLEncoded + "&" +
"c=" + query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix(); %>
<a href="<%=linkpulse.getUrl(x,
"category:navigation;subcategory:service_left", "sgo", "") %>" onclick="return
strep(this);"><%= e.getName() %></a>
</td>
<td class="nav_pad"
align="right"><%=text.getMessage("numberFormat", e.getCount()) %></td>
@@ -371,10 +371,10 @@
if(i!=1) {%>
<tr><td colspan="2" class="nopad"><img
src="../images/pix.gif" width="100%" height="1" alt="" /></td></tr>
<% } %>
- <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%=query.getSourceParameters(e.getName())%>");'>
+ <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%="c=" +
query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix()%>");'>
<td class="nav_pad_icon">
<img <% if (e.getName().startsWith("Bedriftss")) {
%> src="../images/menu/bedrift.gif" <% } else if
(e.getName().startsWith("Netts")) { %> src="../images/menu/nettsok.gif" <% } %>
class="nav_icon" align="left" alt="" />
- <% String x = "?q=" + qURLEncoded + "&" +
query.getSourceParameters(e.getName()); %>
+ <% String x = "?q=" + qURLEncoded + "&" + "c="
+ query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix(); %>
<a href="<%=linkpulse.getUrl(x,
"category:navigation;subcategory:service_left", "sgo", "") %>" onclick="return
strep(this);"><%= e.getName() %></a>
</td>
<td class="nav_pad"
align="right"><%=text.getMessage("numberFormat", e.getCount()) %></td>
@@ -395,10 +395,10 @@
if(i!=1) {%>
<tr><td colspan="2" class="nopad"><img
src="../images/pix.gif" width="100%" height="1" alt="" /></td></tr>
<% } %>
- <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%=query.getSourceParameters(e.getName())%>");'>
+ <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%="c=" +
query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix()%>");'>
<td class="nav_pad_icon">
<img src="../images/menu/nettsok.gif"
class="nav_icon" align="left" alt="" />
- <% String x = "?q=" + qURLEncoded + "&" +
query.getSourceParameters(e.getName()); %>
+ <% String x = "?q=" + qURLEncoded + "&" +
"c=" + query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix(); %>
<a href="<%=linkpulse.getUrl(x,
"category:navigation;subcategory:service_left", "sgo", "") %>" onclick="return
strep(this);"><%= e.getName() %></a>
</td>
<td class="nav_pad"
align="right"><%=text.getMessage("numberFormat", e.getCount()) %></td>
@@ -418,10 +418,10 @@
if(i!=1) {%>
<tr><td colspan="2" class="nopad"><img
src="../images/pix.gif" width="100%" height="1" alt="" /></td></tr>
<% } %>
- <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%=query.getSourceParameters(e.getName())%>");'>
+ <tr onmouseover="this.style.background='#E3DEE4';"
onmouseout="this.style.background='#F3F3F3';"
onclick='strepRollover("?q=<%=qURLEncoded%>&<%="c=" +
query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix()%>");'>
<td class="nav_pad_icon">
<img <% if
(e.getName().startsWith("Bedrifts")) { %> src="../images/menu/bedrift.gif" <% }
else if (e.getName().startsWith("Persons")) { %>
src="../images/menu/person.gif" <% } else if (e.getName().startsWith("Bildes"))
{ %> src="../images/menu/bilde.gif" <% } else if (e.getName().equals("Verden"))
{ %> src="../images/menu/nettsok.gif" <% } else if
(e.getName().startsWith("Nyhetss")) { %> src="../images/menu/nyheter.gif" <% }
else if (e.getName().startsWith("Netts")) { %> src="../images/menu/nettsok.gif"
<% } %> class="nav_icon" align="left" alt="" />
- <% String x = "?q=" + qURLEncoded +
"&" + query.getSourceParameters(e.getName()); %>
+ <% String x = "?q=" + qURLEncoded +
"&" + "c=" +
query.getSearchTab().getNavigationHint(e.getName()).getTab().getKey()
+query.getSearchTab().getNavigationHint(e.getName()).getUrlSuffix(); %>
<a href="<%=linkpulse.getUrl(x,
"category:navigation;subcategory:service_left", "sgo", "") %>" onclick="return
strep(this);"><%= e.getName() %></a>
</td>
<td class="nav_pad"
align="right"><%=text.getMessage("numberFormat", e.getCount()) %></td>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
