From: <bra...@us...> - 2008-07-21 23:19:10
|
Revision: 2463 http://archive-access.svn.sourceforge.net/archive-access/?rev=2463&view=rev Author: bradtofel Date: 2008-07-21 23:19:17 +0000 (Mon, 21 Jul 2008) Log Message: ----------- MOVE: webapp/query -> webapp/WEB-INF/query Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLCaptureResults.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLUrlResults.jsp Removed Paths: ------------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp 2008-07-02 00:25:15 UTC (rev 2388) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -1,174 +0,0 @@ -<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%> -<%@ page import="java.util.ArrayList" %> -<%@ page import="java.util.Date" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="java.text.ParseException" %> -<%@ page import="org.archive.wayback.WaybackConstants" %> -<%@ page import="org.archive.wayback.core.CaptureSearchResult" %> -<%@ page import="org.archive.wayback.core.Timestamp" %> -<%@ page import="org.archive.wayback.core.UIResults" %> -<%@ page import="org.archive.wayback.query.UICaptureQueryResults" %> -<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartitionsFactory" %> -<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartition" %> -<%@ page import="org.archive.wayback.util.StringFormatter" %> -<jsp:include page="/template/UI-header.jsp" flush="true" /> -<% - -UICaptureQueryResults results = (UICaptureQueryResults) UIResults.getFromRequest(request); -StringFormatter fmt = results.getFormatter(); -String searchString = results.getSearchUrl(); - -Date searchStartDate = results.getStartTimestamp().getDate(); -Date searchEndDate = results.getEndTimestamp().getDate(); -long firstResult = results.getFirstResult(); -long lastResult = results.getLastResult(); -long resultCount = results.getResultsMatching(); - -//Timestamp searchStartTs = results.getStartTimestamp(); -//Timestamp searchEndTs = results.getEndTimestamp(); -//String prettySearchStart = results.prettyDateFull(searchStartTs.getDate()); -//String prettySearchEnd = results.prettyDateFull(searchEndTs.getDate()); - -ArrayList<ResultsPartition> partitions = ResultsPartitionsFactory.get( - results.getResults(),results.getWbRequest()); -int numPartitions = partitions.size(); -%> -<table border="0" cellpadding="5" width="100%" class="mainSearchBanner" cellspacing="0"> - <tr> - <td> - <%= fmt.format("PathQueryClassic.searchedFor",searchString) %> - </td> - <td align="right"> - <%= fmt.format("PathQueryClassic.resultsSummary",resultCount) %> - </td> - </tr> -</table> -<br> - - -<table border="0" width="100%"> - <tr bgcolor="#CCCCCC"> - <td colspan="<%= numPartitions %>" align="center" class="mainCalendar"> - <%= fmt.format("PathQueryClassic.searchResults",searchStartDate,searchEndDate) %> - </td> - </tr> - -<!-- RESULT COLUMN HEADERS --> - <tr bgcolor="#CCCCCC"> -<% - for(int i = 0; i < numPartitions; i++) { - ResultsPartition partition = partitions.get(i); -%> - <td align="center" class="mainBigBody"> - <%= partition.getTitle() %> - </td> -<% - } -%> - </tr> -<!-- /RESULT COLUMN HEADERS --> - - - -<!-- RESULT COLUMN COUNTS --> - <tr bgcolor="#CCCCCC"> -<% - for(int i = 0; i < numPartitions; i++) { - ResultsPartition partition = (ResultsPartition) partitions.get(i); -%> - <td align="center" class="mainBigBody"> - <%= fmt.format("ResultPartition.columnSummary",partition.resultsCount()) %> - </td> -<% - } -%> - </tr> -<!-- /RESULT COLUMN COUNTS --> - - -<!-- RESULT COLUMN DATA --> - <tr bgcolor="#EBEBEB"> -<% - boolean first = false; - String lastMD5 = null; - - for(int i = 0; i < numPartitions; i++) { - ResultsPartition partition = (ResultsPartition) partitions.get(i); - ArrayList<CaptureSearchResult> partitionResults = partition.getMatches(); -%> - <td nowrap class="mainBody" valign="top"> -<% - if(partitionResults.size() == 0) { -%> - -<% - } else { - - for(int j = 0; j < partitionResults.size(); j++) { - - CaptureSearchResult result = partitionResults.get(j); - String url = result.getUrlKey(); - String captureDate = result.getCaptureTimestamp(); - Timestamp captureTS = Timestamp.parseBefore(captureDate); - String prettyDate = fmt.format("PathQuery.classicResultLinkText", - captureTS.getDate()); - String origHost = result.getOriginalHost(); - String MD5 = result.getDigest(); - String redirectFlag = (0 == result.getRedirectUrl().compareTo("-")) - ? "" : fmt.format("PathPrefixQuery.redirectIndicator"); - String httpResponse = result.getHttpCode(); - String mimeType = result.getMimeType(); - - String arcFile = result.getFile(); - String arcOffset = String.valueOf(result.getOffset()); - - String replayUrl = results.resultToReplayUrl(result); - - boolean updated = false; - if(lastMD5 == null) { - lastMD5 = MD5; - updated = true; - } else if(0 != lastMD5.compareTo(MD5)) { - updated = true; - lastMD5 = MD5; - } - String updateStar = updated ? "*" : ""; -%> - <a href="<%= replayUrl %>"><%= prettyDate %></a> <%= updateStar %><br></br> -<% - - } - - } -%> - </td> -<% - } - -%> - </tr> -<!-- /RESULT COLUMN DATA --> -</table> - - -<% -// show page indicators: -if(results.getNumPages() > 1) { - int curPage = results.getCurPage(); - %> - <hr></hr> - <% - for(int i = 1; i <= results.getNumPages(); i++) { - if(i == curPage) { - %> - <b><%= i %></b> - <% - } else { - %> - <a href="<%= results.urlForPage(i) %>"><%= i %></a> - <% - } - } -} -%> -<jsp:include page="/template/UI-footer.jsp" flush="true" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -0,0 +1,180 @@ +<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.Date" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.text.ParseException" %> +<%@ page import="org.archive.wayback.WaybackConstants" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResult" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResults" %> +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.core.WaybackRequest" %> +<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartitionsFactory" %> +<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartition" %> +<%@ page import="org.archive.wayback.util.StringFormatter" %> +<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" /> +<jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" /> +<% +UIResults results = UIResults.extractCaptureQuery(request); + +WaybackRequest wbRequest = results.getWbRequest(); +CaptureSearchResults cResults = results.getCaptureResults(); +StringFormatter fmt = wbRequest.getFormatter(); +String searchString = wbRequest.getRequestUrl(); + + +Date searchStartDate = wbRequest.getStartDate(); +Date searchEndDate = wbRequest.getEndDate(); +long firstResult = cResults.getFirstReturned(); +long lastResult = cResults.getReturnedCount() + firstResult; +long resultCount = cResults.getMatchingCount(); + +ArrayList<ResultsPartition> partitions = + ResultsPartitionsFactory.get(cResults, wbRequest); +int numPartitions = partitions.size(); +%> +<table border="0" cellpadding="5" width="100%" class="mainSearchBanner" cellspacing="0"> + <tr> + <td> + <%= fmt.format("PathQueryClassic.searchedFor",searchString) %> + </td> + <td align="right"> + <select onchange="SetAnchorWindow(this.value)"> + <option value="86400">1 day</option> + <option value="604800">1 week</option> + <option value="2592000">1 month</option> + <option value="31536000">1 year</option> + <option value="315360000">10 years</option> + </select> + <%= fmt.format("PathQueryClassic.resultsSummary",resultCount) %> + </td> + </tr> +</table> +<br> + + +<table border="0" width="100%"> + <tr bgcolor="#CCCCCC"> + <td colspan="<%= numPartitions %>" align="center" class="mainCalendar"> + <%= fmt.format("PathQueryClassic.searchResults",searchStartDate,searchEndDate) %> + </td> + </tr> + +<!-- RESULT COLUMN HEADERS --> + <tr bgcolor="#CCCCCC"> +<% + for(int i = 0; i < numPartitions; i++) { + ResultsPartition partition = partitions.get(i); +%> + <td align="center" class="mainBigBody"> + <%= partition.getTitle() %> + </td> +<% + } +%> + </tr> +<!-- /RESULT COLUMN HEADERS --> + + + +<!-- RESULT COLUMN COUNTS --> + <tr bgcolor="#CCCCCC"> +<% + for(int i = 0; i < numPartitions; i++) { + ResultsPartition partition = (ResultsPartition) partitions.get(i); +%> + <td align="center" class="mainBigBody"> + <%= fmt.format("ResultPartition.columnSummary",partition.resultsCount()) %> + </td> +<% + } +%> + </tr> +<!-- /RESULT COLUMN COUNTS --> + + +<!-- RESULT COLUMN DATA --> + <tr bgcolor="#EBEBEB"> +<% + boolean first = false; + String lastMD5 = null; + + for(int i = 0; i < numPartitions; i++) { + ResultsPartition partition = (ResultsPartition) partitions.get(i); + ArrayList<CaptureSearchResult> partitionResults = partition.getMatches(); +%> + <td nowrap class="mainBody" valign="top"> +<% + if(partitionResults.size() == 0) { +%> + +<% + } else { + + for(int j = 0; j < partitionResults.size(); j++) { + + CaptureSearchResult result = partitionResults.get(j); + String url = result.getUrlKey(); + String captureTimestamp = result.getCaptureTimestamp(); + Date captureDate = result.getCaptureDate(); + String prettyDate = fmt.format("PathQuery.classicResultLinkText", + captureDate); + String origHost = result.getOriginalHost(); + String MD5 = result.getDigest(); + String redirectFlag = (0 == result.getRedirectUrl().compareTo("-")) + ? "" : fmt.format("PathPrefixQuery.redirectIndicator"); + String httpResponse = result.getHttpCode(); + String mimeType = result.getMimeType(); + + String arcFile = result.getFile(); + String arcOffset = String.valueOf(result.getOffset()); + + String replayUrl = results.resultToReplayUrl(result); + + boolean updated = false; + if(lastMD5 == null) { + lastMD5 = MD5; + updated = true; + } else if(0 != lastMD5.compareTo(MD5)) { + updated = true; + lastMD5 = MD5; + } + String updateStar = updated ? "*" : ""; +%> + <a onclick="SetAnchorDate('<%= captureTimestamp %>');" href="<%= replayUrl %>"><%= prettyDate %></a> <%= updateStar %><br></br> +<% + + } + + } +%> + </td> +<% + } + +%> + </tr> +<!-- /RESULT COLUMN DATA --> +</table> + + +<% +// show page indicators: +if(cResults.getNumPages() > 1) { + int curPage = cResults.getCurPageNum(); + %> + <hr></hr> + <% + for(int i = 1; i <= cResults.getNumPages(); i++) { + if(i == curPage) { + %> + <b><%= i %></b> + <% + } else { + %> + <a href="<%= results.urlForPage(i) %>"><%= i %></a> + <% + } + } +} +%> +<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -0,0 +1,113 @@ +<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.Date" %> +<%@ page import="org.archive.wayback.WaybackConstants" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResult" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResults" %> +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.core.WaybackRequest" %> +<%@ page import="org.archive.wayback.util.StringFormatter" %> +<jsp:include page="/template/UI-header.jsp" flush="true" /> +<% + +UIResults results = UIResults.extractCaptureQuery(request); +WaybackRequest wbRequest = results.getWbRequest(); +CaptureSearchResults cResults = results.getCaptureResults(); +StringFormatter fmt = wbRequest.getFormatter(); + +String searchString = wbRequest.getRequestUrl(); + +long resultCount = cResults.getReturnedCount(); +Date searchStartDate = wbRequest.getStartDate(); +Date searchEndDate = wbRequest.getEndDate(); + +Iterator<CaptureSearchResult> itr = cResults.iterator(); +%> + <%= fmt.format("PathQuery.resultsSummary",resultCount,searchString) %> + <br></br> + <%= fmt.format("PathQuery.resultRange",searchStartDate,searchEndDate) %> + <hr></hr> + <% + boolean first = false; + String lastMD5 = null; + while(itr.hasNext()) { + CaptureSearchResult result = (CaptureSearchResult) itr.next(); + + String url = result.getUrlKey(); + + String prettyDate = result.getCaptureTimestamp(); + String origHost = result.getOriginalHost(); + String MD5 = result.getDigest(); + String redirectFlag = (0 == result.getRedirectUrl().compareTo("-")) + ? "" : fmt.format("PathQuery.redirectIndicator"); + String httpResponse = result.getHttpCode(); + String mimeType = result.getMimeType(); + + String arcFile = result.getFile(); + String arcOffset = String.valueOf(result.getOffset()); + + String replayUrl = results.resultToReplayUrl(result); + + boolean updated = false; + if(lastMD5 == null) { + lastMD5 = MD5; + updated = true; + } else if(0 != lastMD5.compareTo(MD5)) { + updated = true; + lastMD5 = MD5; + } + if(updated) { + %> + <a href="<%= replayUrl %>"><%= prettyDate %></a> + <span style="color:black;"><%= origHost %></span> + <span style="color:gray;"><%= httpResponse %></span> + <span style="color:brown;"><%= mimeType %></span> + <!-- + <span style="color:red;"><%= arcFile %></span> + <span style="color:red;"><%= arcOffset %></span> + --> + <%= redirectFlag %> + <%= fmt.format("PathQuery.newVersionIndicator") %> + + <br/> + <% + } else { + %> + <a href="<%= replayUrl %>"><%= prettyDate %></a> + <span style="color:green;"><%= origHost %></span> + <!-- + <span style="color:red;"><%= arcFile %></span> + <span style="color:red;"><%= arcOffset %></span> + --> + <br/> + <% + } + } + +// show page indicators: +int curPage = cResults.getCurPageNum(); +if(curPage > cResults.getNumPages()) { + %> + <hr></hr> + <a href="<%= results.urlForPage(1) %>">First results</a> + <% +} else if(cResults.getNumPages() > 1) { + %> + <hr></hr> + <% + for(int i = 1; i <= cResults.getNumPages(); i++) { + if(i == curPage) { + %> + <b><%= i %></b> + <% + } else { + %> + <a href="<%= results.urlForPage(i) %>"><%= i %></a> + <% + } + } +} +%> + +<jsp:include page="/template/UI-footer.jsp" flush="true" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -0,0 +1,117 @@ +<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.Date" %> +<%@ page import="org.archive.wayback.ResultURIConverter" %> +<%@ page import="org.archive.wayback.WaybackConstants" %> +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.core.UrlSearchResult" %> +<%@ page import="org.archive.wayback.core.UrlSearchResults" %> +<%@ page import="org.archive.wayback.core.WaybackRequest" %> +<%@ page import="org.archive.wayback.util.StringFormatter" %> +<jsp:include page="/template/UI-header.jsp" flush="true" /> +<% + +UIResults results = UIResults.extractUrlQuery(request); +WaybackRequest wbRequest = results.getWbRequest(); +UrlSearchResults uResults = results.getUrlResults(); +ResultURIConverter uriConverter = results.getURIConverter(); +StringFormatter fmt = wbRequest.getFormatter(); + +String searchString = wbRequest.getRequestUrl(); + + + +Date searchStartDate = wbRequest.getStartDate(); +Date searchEndDate = wbRequest.getEndDate(); + +long firstResult = uResults.getFirstReturned(); +long resultCount = uResults.getReturnedCount(); +long lastResult = resultCount + firstResult; + +long totalCaptures = uResults.getMatchingCount(); + +%> +<%= fmt.format("PathPrefixQuery.showingResults",firstResult,lastResult, + resultCount,searchString) %> +<br/> + +<hr></hr> +<% +Iterator<UrlSearchResult> itr = uResults.iterator(); +while(itr.hasNext()) { + UrlSearchResult result = itr.next(); + + String urlKey = result.getUrlKey(); + String originalUrl = result.getOriginalUrl(); + String firstDateTSss = result.getFirstCaptureTimestamp(); + String lastDateTSss = result.getLastCaptureTimestamp(); + long numCaptures = result.getNumCaptures(); + long numVersions = result.getNumVersions(); + + Date firstDate = result.getFirstCaptureDate(); + Date lastDate = result.getLastCaptureDate(); + + if(numCaptures == 1) { + String ts = result.getFirstCaptureTimestamp(); + String anchor = uriConverter.makeReplayURI(ts,originalUrl); + %> + <a href="<%= anchor %>"> + <%= urlKey %> + </a> + <span class="mainSearchText"> + <%= fmt.format("PathPrefixQuery.versionCount",numVersions) %> + </span> + <br/> + <span class="mainSearchText"> + <%= fmt.format("PathPrefixQuery.singleCaptureDate",firstDate) %> + </span> + <% + + } else { + String anchor = results.makeCaptureQueryUrl(originalUrl); + %> + <a href="<%= anchor %>"> + <%= urlKey %> + </a> + <span class="mainSearchText"> + <%= fmt.format("PathPrefixQuery.versionCount",numVersions) %> + </span> + <br/> + <span class="mainSearchText"> + <%= fmt.format("PathPrefixQuery.multiCaptureDate",numCaptures,firstDate,lastDate) %> + </span> + <% + } + %> + <br/> + <br/> + <% +} + +// show page indicators: +int curPage = uResults.getCurPageNum(); +if(curPage > uResults.getNumPages()) { + %> + <hr></hr> + <a href="<%= results.urlForPage(1) %>">First results</a> + <% +} else if(uResults.getNumPages() > 1) { + %> + <hr></hr> + <% + for(int i = 1; i <= uResults.getNumPages(); i++) { + if(i == curPage) { + %> + <b><%= i %></b> + <% + } else { + %> + <a href="<%= results.urlForPage(i) %>"><%= i %></a> + <% + } + } +} +%> + +<jsp:include page="/template/UI-footer.jsp" flush="true" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLCaptureResults.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLCaptureResults.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLCaptureResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Enumeration" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResult" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResults" %> +<%@ page import="org.archive.wayback.core.SearchResults" %> +<%@ page import="org.archive.wayback.core.UIResults" %> +<% +UIResults uiResults = UIResults.extractCaptureQuery(request); + +CaptureSearchResults results = uiResults.getCaptureResults(); +Iterator<CaptureSearchResult> itr = results.iterator(); +%> +<wayback> + <request> +<% + Map<String,String> p = results.getFilters(); + Iterator<String> kitr = p.keySet().iterator(); + while(kitr.hasNext()) { + String key = kitr.next(); + String oKey = UIResults.encodeXMLEntity(key); + String oValue = UIResults.encodeXMLContent(p.get(key)); + %> + <<%= oKey %>><%= oValue %></<%= oKey %>> + <% + } +%> + <<%= SearchResults.RESULTS_TYPE %>><%= SearchResults.RESULTS_TYPE_CAPTURE %></<%= SearchResults.RESULTS_TYPE %>> + </request> + <results> +<% + while(itr.hasNext()) { + %> + <result> + <% + CaptureSearchResult result = itr.next(); + Map<String,String> p2 = result.toCanonicalStringMap(); + kitr = p2.keySet().iterator(); + + while(kitr.hasNext()) { + String key = kitr.next(); + String oKey = UIResults.encodeXMLEntity(key); + String oValue = UIResults.encodeXMLContent(p2.get(key)); + %> + <<%= oKey %>><%= oValue %></<%= oKey %>> + <% + } + %> + </result> + <% + } +%> + </results> +</wayback> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLUrlResults.jsp (from rev 2447, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLUrlResults.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLUrlResults.jsp 2008-07-21 23:19:17 UTC (rev 2463) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Enumeration" %> +<%@ page import="org.archive.wayback.core.SearchResults" %> +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.core.UrlSearchResults" %> +<%@ page import="org.archive.wayback.core.UrlSearchResult" %> +<% +UIResults uiResults = UIResults.extractUrlQuery(request); + +UrlSearchResults results = uiResults.getUrlResults(); +Iterator<UrlSearchResult> itr = results.iterator(); +%> +<wayback> + <request> +<% + Map<String,String> p = results.getFilters(); + Iterator<String> kitr = p.keySet().iterator(); + while(kitr.hasNext()) { + String key = kitr.next(); + String oKey = UIResults.encodeXMLEntity(key); + String oValue = UIResults.encodeXMLContent(p.get(key)); + %> + <<%= oKey %>><%= oValue %></<%= oKey %>> + <% + } +%> + <<%= SearchResults.RESULTS_TYPE %>><%= SearchResults.RESULTS_TYPE_URL %></<%= SearchResults.RESULTS_TYPE %>> + </request> + <results> +<% + while(itr.hasNext()) { + %> + <result> + <% + UrlSearchResult result = itr.next(); + Map<String,String> p2 = result.toCanonicalStringMap(); + kitr = p2.keySet().iterator(); + + while(kitr.hasNext()) { + String key = kitr.next(); + String oKey = UIResults.encodeXMLEntity(key); + String oValue = UIResults.encodeXMLContent(p2.get(key)); + %> + <<%= oKey %>><%= oValue %></<%= oKey %>> + <% + } + %> + </result> + <% + } +%> + </results> +</wayback> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |