Menu
▾
▴
[Archive-access-cvs] archive-access/projects/nutch/src/web explain.jsp,NONE,1.1 header.jsp,1.1,1.2 search.jsp,1.24,1.25
|
From: Michael S. <sta...@us...> - 2005-11-12 03:08:45
|
Update of /cvsroot/archive-access/archive-access/projects/nutch/src/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16203/src/web Modified Files: header.jsp search.jsp Added Files: explain.jsp Log Message: * src/web/header.jsp * src/web/search.jsp * src/web/explain.jsp * src/web/en/include/header.html Make all inks relative, rather than absolute. Add here pages from nutch that have absolutes. Do this so can get content from webapp doing proxy passthrough. --- NEW FILE: explain.jsp --- <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="javax.servlet.*" import="javax.servlet.http.*" import="java.io.*" import="java.util.*" import="org.apache.nutch.searcher.*" %><% NutchBean bean = NutchBean.get(application); // set the character encoding to use when interpreting request values request.setCharacterEncoding("UTF-8"); bean.LOG.info("explain request from " + request.getRemoteAddr()); Hit hit = new Hit(Integer.parseInt(request.getParameter("idx")), Integer.parseInt(request.getParameter("id"))); HitDetails details = bean.getDetails(hit); Query query = Query.parse(request.getParameter("query")); String language = ResourceBundle.getBundle("org.nutch.jsp.explain", request.getLocale()) .getLocale().getLanguage(); String requestURI = HttpUtils.getRequestURL(request).toString(); %><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <% // To prevent the character encoding declared with 'contentType' page // directive from being overriden by JSTL (apache i18n), we freeze it // by flushing the output buffer. // see http://java.sun.com/developer/technicalArticles/Intl/MultilingualJSP/ out.flush(); %> <%@ taglib uri="http://jakarta.apache.org/taglibs/i18n" prefix="i18n" %> <i18n:bundle baseName="org.nutch.jsp.explain"/> <html lang="<%= language %>"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <head> <title>Nutch: <i18n:message key="title"/></title> <jsp:include page="/include/style.html"/> </head> <body> <jsp:include page="<%= language + "/include/header.html"%>"/> <h3><i18n:message key="page"/></h3> <%=bean.getDetails(hit).toHtml()%> <h3><i18n:message key="scoreForQuery"> <i18n:messageArg value="<%=query%>"/> </i18n:message> </h3> <%=bean.getExplanation(query, hit)%> <jsp:include page="/include/footer.html"/> </body> </html> Index: header.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/web/header.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** header.jsp 21 Apr 2005 06:45:37 -0000 1.1 --- header.jsp 12 Nov 2005 03:08:36 -0000 1.2 *************** *** 1 **** ! <table cellspacing="0" cellpadding="0" border="0" width="635"><tr><td rowspan="2" width="140" valign="bottom"><a href="/"><img border="0" src="<%=request.getContextPath()%>/img/logo.jpg"/></a><br class="br"/><br class="br"/></td></tr><tr><td align="left" valign="bottom" width="495"><table width="495" cellspacing="0" cellpadding="0" border="0"><tr><h4>Web Search</h4></tr></table></td></tr></table> --- 1 ---- ! <table cellspacing="0" cellpadding="0" border="0" width="635"><tr><td rowspan="2" width="140" valign="bottom"><a href="/"><img border="0" src="img/logo.jpg"/></a><br class="br"/><br class="br"/></td></tr><tr><td align="left" valign="bottom" width="495"><table width="495" cellspacing="0" cellpadding="0" border="0"><tr><h4>Web Search</h4></tr></table></td></tr></table> Index: search.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/web/search.jsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** search.jsp 4 Nov 2005 21:31:16 -0000 1.24 --- search.jsp 12 Nov 2005 03:08:36 -0000 1.25 *************** *** 97,106 **** .getLocale().getLanguage(); String requestURI = HttpUtils.getRequestURL(request).toString(); - String base = requestURI.substring(0, requestURI.lastIndexOf('/')); // URLEncoder.encode the queryString rather than just use htmlQueryString. // The former will take care of other than just html entities in case its // needed. ! String rss = request.getContextPath() + "/opensearch?query=" + URLEncoder.encode(queryString, "UTF-8") + "&hitsPerDup=" + hitsPerDup + ((start != 0)? "&start=" + start: "") + params; --- 97,105 ---- .getLocale().getLanguage(); String requestURI = HttpUtils.getRequestURL(request).toString(); // URLEncoder.encode the queryString rather than just use htmlQueryString. // The former will take care of other than just html entities in case its // needed. ! String rss = "/opensearch?query=" + URLEncoder.encode(queryString, "UTF-8") + "&hitsPerDup=" + hitsPerDup + ((start != 0)? "&start=" + start: "") + params; *************** *** 120,126 **** <head> <title>Internet Archive: <i18n:message key="title"/></title> ! <link rel="shortcut icon" href="<%=request.getContextPath()%>/images/logo-16.jpg" type="image/x-icon"/> <jsp:include page="/include/style.html"/> - <base href="<%= base + "/" + language %>/"> </head> --- 119,124 ---- <head> <title>Internet Archive: <i18n:message key="title"/></title> ! <link rel="shortcut icon" href="img/logo-16.jpg" type="image/x-icon"/> <jsp:include page="/include/style.html"/> </head> *************** *** 128,132 **** <jsp:include page="/header.jsp"/> ! <form name="search" action="<%=request.getContextPath()%>/search.jsp" method="get"> <input name="query" size=44 value="<%=htmlQueryString%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> --- 126,130 ---- <jsp:include page="/header.jsp"/> ! <form name="search" action="search.jsp" method="get"> <input name="query" size=44 value="<%=htmlQueryString%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> *************** *** 217,225 **** +"&start="+start+"&hitsPerPage="+hitsPerPage+"&hitsPerDup="+0; %> - ! <a href="<%=request.getContextPath()%>/search.jsp?<%=more%>"><i18n:message key="moreFrom"/> <%=hit.getDedupValue()%></a> <% } %> - ! <a href="<%=request.getContextPath()%>/explain.jsp?<%=id%>&query=<%=URLEncoder.encode(queryString)%>">explain</a> </small> <br><br> --- 215,223 ---- +"&start="+start+"&hitsPerPage="+hitsPerPage+"&hitsPerDup="+0; %> - ! <a href="search.jsp?<%=more%>"><i18n:message key="moreFrom"/> <%=hit.getDedupValue()%></a> <% } %> - ! <a href="explain.jsp?<%=id%>&query=<%=URLEncoder.encode(queryString)%>">explain</a> </small> <br><br> *************** *** 231,235 **** || (!hits.totalIsExact() && (hits.getLength() > start+hitsPerPage))) { %> ! <form name="search" action="<%=request.getContextPath()%>/search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> <input type="hidden" name="start" value="<%=end%>"> --- 229,233 ---- || (!hits.totalIsExact() && (hits.getLength() > start+hitsPerPage))) { %> ! <form name="search" action="search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> <input type="hidden" name="start" value="<%=end%>"> *************** *** 248,252 **** if ((!hits.totalIsExact() && (hits.getLength() <= start+hitsPerPage))) { %> ! <form name="search" action="<%=request.getContextPath()%>/search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> --- 246,250 ---- if ((!hits.totalIsExact() && (hits.getLength() <= start+hitsPerPage))) { %> ! <form name="search" action="search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> *************** *** 269,273 **** <p> <a href="http://www.nutch.org/"> ! <img border="0" src="<%=request.getContextPath()%>/img/poweredbynutch_01.gif"> </a> </p> --- 267,271 ---- <p> <a href="http://www.nutch.org/"> ! <img border="0" src="img/poweredbynutch_01.gif"> </a> </p> |
