Author: ssmiweve Date: 2008-07-24 22:44:51 +0200 (Thu, 24 Jul 2008) New Revision: 6753
Modified: trunk/ trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp Log: Merged revisions 6743,6745,6747,6751-6752 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.17 ........ r6743 | ssmiweve | 2008-07-21 15:30:15 +0200 (Mon, 21 Jul 2008) | 2 lines xhtml transitional validation errors ........ r6745 | ssmiweve | 2008-07-21 16:39:00 +0200 (Mon, 21 Jul 2008) | 2 lines xhtml transitional validation errors ........ r6747 | ssmiweve | 2008-07-21 16:54:05 +0200 (Mon, 21 Jul 2008) | 2 lines firefox-3 error ........ r6751 | ssmiweve | 2008-07-24 18:53:12 +0200 (Thu, 24 Jul 2008) | 2 lines *now* it works on firefox-3 ........ r6752 | ssmiweve | 2008-07-24 22:36:36 +0200 (Thu, 24 Jul 2008) | 1 line Issue SKER4938: (OverturePPCSearchCommand must support serverUrl parameter) ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6724 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6752 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java 2008-07-24 20:36:36 UTC (rev 6752) +++ trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java 2008-07-24 20:44:51 UTC (rev 6753) @@ -118,6 +118,7 @@ * @return Returns the request url used for the ppc ads. */ protected String createRequestURL() { + final OverturePpcCommandConfig ppcConfig = (OverturePpcCommandConfig) context.getSearchConfiguration(); @@ -130,10 +131,15 @@ url.append("&type=" + ppcConfig.getType()); } + final String serveUrl = "http://"; + datamodel.getSite().getSite().getName() + "/search/"; + url.append("&Keywords="); url.append(URLEncoder.encode(getTransformedQuery().replace(' ', '+'), ppcConfig.getEncoding())); url.append("&maxCount="); url.append(getResultsToReturn()); + url.append("&serveUrl="); + url.append(URLEncoder.encode(serveUrl.toString(), "UTF-8")); + url.append("&" + getAffilDataParameter()); } catch (UnsupportedEncodingException e) { Modified: trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp =================================================================== --- trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp 2008-07-24 20:36:36 UTC (rev 6752) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp 2008-07-24 20:44:51 UTC (rev 6753) @@ -18,43 +18,43 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with SESAT. If not, see <http://www.gnu.org/licenses/>. + * along with SESAT. If not, see <http://www.gnu.org/licenses />. * Document : globalSearch Created on : 7/03/2008, 10:27:24 Author : mick Version : $Id$ --> - <c:set var="commandName" value="globalSearch"/> + <c:set var="commandName" value="globalSearch" /> <c:choose> <c:when test="${DataModel.searches[commandName].results.hitCount gt 0}"> <div id="resultlist"> <div id="resultHits"> - <c:set var="msg_international_icon_alt"><search:text key="international_icon_alt"/></c:set> - <img src="/images/international_icon.png" width="16" height="16" alt="${msg_international_icon_alt}"/> + <c:set var="msg_international_icon_alt"><search:text key="international_icon_alt" /></c:set> + <img src="/images/international_icon.png" width="16" height="16" alt="${msg_international_icon_alt}" /> <span> <search:text key="international_search_results" arg0="${DataModel.navigation.navigations.offset.fields.currentPageFromCount}" arg1="${DataModel.navigation.navigations.offset.fields.currentPageToCount}" arg2="${DataModel.searches[commandName].results.hitCount}" - arg3="${DataModel.query.xmlEscaped}"/> + arg3="${DataModel.query.xmlEscaped}" /> </span> </div> <c:forEach items="${DataModel.searches[commandName].results.results}" var="item" varStatus="loop"> - <c:set var="i" value="${loop.count}"/> - <c:set var="pos" value="${DataModel.navigation.navigations.offset.fields.currentPageFromCount + i}"/> + <c:set var="i" value="${loop.count}" /> + <c:set var="pos" value="${DataModel.navigation.navigations.offset.fields.currentPageFromCount + i}" /> <p id="p${i}"> - <img class="search_big_url_icon" src="http://${item.fields.site}/favicon.ico"; width="16" height="16"/> + <img class="search_big_url_icon" src="http://${item.fields.site}/favicon.ico"; width="16" height="16" alt="" /> <jsp:text><![CDATA[ ]]></jsp:text> - <c:set var="item_href"><search:boomerang url="${item.fields.clickurl}" param="category:results;pos:${pos}"/></c:set> + <c:set var="item_href"><search:boomerang url="${item.fields.clickurl}" param="category:results;pos:${pos}" /></c:set> <a href="${item_href}" class="search_big_url">${item.fields.title}</a> - <br/> + <br /> <c:if test="${not empty item.fields.fileformat}"> - <span class="timestamp"><search:text key="fileformat_${item.fields.fileformat}"/></span> + <span class="timestamp" ><search:text key="fileformat_${item.fields.fileformat}" /></span> </c:if> <c:if test="${not empty item.fields.body}"> <span class="search_summary">${item.fields.body}</span> @@ -66,16 +66,21 @@ <!-- More hits from --> <c:if test="${empty $DataModel.parameters.values.moreHits}"> - - <c:set var="moreHits_href"><search:boomerang url="/search/?c=${tab.key}&q=${DataModel.searches[commandName].query.utf8UrlEncoded}+site%3A${item.fields.site}&moreHits=true" param="category:results;pos:${pos}"/></c:set> - <a href="${moreHits_href}" class="more_hits_link"><search:text key="moreHitsFrom"/></a> + <c:set var="moreHits_href"><search:boomerang url="/search/?c=${tab.key}&q=${DataModel.searches[commandName].query.utf8UrlEncoded}+site%3A${item.fields.site}&moreHits=true" param="category:results;pos:${pos}" /></c:set> + <jsp:element name="a"> + <jsp:attribute name="href"><c:out value="${moreHits_href}" escapeXml="true"/></jsp:attribute> + <jsp:attribute name="class">more_hits_link</jsp:attribute> + <jsp:body><search:text key="moreHitsFrom" /></jsp:body> + </jsp:element> + </c:if> <!-- To website's front page --> - <c:set var="site" value="http://${item.fields.site}"/> + <c:set var="site" value="http://${item.fields.site}"; /> <c:if test="${site ne item.fields.url}"> - - <c:set var="goTopDomain_href"><search:boomerang url="http://${item.fields.site}/"; param="category:navigation;subcategory:site;pos:${pos}"/></c:set> - <a href="${goTopDomain_href}" class="search_big_url"><search:text key="goTopDomain"/></a> + <c:set var="goTopDomain_href"><search:boomerang url="http://${item.fields.site}/"; param="category:navigation;subcategory:site;pos:${pos}" /></c:set> + <a href="${goTopDomain_href}" class="search_big_url"><search:text key="goTopDomain" /></a> </c:if> </span> </p> @@ -85,7 +90,7 @@ </c:when> <c:otherwise> - <search:include include="no-hits" /> + <search:include include="no-hits" /> </c:otherwise> </c:choose> Modified: trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp =================================================================== --- trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp 2008-07-24 20:36:36 UTC (rev 6752) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp 2008-07-24 20:44:51 UTC (rev 6753) @@ -28,39 +28,39 @@ <!-- Rss --> <c:set var="msg_rss_link"><search:text key="rss_link"/></c:set> -<link rel="alternate" type="application/rss+xml" title="${msg_rss_link}" href=""/> +<link rel="alternate" type="application/rss+xml" title="${msg_rss_link}" href=""><![CDATA[ ]]></link> <!-- Css --> <c:forEach var="ww" items="${tab.css}"> <c:set var="ww_link"><search:findResource url="/css/tab/${ww.id}.css"/></c:set> <c:if test="${not empty ww_link}"> - <link rel="stylesheet" type="text/css" href="${ww_link}" media="screen"/> + <link rel="stylesheet" type="text/css" href="${ww_link}" media="screen"><![CDATA[ ]]></link> </c:if> </c:forEach> <c:forEach var="w" items="${tab.ancestry}"> <c:set var="w_link"><search:findResource url="/css/tab/${w.id}.css"/></c:set> - <c:if test="${not empty w_link}"> - <link rel="stylesheet" type="text/css" href="${w_link}" media="screen"/> + <c:if test="${not empty w_link and w_link ne 'null'}"> + <link rel="stylesheet" type="text/css" href="${w_link}" media="screen"><![CDATA[ ]]></link> </c:if> </c:forEach> <c:set var="w_link"><search:findResource url="/css/print.css"/></c:set> <link rel="stylesheet" type="text/css" href="${w_link}" media="print"/> <!-- Page Icons --> -<link rel="icon" href="/images/favicon.gif" type="image/x-icon" /> -<link rel="shortcut icon" href="/images/favicon.gif" type="image/x-icon" /> +<link rel="icon" href="/images/favicon.gif" type="image/x-icon" ><![CDATA[ ]]></link> +<link rel="shortcut icon" href="/images/favicon.gif" type="image/x-icon" ><![CDATA[ ]]></link> <!-- OpenSearch --> -<link rel="search" type="application/opensearchdescription+xml" title="Sesam.com" href="/search/?q=*&#38;c=${tab.key}&#38;layout=opensearch"/> +<jsp:text><![CDATA[<link rel="search" type="application/opensearchdescription+xml" title="Sesam.com" href="/search/?q=*&c=${tab.key}&output=opensearch"> </link>]]></jsp:text> <!-- JavaScript --> <c:set var="js_link"><search:findResource url="/javascript/common.js"/></c:set> -<script type='text/javascript' src="${js_link}"></script> +<script type='text/javascript' src="${js_link}"><![CDATA[ ]]></script> <c:forEach var="js" items="${tab.javascript}"> <c:set var="js_link"><search:findResource url="/javascript/${js}.js"/></c:set> <c:if test="${not empty js_link}"> - <script type='text/javascript' src="${js_link}"></script> + <script type='text/javascript' src="${js_link}"><![CDATA[ ]]></script> </c:if> </c:forEach> Modified: trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp =================================================================== --- trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp 2008-07-24 20:36:36 UTC (rev 6752) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp 2008-07-24 20:44:51 UTC (rev 6753) @@ -25,7 +25,7 @@ --> <div class="clearEl"><jsp:text><![CDATA[ ]]></jsp:text></div> <c:set var="link_action"><search:boomerang url="/search/" param="category:search;subcategory:bottom"/></c:set> -<form name="sf" id="sf" action="${link_action}"> +<form name="sf" id="sf-bottom" action="${link_action}"> <c:set var="img_inputButton"><search:findResource url="/images/search_button.png"/></c:set> <input type="text" id="inputBox" name="q" size="60" value="${DataModel.query.xmlEscaped}"/> <input type="image" id="inputButton" src="${img_inputButton}"/> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
