Skip to content

Commit

Permalink
Various fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@csrster
csrster committed Apr 16, 2018
1 parent cdc3d48 commit 9cdf68a
Show file tree
Hide file tree
Showing 4 changed files with 157 additions and 78 deletions.
22 changes: 16 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<version>1.0-SNAPSHOT</version>

<properties>
<nas.version>5.3-SNAPSHOT</nas.version>
<nas.version>5.4-SNAPSHOT</nas.version>
</properties>

<packaging>war</packaging>
Expand All @@ -25,14 +25,14 @@

<dependencies>
<dependency>
<groupId>org.netpreserve.openwayback</groupId>
<groupId>dk.netarchivesuite</groupId>
<artifactId>openwayback-core</artifactId>
<version>2.0.0</version>
<version>2.4.0-NAS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.netpreserve.openwayback</groupId>
<groupId>dk.netarchivesuite</groupId>
<artifactId>openwayback-webapp</artifactId>
<version>2.0.0</version>
<version>2.4.0-NAS-SNAPSHOT</version>
<type>war</type>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -63,6 +63,12 @@
<groupId>org.netarchivesuite</groupId>
<artifactId>archive-core</artifactId>
<version>${nas.version}</version>
<exclusions>
<exclusion>
<groupId>berkeleydb</groupId>
<artifactId>je</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.netarchivesuite</groupId>
Expand All @@ -77,6 +83,10 @@
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.netpreserve.openwayback</groupId>
<artifactId>openwayback-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand All @@ -91,7 +101,7 @@
<configuration>
<overlays>
<overlay>
<groupId>org.netpreserve.openwayback</groupId>
<groupId>dk.netarchivesuite</groupId>
<artifactId>openwayback-webapp</artifactId>
</overlay>
</overlays>
Expand Down
15 changes: 15 additions & 0 deletions src/main/resources/WaybackUI.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,21 @@ Exception.anchorWindowTooSmall.message=The Window Range specified does not match

UIGlobal.fullDate={0,date,H:mm:ss MMM d, yyyy}

#Date labels
UIGlobal.DateLabelNone=none
UIGlobal.DateLabelMinute=minute
UIGlobal.DateLabelDay=day
UIGlobal.DateLabelWeek=week
UIGlobal.DateLabelMonth=month
UIGlobal.DateLabelYear=year
UIGlobal.DateLabelYears=years

UIGlobal.loading=Loading...
UIGlobal.impatient=Impatient?
UIGlobal.previous=previous
UIGlobal.next=next
UIGlobal.homePage=OpenWayback home page

UIGlobal.pageTitle=Netarkivet OpenWayback
UIGlobal.helpLink=Help
UIGlobal.enterWebAddress=Enter Web Address:
Expand Down
54 changes: 54 additions & 0 deletions src/main/webapp/WEB-INF/ProxyReplay.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-init-method="init">

<bean id="localcdxcollection" class="org.archive.wayback.webapp.WaybackCollection">

<property name="resourceStore">
<bean class="dk.netarkivet.wayback.NetarchiveResourceStore">
<!-- <property name="prefix" value="/home/netarkiv/csr/apache-tomcat-6.0.16/webapps/arcrep" /> -->
</bean>
</property>


<property name="resourceIndex">

<bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
<property name="source">

<!--
<bean class="org.archive.wayback.resourceindex.CompositeSearchResultSource">
<property name="CDXSources">
<list>
<value>/data2/wayback_cdx_pligt/wayback.20150217-1707.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20150217-2141.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20150218-0241.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20150522-1528.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20150524-1711.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback_intermediate.index</value>
<value>/data2/wayback_cdx_pligt/wayback.index</value>
<value>/data2/wayback_cdx_pligt/wayback.20141126-1755.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20141126-2025.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20141126-2225.cdx</value>
<value>/data2/wayback_cdx_pligt/wayback.20141127-0055.cdx</value>
</list>
</bean>
-->
<bean class="org.archive.wayback.resourceindex.WatchedCDXSource">
<property name="recursive" value="false" />
<property name="filters">
<list>
<value>^wayback.*$</value>
</list>
</property>
</bean>
</property>

</bean>
</property>
<property name="maxRecords" value="80000" />
</bean>
</beans>
144 changes: 72 additions & 72 deletions src/main/webapp/WEB-INF/template/UI-header.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<%@ page import="org.archive.wayback.core.WaybackRequest" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%
UIResults results = UIResults.getGeneric(request);
WaybackRequest wbRequest = results.getWbRequest();
StringFormatter fmt = wbRequest.getFormatter();
UIResults results = UIResults.getGeneric(request);
WaybackRequest wbRequest = results.getWbRequest();
StringFormatter fmt = wbRequest.getFormatter();
String staticPrefix = results.getStaticPrefix();
String queryPrefix = results.getQueryPrefix();
String replayPrefix = results.getReplayPrefix();
String staticPrefix = results.getStaticPrefix();
String queryPrefix = results.getQueryPrefix();
String replayPrefix = results.getReplayPrefix();
%>
<!-- HEADER -->
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
<script type="text/javascript" src="<%= staticPrefix %>js/punify.js"></script>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<head>
<script type="text/javascript" src="<%= staticPrefix %>js/punify.js"></script>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />

