Menu
▾
▴
archive-access-cvs — CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(10) |
Sep
(36) |
Oct
(339) |
Nov
(103) |
Dec
(152) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(141) |
Feb
(102) |
Mar
(125) |
Apr
(203) |
May
(57) |
Jun
(30) |
Jul
(139) |
Aug
(46) |
Sep
(64) |
Oct
(105) |
Nov
(34) |
Dec
(162) |
| 2007 |
Jan
(81) |
Feb
(57) |
Mar
(141) |
Apr
(72) |
May
(9) |
Jun
(1) |
Jul
(144) |
Aug
(88) |
Sep
(40) |
Oct
(43) |
Nov
(34) |
Dec
(20) |
| 2008 |
Jan
(44) |
Feb
(45) |
Mar
(16) |
Apr
(36) |
May
(8) |
Jun
(77) |
Jul
(177) |
Aug
(66) |
Sep
(8) |
Oct
(33) |
Nov
(13) |
Dec
(37) |
| 2009 |
Jan
(2) |
Feb
(5) |
Mar
(8) |
Apr
|
May
(36) |
Jun
(19) |
Jul
(46) |
Aug
(8) |
Sep
(1) |
Oct
(66) |
Nov
(61) |
Dec
(10) |
| 2010 |
Jan
(13) |
Feb
(16) |
Mar
(38) |
Apr
(76) |
May
(47) |
Jun
(32) |
Jul
(35) |
Aug
(45) |
Sep
(20) |
Oct
(61) |
Nov
(24) |
Dec
(16) |
| 2011 |
Jan
(22) |
Feb
(34) |
Mar
(11) |
Apr
(8) |
May
(24) |
Jun
(23) |
Jul
(11) |
Aug
(42) |
Sep
(81) |
Oct
(48) |
Nov
(21) |
Dec
(20) |
| 2012 |
Jan
(30) |
Feb
(25) |
Mar
(4) |
Apr
(6) |
May
(1) |
Jun
(5) |
Jul
(5) |
Aug
(8) |
Sep
(6) |
Oct
(6) |
Nov
|
Dec
|
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/java/org/archive/wayback/servletglue Modified Files: WBQueryUIServlet.java WBReplayUIServlet.java Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. Index: WBQueryUIServlet.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBQueryUIServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WBQueryUIServlet.java 19 Oct 2005 01:22:37 -0000 1.2 --- WBQueryUIServlet.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 78,85 **** WMRequest wmRequest = (WMRequest) request .getAttribute(WMREQUEST_ATTRIBUTE); if (wmRequest == null) { ! throw new ServletException("No WMRequest object"); } - QueryUI queryUI = wayback.getQueryUI(); queryUI.handle(wayback, wmRequest, request, response); } --- 78,92 ---- WMRequest wmRequest = (WMRequest) request .getAttribute(WMREQUEST_ATTRIBUTE); + QueryUI queryUI = wayback.getQueryUI(); + if (wmRequest == null) { ! wmRequest = new WMRequest(); ! try { ! wmRequest.parseCGIArgsQuery(request.getParameterMap()); ! } catch (Exception e) { ! queryUI.showWaybackException(null,request,response,e.getMessage()); ! return; ! } } queryUI.handle(wayback, wmRequest, request, response); } Index: WBReplayUIServlet.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBReplayUIServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WBReplayUIServlet.java 19 Oct 2005 01:22:37 -0000 1.2 --- WBReplayUIServlet.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 77,84 **** WMRequest wmRequest = (WMRequest) request .getAttribute(WMREQUEST_ATTRIBUTE); if (wmRequest == null) { ! throw new ServletException("No WMRequest object"); } - ReplayUI replayUI = wayback.getReplayUI(); replayUI.handle(wayback, wmRequest, request, response); } --- 77,91 ---- WMRequest wmRequest = (WMRequest) request .getAttribute(WMREQUEST_ATTRIBUTE); + ReplayUI replayUI = wayback.getReplayUI(); + if (wmRequest == null) { ! wmRequest = new WMRequest(); ! try { ! wmRequest.parseCGIArgsReplay(request.getParameterMap()); ! } catch (Exception e) { ! replayUI.showWaybackException(null,request,response,e.getMessage()); ! return; ! } } replayUI.handle(wayback, wmRequest, request, response); } |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp Added Files: help.jsp index.jsp Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- NEW FILE: help.jsp --- <jsp:include page="template/UI-header.jsp" /> Sorry, no help yet. <jsp:include page="template/UI-footer.jsp" /> --- NEW FILE: index.jsp --- <jsp:include page="template/UI-header.jsp" /> This is the wayback Machine! <jsp:include page="template/UI-footer.jsp" /> |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/ReplayUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/jsp/ReplayUI Modified Files: ErrorResult.jsp Added Files: requestform.jsp Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- NEW FILE: requestform.jsp --- <jsp:include page="../../template/UI-header.jsp" /> <FORM ACTION="../../replay"> URL:<INPUT TYPE="TEXT" NAME="url" WIDTH="80"><BR> Exact Date:<INPUT TYPE="TEXT" NAME="date" WIDTH="80"><BR> Earliest Date:<INPUT TYPE="TEXT" NAME="earliest" WIDTH="80"><BR> Latest Date:<INPUT TYPE="TEXT" NAME="latest" WIDTH="80"><BR> <INPUT TYPE="HIDDEN" NAME="type" VALUE="replay"> <INPUT TYPE="SUBMIT" VALUE="Submit"> </FORM> <jsp:include page="../../template/UI-footer.jsp" /> Index: ErrorResult.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/ReplayUI/ErrorResult.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ErrorResult.jsp 18 Oct 2005 02:30:50 -0000 1.1 --- ErrorResult.jsp 20 Oct 2005 00:40:41 -0000 1.2 *************** *** 1,3 **** ! <jsp:include page="../template/UI-header.txt" /> <B><%= (String) request.getAttribute("message") %></B> ! <jsp:include page="../template/UI-footer.txt" /> --- 1,3 ---- ! <jsp:include page="../../template/UI-header.jsp" /> <B><%= (String) request.getAttribute("message") %></B> ! <jsp:include page="../../template/UI-footer.jsp" /> |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/template Added Files: UI-header.jsp UI-footer.jsp Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- NEW FILE: UI-header.jsp --- <!-- HEADER --> <html> <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"> <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/styles.css" src="<%= request.getContextPath() %>/css/styles.css"> <title>Internet Archive Wayback Machine</title> <base target="_top"> </head> <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"> <tr> <!-- WAYBACK LOGO --> <td width="26%"><a href="<%= request.getContextPath() %>"><img src="<%= request.getContextPath() %>/images/wayback_logo_sm.gif" width="153" height="54" border="0"></a></td> <!-- /WAYBACK LOGO --> <!-- COLLECTION-EMPTYLOGO --> <td width="70%" align="right"></td> <!-- /COLLECTION-EMPTY LOGO --> </tr> <!-- 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"> <!-- URL FORM --> <form action="query" method="GET"> <tr> <td nowrap align="center"><img src="images/shim.gif" width="1" height="20"> <b class="mainBodyW"> <font size="2" color="#FFFFFF" face="Arial, Helvetica, sans-serif"> Enter Web Address: </font> <input type="hidden" name="type" value="query"> <input type="text" name="url" value="http://" size="24" maxlength="256"> </b> <select name="date" size="1"> <option value="" selected>All</option> <option>2005</option> <option>2004</option> <option>2003</option> <option>2002</option> <option>2001</option> <option>2000</option> <option>1999</option> <option>1998</option> <option>1997</option> <option>1996</option> </select> <input type="Submit" name="Submit" value="Take Me Back" align="absMiddle"> <a href="<%= request.getContextPath() %>/jsp/QueryUI/requestform.jsp" style="color:white;font-size:11px"> Adv. Search </a> </td> </tr> </form> <!-- /URL FORM --> </table> </td> </tr> </table> </td> </tr> <!-- /GREEN BANNER --> </table> <!-- /HEADER --> --- NEW FILE: UI-footer.jsp --- <!-- FOOTER --> <div align="center"> <hr noshade size="1" align="center"> <p> <a href="<%= request.getContextPath() %>">Home</a> | <a href="<%= request.getContextPath() %>/help.jsp">Help</a> </p> <p> <a href="http://www.archive.org">Internet Archive</a> | <a href="http://www.archive.org/about/terms.php">Terms of Use</a> | <a href="http://www.archive.org/about/terms.php#privacy">Privacy Policy</a> </p> </div> </body> </html> <!-- /FOOTER --> |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:52
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/jsp/template Removed Files: UI-header.txt UI-footer.txt styles.css Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- UI-footer.txt DELETED --- --- styles.css DELETED --- --- UI-header.txt DELETED --- |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:51
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/css Added Files: styles.css Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- NEW FILE: styles.css --- a:link { font-family: Arial, Helvetica, sans-serif; color: #3333FF; text-decoration: underline; line-height: normal} a:visited { font-family: Arial, Helvetica, sans-serif; color: #993399; text-decoration: underline; line-height: normal} #nolinelink { font-family: Verdana, Helvetica, sans-serif; font-size: 10px; color: #0000FF; line-height: normal; text-decoration: none} #orangelink { font-family: Arial, Helvetica, sans-serif; color: #CC6600; text-decoration: underline; line-height: normal} #blacklink { font-family: Verdana, Helvetica, sans-serif; font-size: 10px;color: #000000 } #whitelink { font-family: Verdana, Helvetica, sans-serif; font-size: 10px;color: #FFFFFF } .mainSmall { font-family: Verdana, Helvetica, sans-serif; font-size: 11px; line-height: normal} .mainSmallG { font-family: Verdana, Helvetica, sans-serif; font-size: 11px; line-height: normal; color: #666666} .mainBodyR { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #990000} .mainBodyW { font-family: Verdana, Helvetica, sans-serif; font-size: 10pt; color: #FFFFFF} .mainBody { font-family: Verdana, Helvetica, sans-serif; font-size: 10pt} .mainTitle { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; font-style: normal; font-weight: bold} .mainTitleW { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; color: #FFFFFF} .mainSearchTitle { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; font-style: normal; color: #666666} .mainSearchText { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #666666} .mainSearchUrls { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12pt} .mainCalendar { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; font-style: normal; font-weight: bold} .mainSecHead { font-family: Arial, Helvetica, sans-serif; font-size: 12pt; font-style: normal; font-weight: bold; color: #000000} .mainBodyG { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; font-weight: bold; color: #999999} .mainBigBody { font-family: Arial, Helvetica, sans-serif; font-size: 12pt} .mainBigBodyR { font-family: Arial, Helvetica, sans-serif; font-size: 12pt; color: #990000} .mainExample { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #0000FF} .mainSecHeadW { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12pt; font-weight: bold; color: #FFFFFF} .mainSmallTimes { font-family: "Times New Roman", Times, serif; font-size: 10pt} .mainVerySmall { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px} .e2kSmall { font-family: Verdana, Helvetica, sans-serif; font-size: 11px; line-height: normal} .e2kBodyR { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #990000} .e2kBodyW { font-family: Verdana, Helvetica, sans-serif; font-size: 10pt; color: #FFFFFF} .e2kBody { font-family: Verdana, Helvetica, sans-serif; font-size: 10pt} .e2kTitle { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; font-style: normal; font-weight: bold} .e2kCalendar { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; font-style: normal; font-weight: bold} .e2kSecHead { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12pt; font-style: normal; font-weight: bold} .e2kBodyG { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; font-weight: bold; color: #999999} .e2kBigBody { font-family: Arial, Helvetica, sans-serif; font-size: 12pt} .e2kExample { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; color: #0000FF} .e2kTitleW { font-family: Arial, Helvetica, sans-serif; font-size: 14pt; color: #FFFFFF} .e2kSecHeadW { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12pt; font-weight: bold; color: #FFFFFF} .e2kSmallTimes { font-family: "Times New Roman", Times, serif; font-size: 10pt} .e2kVerySmall { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px} p {font-family: Verdana, Helvetica, sans-serif; font-size: 10pt} .mainBColor {background-color: #435D93} .e2kBColor {background-color: #1D0D71} .mainSearchBanner {background-color:#F0F0F0} |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:51
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/images Added Files: shim.gif wayback_logo_sm.gif Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. --- NEW FILE: shim.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wayback_logo_sm.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:51
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12778/src/webapp/css Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/css added to the repository |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:45
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12778/src/webapp/template Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/template added to the repository |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:45
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12778/src/webapp/images Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/images added to the repository |
|
From: Michael S. <sta...@us...> - 2005-10-20 00:32:37
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10539/lib Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/WEB-INF/lib added to the repository |
|
From: Michael S. <sta...@us...> - 2005-10-20 00:16:52
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7210/src/articles Modified Files: manual.xml Log Message: * src/articles/manual.xml Added section on config of arcretreiver. Removed sections on setting path to arc in wera config.inc Index: manual.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/articles/manual.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** manual.xml 13 Oct 2005 22:09:28 -0000 1.3 --- manual.xml 20 Oct 2005 00:16:39 -0000 1.4 *************** *** 257,261 **** <listitem> <para>Tomcat servlet container ! (http://jakarta.apache.org/tomcat/index.html). The ArcRetriever web app has been tested on v.5.0.27 and 5.0.28 as well as in 5.5.9.</para> --- 257,261 ---- <listitem> <para>Tomcat servlet container ! (http://jakarta.apache.org/tomcat/index.html). The arcretriever web app has been tested on v.5.0.27 and 5.0.28 as well as in 5.5.9.</para> *************** *** 332,339 **** <listitem> ! <para>Move the file ArcRetriever.war from <filename>$WERA_HOME/webapps/wera</filename> to the webapps directory of the tomcat installation of the host where your ARC-files reside (i.e. $TOMCAT_HOME/webapps).</para> </listitem> --- 332,363 ---- <listitem> ! <para>Move the file arcretriever.war from <filename>$WERA_HOME/webapps/wera</filename> to the webapps directory of the tomcat installation of the host where your ARC-files reside (i.e. $TOMCAT_HOME/webapps).</para> + <para>You must next configure the arcretreiver telling it where + the directory of ARCs that it is to retrieve from resides. + The configuration is inside in the WEB-INF/web.xml file. + Dependent on your tomcat configuration, usually, tomcat will + unjar the arcretriever.war file once the webapp has been + deployed. If so, shutdown tomcat, remove arcretriever.war, + leaving the arcretreiver directory in place, edit the + arcretriever/WEB-INF/web.xml file setting full path to the arcdir + and then restart tomcat. If tomcat does not undo your WAR file, + you'll have to do it yourself. Move the WAR file out from under + tomcat. Use the java jar command to undo the WAR. + <programlisting> % cd /tmp + % mkdir arcretriever + % cd arcretriever + % cp $WERA_HOME/webapps/arcretriever.war arcretriever + % $JAVA_HOME/bin/jar xf arcretriever.war + % rm arcretriever.war + (EDIT arcretriever/WEB-INF/web.xml. Set 'arcdir' param-value to full path to arcs.) + % cd ../ + % mv arcretriever $TOMCAT_HOME/webapps + % %TOMCAT_HOME/bin/shutdown.sh + % %TOMCAT_HOME/bin/startup.sh + </programlisting> + </para> </listitem> *************** *** 382,402 **** <row> - <entry>$conf_aid_prefix = "/var/arcs/";</entry> - - <entry>The current version of the arcretriever needs to know - where the ARC-files are located. All the ARC-files that you - indexed with nutch should be placed in one directory. The - path goes into this parameter (This configuration will be - moved into arcretreiver).</entry> - </row> - - <row> - <entry>$conf_aid_suffix = ".arc.gz";</entry> - - <entry>The suffix of the ARC files in above - directory.</entry> - </row> - - <row> <entry>$document_retriever = "http://localhost:8080/arcretriever/arcretriever";</entry> --- 406,409 ---- |
|
From: Michael S. <sta...@us...> - 2005-10-19 23:59:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257 Modified Files: project.xml Log Message: Implementation of '[ 1246834 ] Move arc path to retreiver (WAS Path...lib/seal/nutch.inc)' * project.xml Up the version number to be 0.4.0. * src/java/no/nb/nwa/retriever/AID.java Formatting. Make it so it adds '.arc.gz' if not present on passed arc file. * src/java/no/nb/nwa/retriever/ARCRetriever.java Read arcdir from servlet init-parameters. Formatting. * src/webapps/arcretriever/index.jsp Updated desription of this webapp. * src/webapps/arcretriever/WEB-INF/web.xml Added init-param arcdir. * src/webapps/wera/lib/config.inc * src/webapps/wera/lib/config.inc.template Moved arc dir out to arcretriever. Index: project.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.xml 17 Oct 2005 21:51:34 -0000 1.11 --- project.xml 19 Oct 2005 23:59:22 -0000 1.12 *************** *** 12,16 **** <!-- The version of the project under development, e.g. 1.1, 1.2, 2.0-SNAPSHOT --> ! <currentVersion>0.2.3${version.build.suffix}</currentVersion> <!-- details about the organization that 'owns' the project --> --- 12,16 ---- <!-- The version of the project under development, e.g. 1.1, 1.2, 2.0-SNAPSHOT --> ! <currentVersion>0.4.0${version.build.suffix}</currentVersion> <!-- details about the organization that 'owns' the project --> |
|
From: Michael S. <sta...@us...> - 2005-10-19 23:59:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257/src/webapps/arcretriever Modified Files: index.jsp Log Message: Implementation of '[ 1246834 ] Move arc path to retreiver (WAS Path...lib/seal/nutch.inc)' * project.xml Up the version number to be 0.4.0. * src/java/no/nb/nwa/retriever/AID.java Formatting. Make it so it adds '.arc.gz' if not present on passed arc file. * src/java/no/nb/nwa/retriever/ARCRetriever.java Read arcdir from servlet init-parameters. Formatting. * src/webapps/arcretriever/index.jsp Updated desription of this webapp. * src/webapps/arcretriever/WEB-INF/web.xml Added init-param arcdir. * src/webapps/wera/lib/config.inc * src/webapps/wera/lib/config.inc.template Moved arc dir out to arcretriever. Index: index.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/index.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.jsp 5 Oct 2005 21:34:58 -0000 1.3 --- index.jsp 19 Oct 2005 23:59:22 -0000 1.4 *************** *** 7,29 **** </head> <body bgcolor="#FFFFFF"> ! <H1><img src="./images/logo.jpg" border=0 alt="Nordic Web Archive"> !   ARC Retriever</H1> <p>This application is capable of delivering web documents from archives in the ARC format.</p> ! <H2>Configuring wera for using ARC retriever</H2> <P>In the wera <i>lib/config.inc</i> file set the value of $document_retriever to <A HREF="arcretriever"> <%=request.getRequestURL().substring(0, request.getRequestURL().lastIndexOf("/")).concat("/arcretriever")%> </A></P> - <p>TODO: Document different request types.</p> - - <H2>wera</H2> - You can find information about wera at - <A href='http://archive-access.sourceforge.net/projects/wera/'>this page</A>. <H2>License Information</H2> ! The arcretriever is open source software. Read <A href="LICENSE.txt">more</A> ! about the license information. </body> </html> --- 7,48 ---- </head> <body bgcolor="#FFFFFF"> ! <H1><img src="./images/logo.jpg" border=0 alt="Nordic Web Archive">ARC ! Retriever</H1> <p>This application is capable of delivering web documents from archives in the ARC format.</p> + <H2>Configuration</H2> + <p>Set the <i>arcdir</i> in the <i>WEB-INF/web.xml</i> to point at the + directory that holds ARC files and then redeploy this webapp. + Be aware that changing this value in the web.xml of an + arcretriever sitting under a containers webapp directory + can prove frustrating. The container usually notices your + change then re-undoes the original WAR file overwriting your + edits. If you remove the WAR file version, the container will + subsequently 'cleanup' the lone webapp directory. + Best to unjar outside of the container webapp directory and + copy the unjarred WAR into the webapp dir. + </p> + <h2>Request Parameters</h2> + <p>This webapp takes the following request parameters. + <ul> + <li><b>reqtype</b>: Possible values include: getfile, getmeta, + getfilestatus, getarchiveinfo.</li> + <li><b>aid</b>: The archive identifier. Its format is + <i>OFFSET '/' ARCNAME</i>.</li> + </ul> + </p> ! <H2>wera</H2> ! You can find information about wera at ! <A href='http://archive-access.sourceforge.net/projects/wera/'>this page</A>. ! <H3>Configuring wera for using ARC retriever</H3> <P>In the wera <i>lib/config.inc</i> file set the value of $document_retriever to <A HREF="arcretriever"> <%=request.getRequestURL().substring(0, request.getRequestURL().lastIndexOf("/")).concat("/arcretriever")%> </A></P> <H2>License Information</H2> ! The arcretriever is open source software. ! Read <A href="LICENSE.txt">more</A> about the license information. </body> </html> |
|
From: Michael S. <sta...@us...> - 2005-10-19 23:59:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257/src/webapps/arcretriever/WEB-INF Modified Files: web.xml Log Message: Implementation of '[ 1246834 ] Move arc path to retreiver (WAS Path...lib/seal/nutch.inc)' * project.xml Up the version number to be 0.4.0. * src/java/no/nb/nwa/retriever/AID.java Formatting. Make it so it adds '.arc.gz' if not present on passed arc file. * src/java/no/nb/nwa/retriever/ARCRetriever.java Read arcdir from servlet init-parameters. Formatting. * src/webapps/arcretriever/index.jsp Updated desription of this webapp. * src/webapps/arcretriever/WEB-INF/web.xml Added init-param arcdir. * src/webapps/wera/lib/config.inc * src/webapps/wera/lib/config.inc.template Moved arc dir out to arcretriever. Index: web.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web.xml 5 Oct 2005 21:22:52 -0000 1.2 --- web.xml 19 Oct 2005 23:59:22 -0000 1.3 *************** *** 7,18 **** <description>ArcRetriever module for wera</description> - <context-param> - <param-name>ArcRetrieverConfig</param-name> - <param-value>WEB-INF/arcretriever.properties</param-value> - <description>The location of the ARCRetriever properties file</description> - </context-param> <servlet> <servlet-name>arcretriever</servlet-name> <servlet-class>no.nb.nwa.retriever.ARCRetriever</servlet-class> </servlet> <servlet-mapping> --- 7,27 ---- <description>ArcRetriever module for wera</description> <servlet> <servlet-name>arcretriever</servlet-name> <servlet-class>no.nb.nwa.retriever.ARCRetriever</servlet-class> + <init-param> + <param-name>arcdir</param-name> + <param-value>arcs</param-value> + <description>Full path to directory of ARC files. + Be aware that changing this value in the web.xml of an + arcretriever sitting under a containers webapp directory + can prove frustrating. The container usually notices your + change then re-undoes the original WAR file overwriting your + edits. If you remove the WAR file version, the container will + subsequently 'cleanup' the lone webapp directory. + Best to unjar outside of the container webapp directory and + copy the unjarred WAR into the webapp dir. + </description> + </init-param> </servlet> <servlet-mapping> |
|
From: Michael S. <sta...@us...> - 2005-10-19 23:59:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257/src/webapps/wera/lib Modified Files: config.inc.template Log Message: Implementation of '[ 1246834 ] Move arc path to retreiver (WAS Path...lib/seal/nutch.inc)' * project.xml Up the version number to be 0.4.0. * src/java/no/nb/nwa/retriever/AID.java Formatting. Make it so it adds '.arc.gz' if not present on passed arc file. * src/java/no/nb/nwa/retriever/ARCRetriever.java Read arcdir from servlet init-parameters. Formatting. * src/webapps/arcretriever/index.jsp Updated desription of this webapp. * src/webapps/arcretriever/WEB-INF/web.xml Added init-param arcdir. * src/webapps/wera/lib/config.inc * src/webapps/wera/lib/config.inc.template Moved arc dir out to arcretriever. Index: config.inc.template =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc.template,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.inc.template 6 Oct 2005 02:07:37 -0000 1.2 --- config.inc.template 19 Oct 2005 23:59:22 -0000 1.3 *************** *** 52,59 **** // the prefix would be the path to where the ARC files are stored and the suffix // the files extension (e.g. .arc.gz) ! // ! // TODO : Move this into the ARC Retriever ! $conf_aid_prefix = "@aidPrefix@/"; ! $conf_aid_suffix = "@aidSuffix@"; // Prefix to document retriever --- 52,60 ---- // the prefix would be the path to where the ARC files are stored and the suffix // the files extension (e.g. .arc.gz) ! // ! // St.Ack cleared this out because he's moved the path-to-arc out into the ! // ARCRetriever. ! $conf_aid_prefix = ""; ! $conf_aid_suffix = ""; // Prefix to document retriever |
|
From: Michael S. <sta...@us...> - 2005-10-19 23:59:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/java/no/nb/nwa/retriever In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2257/src/java/no/nb/nwa/retriever Modified Files: AID.java ARCRetriever.java Log Message: Implementation of '[ 1246834 ] Move arc path to retreiver (WAS Path...lib/seal/nutch.inc)' * project.xml Up the version number to be 0.4.0. * src/java/no/nb/nwa/retriever/AID.java Formatting. Make it so it adds '.arc.gz' if not present on passed arc file. * src/java/no/nb/nwa/retriever/ARCRetriever.java Read arcdir from servlet init-parameters. Formatting. * src/webapps/arcretriever/index.jsp Updated desription of this webapp. * src/webapps/arcretriever/WEB-INF/web.xml Added init-param arcdir. * src/webapps/wera/lib/config.inc * src/webapps/wera/lib/config.inc.template Moved arc dir out to arcretriever. Index: AID.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/java/no/nb/nwa/retriever/AID.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AID.java 5 Oct 2005 18:15:54 -0000 1.1 --- AID.java 19 Oct 2005 23:59:22 -0000 1.2 *************** *** 49,66 **** this.offset = Long.parseLong(aid.substring(0, filenameOffset)); } catch (StringIndexOutOfBoundsException e) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_UNABLE_TO_PARSE_ARCHIVE_IDENTIFIER); } catch (Exception e) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_UNABLE_TO_PARSE_ARCHIVE_IDENTIFIER, ! e); } } /** ! * @return Returns the filename. */ public String getFilename() { ! return filename; } --- 49,67 ---- this.offset = Long.parseLong(aid.substring(0, filenameOffset)); } catch (StringIndexOutOfBoundsException e) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_UNABLE_TO_PARSE_ARCHIVE_IDENTIFIER); } catch (Exception e) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_UNABLE_TO_PARSE_ARCHIVE_IDENTIFIER, e); } } /** ! * @return Returns the filename (If no suffix, appends arc.gz). */ public String getFilename() { ! return filename.endsWith(".arc.gz")? this.filename: ! filename.endsWith(".arc")? this.filename: ! this.filename + ".arc.gz"; } Index: ARCRetriever.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/java/no/nb/nwa/retriever/ARCRetriever.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ARCRetriever.java 5 Oct 2005 18:15:54 -0000 1.1 --- ARCRetriever.java 19 Oct 2005 23:59:22 -0000 1.2 *************** *** 37,42 **** --- 37,45 ---- import java.util.regex.Matcher; import java.util.regex.Pattern; + import java.util.logging.Logger; + import java.util.logging.Level; import javax.servlet.ServletException; + import javax.servlet.ServletConfig; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; *************** *** 70,124 **** */ public class ARCRetriever extends HttpServlet { final static Pattern charsetPattern = Pattern .compile("^.*charset=([^\\s]+).*$"); /** ! * */ public ARCRetriever() { } protected void doGet(HttpServletRequest request, ! HttpServletResponse response) throws ServletException, IOException { try { long now = System.currentTimeMillis(); String reqtype = request.getParameter("reqtype"); String aid = request.getParameter("aid"); - if (reqtype == null) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_REQTYPE_MISSING); } else { reqtype = reqtype.intern(); } - ARCRetriever retriever = new ARCRetriever(); if (reqtype == "getfile") { if (aid == null) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! retriever.getDocument(response, new AID(aid)); } } else if (reqtype == "getmeta") { if (aid == null) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! retriever.getMeta(response, new AID(aid)); } } else if (reqtype == "getfilestatus") { if (aid == null) { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! retriever.getFileStatus(response, new AID(aid)); } } else if (reqtype == "getarchiveinfo") { ! retriever.getArchiveInfo(response); } else { ! throw new ArcRetrieverException( ! ArcRetrieverException.ERROR_UNSUPPORTED_REQTYPE); } } catch (Throwable e) { --- 73,149 ---- */ public class ARCRetriever extends HttpServlet { + final static Logger LOGGER = Logger.getLogger(ARCRetriever.class.getName()); final static Pattern charsetPattern = Pattern .compile("^.*charset=([^\\s]+).*$"); + + private File arcdir = null; /** ! * Constructor. */ public ARCRetriever() { + super(); + } + + public void init(final ServletConfig config) throws ServletException { + String tmp = config.getInitParameter("arcdir"); + if (tmp != null) { + this.arcdir = new File(tmp); + } else { + throw new ServletException("'arcdir' init param is empty. " + + "Have you set it in web.xml to point at directory of arcs?"); + + } + if (!this.arcdir.exists() || !this.arcdir.canRead()) { + throw new ServletException(this.arcdir.getAbsolutePath() + + " does not exist or is not readable. Have you set " + + "'arcdir' in the web.xml file to point at directory of arcs?"); + } + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.fine("Passed arc directory is " + this.arcdir); + } } protected void doGet(HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException { try { long now = System.currentTimeMillis(); String reqtype = request.getParameter("reqtype"); String aid = request.getParameter("aid"); if (reqtype == null) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_REQTYPE_MISSING); } else { reqtype = reqtype.intern(); } if (reqtype == "getfile") { if (aid == null) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! getDocument(response, new AID(aid)); } } else if (reqtype == "getmeta") { if (aid == null) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! getMeta(response, new AID(aid)); } } else if (reqtype == "getfilestatus") { if (aid == null) { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_ARCHIVE_IDENTIFIER_MISSING); } else { ! getFileStatus(response, new AID(aid)); } } else if (reqtype == "getarchiveinfo") { ! getArchiveInfo(response); } else { ! throw new ArcRetrieverException(ArcRetrieverException. ! ERROR_UNSUPPORTED_REQTYPE); } } catch (Throwable e) { *************** *** 128,132 **** protected void doPost(HttpServletRequest request, ! HttpServletResponse response) throws ServletException, IOException { this.doGet(request, response); } --- 153,158 ---- protected void doPost(HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException { this.doGet(request, response); } *************** *** 364,368 **** ARCRecord rec = null; ARCReader arc = null; ! File file = new File(aid.getFilename()); arc = ARCReaderFactory.get(file); rec = arc.get(aid.getOffset()); --- 390,394 ---- ARCRecord rec = null; ARCReader arc = null; ! File file = new File(this.arcdir, aid.getFilename()); arc = ARCReaderFactory.get(file); rec = arc.get(aid.getOffset()); |
|
From: Michael S. <sta...@us...> - 2005-10-19 20:55:14
|
Update of /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23208/src/java/org/archive/access/nutch Modified Files: NutchwaxQuery.java NutchwaxQueryTest.java Log Message: Part of fix for '[ 1312204 ] Test supplied urls for exacturl' * src/java/org/archive/access/nutch/NutchwaxQuery.java Change the regex so it looks for whitespace rather than closing paren that wera used provide. * src/java/org/archive/access/nutch/NutchwaxQueryTest.java Fix test. Make it align with change in NutchwaxQuery. Index: NutchwaxQuery.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxQuery.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NutchwaxQuery.java 27 Jul 2005 01:24:38 -0000 1.1 --- NutchwaxQuery.java 19 Oct 2005 20:55:00 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- import org.archive.util.TextUtils; + import org.apache.nutch.searcher.NutchBean; public class NutchwaxQuery { *************** *** 42,46 **** // Look for an exacturl clause that begins with a private static final String EXACTURL_PATTERN = ! "(.*(?:\\(\\s*|\\s|^)exacturl:)([^ \\)]+)(.*)"; private static MessageDigest md = null; static { --- 43,47 ---- // Look for an exacturl clause that begins with a private static final String EXACTURL_PATTERN = ! "(.*(?:\\(\\s*|\\s|^)exacturl:)([^ ]+)(.*)"; private static MessageDigest md = null; static { Index: NutchwaxQueryTest.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxQueryTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NutchwaxQueryTest.java 27 Jul 2005 01:24:38 -0000 1.1 --- NutchwaxQueryTest.java 19 Oct 2005 20:55:00 -0000 1.2 *************** *** 30,33 **** --- 30,36 ---- public class NutchwaxQueryTest extends TestCase { public void testEncodeExacturl() { + /* + * Commented out because I removed looking for paren surround. + * Its messing up when urls contain parens. final String result = "exacturl:7D3GWTB7PCSO5IQBOUGDH76JCE"; assertEquals("duboce (" + result + ")", NutchwaxQuery. *************** *** 35,38 **** --- 38,42 ---- assertEquals(result, NutchwaxQuery.encodeExacturl("exacturl:http://www.duboce.net/")); + */ } } |
|
From: Michael S. <sta...@us...> - 2005-10-19 20:44:44
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20827/src/webapps/wera/lib Modified Files: documentLocator.inc Log Message: Part of '[ 1312204 ] Test supplied urls for exacturl'. * src/webapps/wera/lib/documentLocator.inc Remove parens surrounding exacturl. Was preventing nutchwax being able to find end of clause if url had parens. Index: documentLocator.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/documentLocator.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** documentLocator.inc 5 Oct 2005 22:42:47 -0000 1.3 --- documentLocator.inc 19 Oct 2005 20:44:35 -0000 1.4 *************** *** 120,124 **** $sizeofresultset = 1000; } ! $this->query = $query_end . " +(" . $query_start . ")"; $this->indexDriver->setQuery($this->query); $this->indexDriver->setSortorder($sortorder); --- 120,124 ---- $sizeofresultset = 1000; } ! $this->query = $query_end . " + " . $query_start; $this->indexDriver->setQuery($this->query); $this->indexDriver->setSortorder($sortorder); |
|
From: Sverre B. <sv...@us...> - 2005-10-19 13:56:05
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17497/lib Modified Files: config.inc Log Message: Index: config.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.inc 19 Oct 2005 13:51:48 -0000 1.7 --- config.inc 19 Oct 2005 13:55:58 -0000 1.8 *************** *** 43,47 **** // What search engine to use $conf_searchengine = "nutch"; ! $conf_searchengine_url = "http://localhost:8082/nutchwax/opensearch"; $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc"; $conf_index_class = $conf_searchengine . "Search"; --- 43,47 ---- // What search engine to use $conf_searchengine = "nutch"; ! $conf_searchengine_url = "http://localhost:8080/nutchwax/opensearch"; $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc"; $conf_index_class = $conf_searchengine . "Search"; *************** *** 57,61 **** // Prefix to document retriever ! $document_retriever = "http://localhost:8082/arcretriever/arcretriever"; $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; --- 57,61 ---- // Prefix to document retriever ! $document_retriever = "http://localhost:8080/arcretriever/arcretriever"; $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; |
|
From: Sverre B. <sv...@us...> - 2005-10-19 13:52:01
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16610/lib Modified Files: config.inc Log Message: Index: config.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.inc 19 Oct 2005 13:47:59 -0000 1.6 --- config.inc 19 Oct 2005 13:51:48 -0000 1.7 *************** *** 34,41 **** $conf_debug = 0; // Print out some debug info ! error_reporting(E_WARNING); // Path to includefiles ! $conf_rootpath = "/opt/lampp/htdocs/aaWera"; $conf_includepath = "$conf_rootpath/lib"; $conf_searchenginepath = "$conf_includepath/seal"; --- 34,41 ---- $conf_debug = 0; // Print out some debug info ! #error_reporting(E_ALL); // Path to includefiles ! $conf_rootpath = "/opt/lampp/htdocs/wera"; $conf_includepath = "$conf_rootpath/lib"; $conf_searchenginepath = "$conf_includepath/seal"; *************** *** 43,49 **** // What search engine to use $conf_searchengine = "nutch"; - #$conf_searchengine_url = "http://wbsearch04.archive.org:8080/nutchwax/opensearch"; $conf_searchengine_url = "http://localhost:8082/nutchwax/opensearch"; - #$conf_searchengine_url = "http://fast3.nb.no:8080/nutchwax/opensearch"; $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc"; $conf_index_class = $conf_searchengine . "Search"; --- 43,47 ---- *************** *** 55,72 **** // // TODO : Move this into the ARC Retriever - #$conf_aid_prefix = "/2/katrina/nutch-data/arcs/"; $conf_aid_prefix = "/home/sverreb/apps/data/arcs/"; - #$conf_aid_prefix = "/home/wera/arcs/"; $conf_aid_suffix = ".arc.gz"; // Prefix to document retriever - #$document_retriever = "http://wbsearch04.archive.org:8080/ArcRetriever/ArcRetriever"; $document_retriever = "http://localhost:8082/arcretriever/arcretriever"; - #$document_retriever = "http://fast3.nb.no:8080/ArcRetriever/ArcRetriever"; - $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; // URL of ui installation ! $conf_http_host = "http://localhost/aaWera"; // Set to true if you want number of versions // to show up in each single search result (expensive on NutchWax) --- 53,66 ---- // // TODO : Move this into the ARC Retriever $conf_aid_prefix = "/home/sverreb/apps/data/arcs/"; $conf_aid_suffix = ".arc.gz"; // Prefix to document retriever $document_retriever = "http://localhost:8082/arcretriever/arcretriever"; $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; // URL of ui installation ! $conf_http_host = "http://localhost/wera"; ! // Set to true if you want number of versions // to show up in each single search result (expensive on NutchWax) *************** *** 77,81 **** // otherwise set to false // Only kicks in if $conf_show_num_verions is true ! $conf_show_num_verions_matching_query = false; --- 71,75 ---- // otherwise set to false // Only kicks in if $conf_show_num_verions is true ! $conf_show_num_verions_matching_query = true; |
|
From: Sverre B. <sv...@us...> - 2005-10-19 13:48:09
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15666/lib Modified Files: config.inc Log Message: Index: config.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.inc 6 Oct 2005 02:07:37 -0000 1.5 --- config.inc 19 Oct 2005 13:47:59 -0000 1.6 *************** *** 34,38 **** $conf_debug = 0; // Print out some debug info ! #error_reporting(E_ALL); // Path to includefiles --- 34,38 ---- $conf_debug = 0; // Print out some debug info ! error_reporting(E_WARNING); // Path to includefiles *************** *** 43,48 **** // What search engine to use $conf_searchengine = "nutch"; ! $conf_searchengine_url = "http://wbsearch04.archive.org:8080/nutchwax/opensearch"; ! #$conf_searchengine_url = "http://localhost:8082/nutchwax/opensearch"; $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc"; $conf_index_class = $conf_searchengine . "Search"; --- 43,49 ---- // What search engine to use $conf_searchengine = "nutch"; ! #$conf_searchengine_url = "http://wbsearch04.archive.org:8080/nutchwax/opensearch"; ! $conf_searchengine_url = "http://localhost:8082/nutchwax/opensearch"; ! #$conf_searchengine_url = "http://fast3.nb.no:8080/nutchwax/opensearch"; $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc"; $conf_index_class = $conf_searchengine . "Search"; *************** *** 54,64 **** // // TODO : Move this into the ARC Retriever ! $conf_aid_prefix = "/2/katrina/nutch-data/arcs/"; ! #$conf_aid_prefix = "/home/sverreb/apps/heritrix-1.4.0/jobs/lux2-20051004171719798/arcs/"; $conf_aid_suffix = ".arc.gz"; // Prefix to document retriever ! $document_retriever = "http://wbsearch04.archive.org:8080/ArcRetriever/ArcRetriever"; ! #$document_retriever = "http://localhost:8082/ArcRetriever/ArcRetriever"; $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; --- 55,68 ---- // // TODO : Move this into the ARC Retriever ! #$conf_aid_prefix = "/2/katrina/nutch-data/arcs/"; ! $conf_aid_prefix = "/home/sverreb/apps/data/arcs/"; ! #$conf_aid_prefix = "/home/wera/arcs/"; $conf_aid_suffix = ".arc.gz"; // Prefix to document retriever ! #$document_retriever = "http://wbsearch04.archive.org:8080/ArcRetriever/ArcRetriever"; ! $document_retriever = "http://localhost:8082/arcretriever/arcretriever"; ! #$document_retriever = "http://fast3.nb.no:8080/ArcRetriever/ArcRetriever"; ! $conf_document_retriever = "$document_retriever?reqtype=getfile&aid="; *************** *** 73,77 **** // otherwise set to false // Only kicks in if $conf_show_num_verions is true ! $conf_show_num_verions_matching_query = true; --- 77,81 ---- // otherwise set to false // Only kicks in if $conf_show_num_verions is true ! $conf_show_num_verions_matching_query = false; |
|
From: Sverre B. <sv...@us...> - 2005-10-19 13:39:34
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13908/test Removed Files: meta.php Log Message: removed --- meta.php DELETED --- |
|
From: Sverre B. <sv...@us...> - 2005-10-19 13:37:12
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13188 Modified Files: index.php overview.php Log Message: Improved debug output Index: overview.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** overview.php 5 Oct 2005 22:42:47 -0000 1.4 --- overview.php 19 Oct 2005 13:36:59 -0000 1.5 *************** *** 117,121 **** $total = $s->getNumHitsTotal(); $rset = $s->getResultSet(); ! if ($conf_debug == 1) { print "<pre>"; print_r($rset); --- 117,123 ---- $total = $s->getNumHitsTotal(); $rset = $s->getResultSet(); ! if ($conf_debug == 1 or $debug) { ! print "DEBUG : Query url : <a href=\"" . $s->queryurl . "\">" . $s->queryurl . "</a><br> <br>"; ! print "<br> <br>DEBUG : Result set :"; print "<pre>"; print_r($rset); Index: index.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.php 12 Oct 2005 13:25:29 -0000 1.6 --- index.php 19 Oct 2005 13:36:59 -0000 1.7 *************** *** 232,246 **** $total = $search->getNumHitsTotal(); $results = $search->getResultSet(); ! ! if ($conf_debug == 1) { ! print "Query url : <a href=\"" . $search->queryurl . "\">" . $search->queryurl . "</a>"; ! print "<pre>"; ! print_r($results); ! print "</pre>"; } if ($total > 0) { print (nls("Total number of versions found")." : <b>$total</b>. "); print (nls("Displaying URL's")); ! print " <b>$start-$numhits"; print "</td></tr>"; print "<tr><td class=\"norm\">"; --- 232,242 ---- $total = $search->getNumHitsTotal(); $results = $search->getResultSet(); ! if ($conf_debug or $debug) { ! print "DEBUG : Query url : <a href=\"" . $search->queryurl . "\">" . $search->queryurl . "</a><br> <br>"; } if ($total > 0) { print (nls("Total number of versions found")." : <b>$total</b>. "); print (nls("Displaying URL's")); ! print " <b>$start-$numhits</b>"; print "</td></tr>"; print "<tr><td class=\"norm\">"; *************** *** 268,272 **** $versions = $search2->getResultSet(); $numversions = $search2->getNumHitsTotal(); ! if ($conf_debug == 1) { $count_versions_matching_queryurl = $search2->queryurl; } --- 264,268 ---- $versions = $search2->getResultSet(); $numversions = $search2->getNumHitsTotal(); ! if ($conf_debug or $debug) { $count_versions_matching_queryurl = $search2->queryurl; } *************** *** 283,287 **** if ($search2->doQuery()) { $totalversions = $search2->getNumHitsTotal(); ! if ($conf_debug == 1) { $count_versions_total_queryurl = $search2->queryurl; } --- 279,283 ---- if ($search2->doQuery()) { $totalversions = $search2->getNumHitsTotal(); ! if ($conf_debug or $debug) { $count_versions_total_queryurl = $search2->queryurl; } *************** *** 294,303 **** print $numversions_text1 . " "; print $numversions_text2 . $totalversions."<br>"; ! if ($conf_debug == 1) { if (isset($count_versions_matching_queryurl)) { ! print "Url for counting versions matching query : <a href=\"" . $count_versions_matching_queryurl. "\">" . $count_versions_matching_queryurl . "</a><br/>"; } if (isset($count_versions_total_queryurl)) { ! print "Url for counting versions total : <a href=\"" . $count_versions_total_queryurl. "\">" . $count_versions_total_queryurl . "</a><br/>"; } } --- 290,299 ---- print $numversions_text1 . " "; print $numversions_text2 . $totalversions."<br>"; ! if ($conf_debug or $debug) { if (isset($count_versions_matching_queryurl)) { ! print "DEBUG : Url for counting versions matching query : <a href=\"" . $count_versions_matching_queryurl. "\">" . $count_versions_matching_queryurl . "</a><br/>"; } if (isset($count_versions_total_queryurl)) { ! print "DEBUG : Url for counting versions total : <a href=\"" . $count_versions_total_queryurl. "\">" . $count_versions_total_queryurl . "</a><br/>"; } } *************** *** 357,364 **** --- 353,368 ---- print " <a href=\"".$_SERVER['PHP_SELF']."?".$url_querypart."&start=".$next_start."\">".nls("Next")." >></a>"; } + print "</b>"; } else { print "No hits!"; } + if ($conf_debug or $debug) { + print "<br> <br>DEBUG : Result set :"; + print "<pre>"; + print_r($results); + print "</pre>"; + } + } else { |
|
From: Brad <bra...@us...> - 2005-10-19 01:22:52
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv901/src/java/org/archive/wayback/servletglue Modified Files: RequestFilter.java WBQueryUIServlet.java WBReplayUIServlet.java Log Message: lots of javadoc comments Index: WBQueryUIServlet.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBQueryUIServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WBQueryUIServlet.java 18 Oct 2005 02:30:49 -0000 1.1 --- WBQueryUIServlet.java 19 Oct 2005 01:22:37 -0000 1.2 *************** *** 1,2 **** --- 1,25 ---- + /* WBQueryUIServlet + * + * Created on 2005/10/18 14:00:00 + * + * Copyright (C) 2005 Internet Archive. + * + * This file is part of the Wayback Machine (crawler.archive.org). + * + * Wayback Machine is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * Wayback Machine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with Wayback Machine; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + package org.archive.wayback.servletglue; *************** *** 15,18 **** --- 38,47 ---- import org.archive.wayback.core.WaybackLogic; + /** + * Servlet implementation for Wayback Path and PathPrefix Queries. + * + * @author Brad Tofel + * @version $Date$, $Revision$ + */ public class WBQueryUIServlet extends HttpServlet { *************** *** 23,29 **** private static final long serialVersionUID = 1L; public WBQueryUIServlet() { super(); - // TODO Auto-generated constructor stub } --- 52,60 ---- private static final long serialVersionUID = 1L; + /** + * Constructor + */ public WBQueryUIServlet() { super(); } *************** *** 58,62 **** */ public static void main(String[] args) { - // TODO Auto-generated method stub } --- 89,92 ---- Index: WBReplayUIServlet.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBReplayUIServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WBReplayUIServlet.java 18 Oct 2005 02:30:49 -0000 1.1 --- WBReplayUIServlet.java 19 Oct 2005 01:22:37 -0000 1.2 *************** *** 1,2 **** --- 1,25 ---- + /* WBReplayUIServlet + * + * Created on 2005/10/18 14:00:00 + * + * Copyright (C) 2005 Internet Archive. + * + * This file is part of the Wayback Machine (crawler.archive.org). + * + * Wayback Machine is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * Wayback Machine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with Wayback Machine; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + package org.archive.wayback.servletglue; *************** *** 15,18 **** --- 38,47 ---- import org.archive.wayback.core.WaybackLogic; + /** + * Servlet implementation for Wayback Replay requests. + * + * @author Brad Tofel + * @version $Date$, $Revision$ + */ public class WBReplayUIServlet extends HttpServlet { private static final String WMREQUEST_ATTRIBUTE = "wmrequest.attribute"; *************** *** 22,28 **** private WaybackLogic wayback = new WaybackLogic(); public WBReplayUIServlet() { super(); - // TODO Auto-generated constructor stub } --- 51,59 ---- private WaybackLogic wayback = new WaybackLogic(); + /** + * Constructor + */ public WBReplayUIServlet() { super(); } *************** *** 57,61 **** */ public static void main(String[] args) { - // TODO Auto-generated method stub } --- 88,91 ---- Index: RequestFilter.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/RequestFilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RequestFilter.java 18 Oct 2005 02:30:49 -0000 1.1 --- RequestFilter.java 19 Oct 2005 01:22:37 -0000 1.2 *************** *** 1,2 **** --- 1,25 ---- + /* RequestFilter + * + * Created on 2005/10/18 14:00:00 + * + * Copyright (C) 2005 Internet Archive. + * + * This file is part of the Wayback Machine (crawler.archive.org). + * + * Wayback Machine is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * Wayback Machine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with Wayback Machine; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + package org.archive.wayback.servletglue; *************** *** 18,21 **** --- 41,52 ---- import org.archive.wayback.core.WMRequest; + /** + * Servlet filter that first attempts to recognize a WMRequest in a + * ServletRequest, forwarding the request to appropriate Servlet handler if a + * request is found. + * + * @author Brad Tofel + * @version $Date$, $Revision$ + */ public class RequestFilter implements Filter { private static final Logger LOGGER = Logger.getLogger(RequestFilter.class *************** *** 32,46 **** private RequestParser requestParser = null; - public RequestFilter() { - super(); - // TODO Auto-generated constructor stub - } - /** ! * @param args */ ! public static void main(String[] args) { ! // TODO Auto-generated method stub ! } --- 63,71 ---- private RequestParser requestParser = null; /** ! * Constructor */ ! public RequestFilter() { ! super(); } *************** *** 114,118 **** public void destroy() { ! // TODO Auto-generated method stub } --- 139,149 ---- public void destroy() { ! ! } ! ! /** ! * @param args ! */ ! public static void main(String[] args) { } |