<link rel="stylesheet" type="text/css"
href="<%= staticPrefix %>css/styles.css"
src="<%= staticPrefix %>css/styles.css" />
<title><%= fmt.format("UIGlobal.pageTitle") %></title>
<base target="_top" />
</head>
<link rel="stylesheet" type="text/css"
href="<%= staticPrefix %>css/styles.css"
src="<%= staticPrefix %>css/styles.css" />
<title><%= fmt.format("UIGlobal.pageTitle") %></title>
<base target="_top" />
</head>

<body bgcolor="white" alink="red" vlink="#0000aa" link="blue"
style="font-family: Arial; font-size: 10pt">
<body bgcolor="white" alink="red" vlink="#0000aa" link="blue"
style="font-family: Arial; font-size: 10pt">

<table width="100%" border="0" cellpadding="0" cellspacing="5">
<table width="100%" border="0" cellpadding="0" cellspacing="5">

<tr>
<tr>

<!-- WAYBACK LOGO -->
<!--
<!-- WAYBACK LOGO -->
<!--
<td width="26%"><a href="<%= staticPrefix %>"><img src="<%= staticPrefix %>images/wayback_logo_tr.gif" width="153" height="54" border="0"></a></td>
-->
<!-- /WAYBACK LOGO -->
<!-- /WAYBACK LOGO -->

<!-- COLLECTION-EMPTYLOGO -->
<!-- COLLECTION-EMPTYLOGO -->

<td width="70%" align="right"></td>
<td width="70%" align="right"></td>

<!-- /COLLECTION-EMPTY LOGO -->
<!-- /COLLECTION-EMPTY LOGO -->

</tr>
</tr>

<!-- GREEN BANNER -->
<tr>
<td colspan="2" height="30" align="center" class="mainSecHeadW">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<!-- GREEN BANNER -->
<tr>
<td colspan="2" height="30" align="center" class="mainSecHeadW">
<table width="100%" border="0" cellspacing="0" cellpadding="0">

<tr class="mainBColor">
<td colspan="2">
<table border="0" width="80%" align="center">
<tr class="mainBColor">
<td colspan="2">
<table border="0" width="80%" align="center">


<!-- URL FORM -->
<form action="<%= queryPrefix %>query" method="get">
<!-- URL FORM -->
<form action="<%= queryPrefix %>query" method="get">


<tr>
<td nowrap align="center"><img src="<%= staticPrefix %>images/shim.gif" width="1" height="20">
<tr>
<td nowrap align="center"><img src="<%= staticPrefix %>images/shim.gif" width="1" height="20">

<b class="mainBodyW">
<font size="2" color="#FFFFFF" face="Arial, Helvetica, sans-serif">
<%= fmt.format("UIGlobal.enterWebAddress") %>
</font>
<input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>">
<%-- <input type="text" id="dummy_domain" name="dummy" value="http://" size="24" maxlength="256" onchange="punifyDomain('dummy_domain','real_domain');">
<input type="hidden" id="real_domain" name="<%= WaybackRequest.REQUEST_URL %>">--%>
<input type="text" id="real_domain" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="24" maxlength="256" onchange="punifyDomain('real_domain','real_domain');" />
&nbsp;
</b>
<!--
<b class="mainBodyW">
<font size="2" color="#FFFFFF" face="Arial, Helvetica, sans-serif">
<%= fmt.format("UIGlobal.enterWebAddress") %>
</font>
<input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>">
<%-- <input type="text" id="dummy_domain" name="dummy" value="http://" size="24" maxlength="256" onchange="punifyDomain('dummy_domain','real_domain');">
<input type="hidden" id="real_domain" name="<%= WaybackRequest.REQUEST_URL %>">--%>
<input type="text" id="real_domain" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="24" maxlength="256" onchange="punifyDomain('real_domain','real_domain');" />
&nbsp;
</b>
<!--
<select name="<%= WaybackRequest.REQUEST_DATE %>" size="1">
<option value="" selected><%= fmt.format("UIGlobal.selectYearAll") %></option>
<option>2010</option>
Expand All @@ -96,27 +96,27 @@ String replayPrefix = results.getReplayPrefix();
<option>1996</option>
</select>
-->
&nbsp;
<input type="submit" name="Submit" value="<%= fmt.format("UIGlobal.urlSearchButton") %>" align="absMiddle" />
<!-- onclick="punifyDomain('real_domain','real_domain');" > -->
&nbsp;
<a href="<%= staticPrefix %>advanced_search.jsp" style="color:white;font-size:11px">
<%= fmt.format("UIGlobal.advancedSearchLink") %>
</a>

</td>
</tr>


</form>
<!-- /URL FORM -->

</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- /GREEN BANNER -->
</table>
&nbsp;
<input type="submit" name="Submit" value="<%= fmt.format("UIGlobal.urlSearchButton") %>" align="absMiddle" />
<!-- onclick="punifyDomain('real_domain','real_domain');" > -->
&nbsp;
<a href="<%= staticPrefix %>advanced_search.jsp" style="color:white;font-size:11px">
<%= fmt.format("UIGlobal.advancedSearchLink") %>
</a>

</td>
</tr>


</form>
<!-- /URL FORM -->

</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- /GREEN BANNER -->
</table>
<!-- /HEADER -->

0 comments on commit 9cdf68a

Please sign in to comment.