archive-access-cvs — CVS commits

[Archive-access-cvs] archive-access/projects/nutch/src/java/org/archive/access/nutch NutchwaxOpenSearchServlet.java,1.1,1.2 NutchwaxSegmentMergeTool.java,1.1,1.2

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9487/src/java/org/archive/access/nutch

Modified Files:
	NutchwaxOpenSearchServlet.java NutchwaxSegmentMergeTool.java 
Log Message:
* project.properties
    webapp config.
* project.xml
    Minor change.
* src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java 
    Make query string utf8.



Index: NutchwaxOpenSearchServlet.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NutchwaxOpenSearchServlet.java	27 Jul 2005 01:24:38 -0000	1.1
--- NutchwaxOpenSearchServlet.java	6 Oct 2005 01:45:35 -0000	1.2
***************
*** 50,58 ****
          // Make a delegating method that preprocesses the query string
          // converting any exacturl values so they'll pass the NutchAnalysis.
          HttpServletRequest delegatingReq = new HttpServletRequest() {
              public String getParameter(String parameter) {
                  String q = req.getParameter(parameter);
!                 return (parameter != null && parameter.equals("query"))?
!                     NutchwaxQuery.encodeExacturl(q): q;
              }
              
--- 50,67 ----
          // Make a delegating method that preprocesses the query string
          // converting any exacturl values so they'll pass the NutchAnalysis.
+         // Also make it so we encode the parameter strings properly.
          HttpServletRequest delegatingReq = new HttpServletRequest() {
              public String getParameter(String parameter) {
                  String q = req.getParameter(parameter);
!                 if (parameter == null || !parameter.equals("query") ||
!                         q == null) {
!                     return q;
!                 }
!                 try {
!                     q = new String(q.getBytes("ISO-8859-1"), "UTF-8");
!                 } catch (java.io.UnsupportedEncodingException e) { 
!                     throw new RuntimeException(e);
!                 }
!                 return NutchwaxQuery.encodeExacturl(q);
              }
              

Index: NutchwaxSegmentMergeTool.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxSegmentMergeTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NutchwaxSegmentMergeTool.java	2 Sep 2005 01:08:18 -0000	1.1
--- NutchwaxSegmentMergeTool.java	6 Oct 2005 01:45:35 -0000	1.2
***************
*** 225,228 ****
--- 225,229 ----
        }
        masters.add(masterDir);
+       LOG.severe("MasterDir is " + masterDir.toString());
        IndexWriter iw = new IndexWriter(masterDir, new WhitespaceAnalyzer(), true);
        iw.setUseCompoundFile(false);

[Archive-access-cvs] archive-access/projects/nutch/src/web search.jsp,1.21,1.22

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/src/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1231/src/web

Modified Files:
	search.jsp 
Log Message:
* conf/nutch-site.xml.all
    Change value for indexer.maxMergeDocs.
* src/web/search.jsp
    Chnage comments.  Also force encoding.  response.encodeURL will noop if
    already some encoding.


Index: search.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/web/search.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** search.jsp	4 Oct 2005 00:13:22 -0000	1.21
--- search.jsp	6 Oct 2005 01:07:32 -0000	1.22
***************
*** 24,28 ****
  %><%
    NutchBean bean = NutchBean.get(application);
!   // set the character encoding to use when interpreting request values 
    request.setCharacterEncoding("UTF-8");
  
--- 24,29 ----
  %><%
    NutchBean bean = NutchBean.get(application);
! 
!   // Set the character encoding to use when interpreting request values 
    request.setCharacterEncoding("UTF-8");
  
***************
*** 35,44 ****
      queryString = "";
    }
!   // Why do we have to do this?  We've set the character encoding for the
!   // request above with request.setCharacterEncoding?  But Lukas and Oskar
!   // say this works.
    queryString = new String(queryString.getBytes("ISO-8859-1"), "UTF-8");
- 
    String htmlQueryString = Entities.encode(queryString);
    int start = 0;          // first hit to display
    String startString = request.getParameter("start");
--- 36,45 ----
      queryString = "";
    }
!   // From Oskar and Lukas.  Shouldn't be needed but looks like it is.
!   // Would be consistent with this advice:
!   // http://www.jguru.com/faq/view.jsp?EID=391295
    queryString = new String(queryString.getBytes("ISO-8859-1"), "UTF-8");
    String htmlQueryString = Entities.encode(queryString);
+ 
    int start = 0;          // first hit to display
    String startString = request.getParameter("start");
***************
*** 91,99 ****
    String base = requestURI.substring(0, requestURI.lastIndexOf('/'));
  
    String rss = request.getContextPath() + "/opensearch?query=" +
!       response.encodeURL(queryString) + "&hitsPerDup=" + hitsPerDup +
        ((start != 0)? "&start=" + start: "") + params;
  
- 
  %><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <%
--- 92,102 ----
    String base = requestURI.substring(0, requestURI.lastIndexOf('/'));
  
+   // URLEncoder.encode the queryString rather than just use htmlQueryString.
+   // The former will take care of other than just html entities in case its
+   // needed.
    String rss = request.getContextPath() + "/opensearch?query=" +
!       URLEncoder.encode(queryString, "UTF-8") + "&hitsPerDup=" + hitsPerDup +
        ((start != 0)? "&start=" + start: "") + params;
  
  %><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <%

[Archive-access-cvs] archive-access/projects/nutch/conf nutch-site.xml.all,1.1,1.2

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1231/conf

Modified Files:
	nutch-site.xml.all 
Log Message:
* conf/nutch-site.xml.all
    Change value for indexer.maxMergeDocs.
* src/web/search.jsp
    Chnage comments.  Also force encoding.  response.encodeURL will noop if
    already some encoding.


Index: nutch-site.xml.all
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/conf/nutch-site.xml.all,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nutch-site.xml.all	25 Jul 2005 20:35:00 -0000	1.1
--- nutch-site.xml.all	6 Oct 2005 01:07:31 -0000	1.2
***************
*** 63,66 ****
--- 63,81 ----
  </property>
  
+ <property>
+   <name>indexer.maxMergeDocs</name>
+   <value>2147483647</value>
+   <description>This number determines the maximum number of Lucene
+   Documents to be merged into a new Lucene segment. Larger values
+   increase indexing speed and reduce the number of Lucene segments,
+   which reduces the number of open file handles; however, this also
+   increases RAM usage during indexing.
+ 
+   Doug says: "There was a bogus value for indexer.maxMergeDocs in
+     nutch-default.xml which made indexing really slow.  The correct
+     value is something really big (like Integer.MAX_VALUE)."
+   </description>
+ </property>
+ 
  <!-- make summaries a little longer than the default -->
  <property>

[Archive-access-cvs] archive-access/projects/nutch maven.xml,1.9,1.10

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11063

Modified Files:
	maven.xml 
Log Message:

* maven.xml 
    Overwrite any existing nutch-site.xml with our own nutchwax version
    (I hate ant).


Index: maven.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** maven.xml	2 Sep 2005 01:08:18 -0000	1.9
--- maven.xml	5 Oct 2005 23:16:47 -0000	1.10
***************
*** 86,93 ****
            </fileset>
          </copy>
-         <!--Copy over the nutch-site.xml that has all the plugins we need
-         in place to a viewer such as wera.-->
-         <copy tofile="${maven.dist.bin.assembly.dir}/conf/nutch-site.xml"
-             file="${basedir}/conf/nutch-site.xml.all" filtering="true" />
  
          <!--Fill the bin dir. Fill from nutch first.  Then from nutchwax
--- 86,89 ----
***************
*** 107,111 ****
          <property name="dist.bin.assembly.plugins.dir"
              value="${maven.dist.bin.assembly.dir}/plugins" />
!         <copy todir="${dist.bin.assembly.plugins.dir}" filtering="true">
            <fileset dir="${nutch.dir}/build/plugins" />
          </copy>
--- 103,107 ----
          <property name="dist.bin.assembly.plugins.dir"
              value="${maven.dist.bin.assembly.dir}/plugins" />
!         <copy todir="${dist.bin.assembly.plugins.dir}" filtering="false">
            <fileset dir="${nutch.dir}/build/plugins" />
          </copy>
***************
*** 121,124 ****
--- 117,126 ----
            </fileset>
          </copy>
+ 
+         <!--Copy over the nutch-site.xml that has all the plugins we need
+         in place to a viewer such as wera.-->
+         <copy tofile="${maven.dist.bin.assembly.dir}/conf/nutch-site.xml"
+             file="${basedir}/conf/nutch-site.xml.all" filtering="true" 
+             overwrite="true" />
      </postGoal>
  

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib meta.inc,NONE,1.1

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2602/lib

Added Files:
	meta.inc 
Log Message:
new file

--- NEW FILE: meta.inc ---
<?php

/*
 *  This file is part of WERA.
 *
 *  Copyright (C) 2001-2002 Royal Library in Stockholm,
 *                          Royal Library in Copenhagen,
 *                          Helsinki University Library of Finland, 
 *                          National Library of Norway,
 *                          National and University Library of Iceland.
 *
 *  WERA is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  WERA 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 General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with WERA; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

/**
* Class for parsing XML metadata record returned from Retriever 
* 
* $Id: meta.inc,v 1.1 2005/10/05 22:43:56 sverreb Exp $
*/

/**
* Class for parsing XML metadata record returned from Retriever
*
*/

class metaParser {
	var $retrieverurl;
	var $xml_parser; // Object Reference to xml parser
	var $aid;
	var $retriever_url;
	var $errormsg;
	var $metadata = array();
	var $xml_parser_in = array
				( "aid" => false, 
					"url" => false,
					"type" => false,
					"archival_time" => false,
					"last_modified_time" => false,
					"content_length" => false,
					"type" => false,
					"charset" => false,
					"filestatus" => false,
					"filestatus_long" => false,
					"content_checksum" => false,
					"http-header" => false,
				);

		

	/**
	* Constructor. 
	* Set some initial values 
	*/
	function metaParser($aid) {
		include ("../lib/config.inc");
		$this->aid = $aid;
		$this->retriever_url = $document_retriever . "?reqtype=getmeta&aid=" . $this->aid."&reqtype=getmeta";

	}

  /**
  * If the doParseMeta method returned false
  * use this to fetch the error message string
  *
  * @return  string Error message
  */
  function getErrorMessage() {
    return $this->errormsg;
  } 
  
  /**
  * Get the metadata array
  *
  * @return  array metadata
  */
  function getMetadata() {
    return $this->metadata;
  }
  
	/**
	* Fetch and parse the metadata record returned from retriever
	*
	* @return boolean False if empty query
	*/

	function doParseMeta() {
		$retval = true;
		$this->xml_parser = xml_parser_create();
		xml_set_object($this->xml_parser, $this);
		xml_set_element_handler($this->xml_parser, "startElement", "endElement");
		xml_set_character_data_handler($this->xml_parser, "characterData");
		
		$data = @ file_get_contents($this->retriever_url);
		if ($data) {
			if (!xml_parse($this->xml_parser, $data)) {
				$retval = false;
				$this->errormsg = sprintf("XML error: %s at line %d", xml_error_string(xml_get_error_code($this->xml_parser)), xml_get_current_line_number($this->xml_parser));
			}
			xml_parser_free($this->xml_parser);
		}
		else {
			$retval = false;
			$this->errormsg = "Error : Failed to open stream!";
		}
		return $retval;
	}

	function startElement($parser, $name, $attrs) {
		if ($name == "AID") {
    	$this->xml_parser_in["aid"] = true;
		}
		elseif ($name == "URL") {
			$this->xml_parser_in["url"] = true;
		}
		elseif ($name == "TYPE") {
			$this->xml_parser_in["type"] = true;
		}
		elseif ($name == "ARCHIVAL_TIME") {
			$this->xml_parser_in["archival_time"] = true;
		}
		elseif ($name == "LAST_MODIFIED_TIME") {
			$this->xml_parser_in["last_modified_time"] = true;
		}
		elseif ($name == "CONTENT_LENGTH") {
			$this->xml_parser_in["content_length"] = true;
		}
		elseif ($name == "TYPE") {
			$this->xml_parser_in["type"] = true;
		}
		elseif ($name == "CHARSET") {
			$this->xml_parser_in["charset"] = true;
		}
		elseif ($name == "FILESTATUS") {
			$this->xml_parser_in["filestatus"] = true;
		}
		elseif ($name == "FILESTATUS_LONG") {
			$this->xml_parser_in["filestatus_long"] = true;
		}
		
		elseif ($name == "CONTENT_CHECKSUM") {
			$this->xml_parser_in["content_checksum"] = true;
		}
		
		elseif ($name == "HTTP-HEADER") {
			$this->xml_parser_in["http-header"] = true;
		}		
	}

	function endElement($parser, $name) {
		if ($name == "AID") {
    	$this->xml_parser_in["aid"] = false;
		}
		elseif ($name == "URL") {
			$this->xml_parser_in["url"] = false;
		}
		elseif ($name == "TYPE") {
			$this->xml_parser_in["type"] = false;
		}
		elseif ($name == "ARCHIVAL_TIME") {
			$this->xml_parser_in["archival_time"] = false;
		}
		elseif ($name == "LAST_MODIFIED_TIME") {
			$this->xml_parser_in["last_modified_time"] = false;
		}
		elseif ($name == "CONTENT_LENGTH") {
			$this->xml_parser_in["content_length"] = false;
		}
		elseif ($name == "TYPE") {
			$this->xml_parser_in["type"] = false;
		}
		elseif ($name == "CHARSET") {
			$this->xml_parser_in["charset"] = false;
		}
		elseif ($name == "FILESTATUS") {
			$this->xml_parser_in["filestatus"] = false;
		}
		elseif ($name == "FILESTATUS_LONG") {
			$this->xml_parser_in["filestatus_long"] = false;
		}
		elseif ($name == "CONTENT_CHECKSUM") {
			$this->xml_parser_in["content_checksum"] = false;
		}
		elseif ($name == "HTTP-HEADER") {
			$this->xml_parser_in["http-header"] = false;
		}		
	}

	function characterData($parser, $data) {
		//print_r($this->xml_parser_in);
		//print $data;
    if ($this->xml_parser_in["aid"]) {
			$this->metadata['aid'] .= $data;
		}
    if ($this->xml_parser_in["url"]) {
			$this->metadata['url'] .= $data;
		}
		elseif ($this->xml_parser_in["type"]) {
			$this->metadata['type'] .= $data;		
		}
		elseif ($this->xml_parser_in["archival_time"]) {
			$this->metadata['archival_time'] .= $data;
		}
		elseif ($this->xml_parser_in["last_modified_time"]) {
			$this->metadata['last_modified_time'] .= $data;
		}
		elseif ($this->xml_parser_in["content_length"]) {
			$this->metadata['content_length'] .= $data;
		}
		elseif ($this->xml_parser_in["type"]) { 
			$this->metadata['type'] .= $data;
		}
		elseif ($this->xml_parser_in["charset"]) {
			$this->metadata['charset'] .= $data;
		}
		elseif ($this->xml_parser_in["filestatus"]) {
			$this->metadata['filestatus'] .= $data;
		}
		elseif ($this->xml_parser_in["filestatus_long"]) {
			$this->metadata['filestatus_long'] .= $data;
		}
		elseif ($this->xml_parser_in["content_checksum"]) {
			$this->metadata['content_checksum'] .= $data;
		}
		elseif ($this->xml_parser_in["http-header"]) {
			$this->metadata['http-header'] .= $data;
		}			
  }
}
?>

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib documentLocator.inc,1.2,1.3 config.inc,1.3,1.4

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2379/lib

Modified Files:
	documentLocator.inc config.inc 
Log Message:
Cleaning

Index: config.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.inc	5 Oct 2005 01:38:18 -0000	1.3
--- config.inc	5 Oct 2005 22:42:47 -0000	1.4
***************
*** 44,48 ****
  $conf_searchengine = "nutch";
  #$conf_searchengine_url = "http://wbsearch04.archive.org:8080/nutchwax/opensearch";
! $conf_searchengine_url = "http://localhost:8080/nutchwax/opensearch";
  $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc";
  $conf_index_class = $conf_searchengine . "Search";
--- 44,48 ----
  $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";
***************
*** 54,62 ****
  //  
  // TODO : Move this into the ARC Retriever
! $conf_aid_prefix = "/2/katrina/nutch-data/arcs/";
  $conf_aid_suffix = ".arc.gz";
  
  // Prefix to document retriever
! $document_retriever = "http://wbsearch04.archive.org:8080/ArcRetriever/ArcRetriever";
  $conf_document_retriever = "$document_retriever?reqtype=getfile&aid=";
  
--- 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=";
  

Index: documentLocator.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/documentLocator.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** documentLocator.inc	4 Oct 2005 23:40:44 -0000	1.2
--- documentLocator.inc	5 Oct 2005 22:42:47 -0000	1.3
***************
*** 76,80 ****
    * This method builds the query string, executes 
    * the query and populates the resultset array
!   * (resultset[1][archiveurl], resultset[1][dcdate], resultset[1][encoding], resultset[2][archiveurl], ...
    * If the method returns -1 use getErrorMessage to determine why
    *
--- 76,80 ----
    * This method builds the query string, executes 
    * the query and populates the resultset array
!   * (resultset[1][archiveurl], resultset[1][date], resultset[1][encoding], resultset[2][archiveurl], ...
    * If the method returns -1 use getErrorMessage to determine why
    *
***************
*** 124,128 ****
        $this->indexDriver->setSortorder($sortorder);
        $this->indexDriver->setSizeOfResultSet($sizeofresultset);
!       $this->indexDriver->setFieldsInResult("date dcformat url encoding archiveidentifier collection");
        
        if ($this->indexDriver->doQuery()) {
--- 124,128 ----
        $this->indexDriver->setSortorder($sortorder);
        $this->indexDriver->setSizeOfResultSet($sizeofresultset);
!       $this->indexDriver->setFieldsInResult("date mime url encoding archiveidentifier collection");
        
        if ($this->indexDriver->doQuery()) {
***************
*** 174,178 ****
    * Get the archive URI and mime class
    *
!   * @return array resultset containing archiveurl, dcdate and encoding
    */
    function getResultSet() {
--- 174,178 ----
    * Get the archive URI and mime class
    *
!   * @return array resultset containing url, date and encoding
    */
    function getResultSet() {

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera documentDispatcher.php,1.3,1.4 overview.php,1.3,1.4

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2379

Modified Files:
	documentDispatcher.php overview.php 
Log Message:
Cleaning

Index: documentDispatcher.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/documentDispatcher.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** documentDispatcher.php	5 Oct 2005 01:38:18 -0000	1.3
--- documentDispatcher.php	5 Oct 2005 22:42:47 -0000	1.4
***************
*** 133,138 ****
   *
   * @return array with metadata about document:
!  *                [dcdate]            = datestamp
!  *                [dcformat]          = mime-type
   *                [encoding]          = charcter encoding
   *                [archiveidentifier] = uri to document in the archive
--- 133,138 ----
   *
   * @return array with metadata about document:
!  *                [date]              = datestamp
!  *                [mime]              = mime-type
   *                [encoding]          = charcter encoding
   *                [archiveidentifier] = uri to document in the archive
***************
*** 155,161 ****
    $result = $locator->getResultSet();
    $document = $result[1];
!   $document['dcformat'] = index_decode($document['dcformat']);
!   if($document['dcformat'] == '' && $mime_hint != '') {
!     $document['dcformat'] = $mime_hint;
    }
    return $document;
--- 155,164 ----
    $result = $locator->getResultSet();
    $document = $result[1];
!   
!   #print_r($result);
!   #die("");
!   $document['mime'] = $document['mime'];
!   if($document['mime'] == '' && $mime_hint != '') {
!     $document['mime'] = $mime_hint;
    }
    return $document;
***************
*** 173,177 ****
  function type_resolver($document) {
    global $conf_document_handler;
!   $format = $document['dcformat'];
    if($conf_document_handler[$format]) {
      return $conf_document_handler[$format];
--- 176,180 ----
  function type_resolver($document) {
    global $conf_document_handler;
!   $format = $document['mime'];
    if($conf_document_handler[$format]) {
      return $conf_document_handler[$format];
***************
*** 196,201 ****
  function parse_document($handler_url, $document, $handler_has_links, $js) {
    global $conf_document_retriever, $conf_result_page, $mode;
!   $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['date'].'&mime='.$document['dcformat'].'&url='.$document['url'];
!   Header("content-type: " . $document['dcformat'], false);  
    if($handler_has_links && $mode != "external") {
      rewrite_document($handler_url, $conf_result_page, $js);
--- 199,209 ----
  function parse_document($handler_url, $document, $handler_has_links, $js) {
    global $conf_document_retriever, $conf_result_page, $mode;
!   $handler_url .= '?aid='.urlencode($conf_document_retriever . $document['archiveidentifier']).'&time='.$document['date'].'&mime='.$document['mime'].'&url='.$document['url'];
!   if ($document['encoding']) {
!   	Header("content-type: " . $document['mime'] . ", " . $document['encoding'], false);
!   }
!   else {
!   	Header("content-type: " . $document['mime'], false);
!   }  
    if($handler_has_links && $mode != "external") {
      rewrite_document($handler_url, $conf_result_page, $js);

Index: overview.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overview.php	5 Oct 2005 01:38:18 -0000	1.3
--- overview.php	5 Oct 2005 22:42:47 -0000	1.4
***************
*** 112,116 ****
  	
  	if ($numhits == 0) {
! 		print "Sorry, the url were not found in the index (" . $url . ")";
  	}
  	else {
--- 112,116 ----
  	
  	if ($numhits == 0) {
! 		print "Sorry, the url was not found in the index (" . $url . ")";
  	}
  	else {

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib/seal indexSearch.inc,1.2,1.3 nutch.inc,1.2,1.3

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2379/lib/seal

Modified Files:
	indexSearch.inc nutch.inc 
Log Message:
Cleaning

Index: indexSearch.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal/indexSearch.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** indexSearch.inc	4 Oct 2005 23:40:45 -0000	1.2
--- indexSearch.inc	5 Oct 2005 22:42:47 -0000	1.3
***************
*** 112,149 ****
    * Set query string for search
    *
-   * The query string must conform to the syntax
-   * outlined below. The query string may be in 
-   * upper, lower or mixed case.
-   * 
-   * Searching text indices:
-   *  schema.index:"word" - Word match
-   *  schema.index:"word*" - Right hand truncation, match for part of word
-   *  schema.index:"phrase" - Phrase match
-   * 
-   * Searching integer indices:
-   *  schema.index:i - Exact match
-   *  schema.index:[i;j] - Range(including boundaries)
-   *  schema.index:[i;] - Larger than or equal to
-   *  schema.index:[;i] - Smaller than or equal to
-   *  schema.index:>i - Larger than
-   *  schema.index:<i - Smaller than
-   * 
-   * In the context of the NWA Access Module schema will be NWA. 
-   * The index names will be defined by the NWA document format 
-   * (http://nwa.nb.no/nwa/export/1.0/).
-   * 
-   * Boolean operators:
-   * The NWA query language supports the boolean operators: AND, OR, ANDNOT
-   * 
-   * Parenthesis:
-   * The left parenthesis "(" and right parenthesis ")" are used 
-   * to dilineate one expression from another. For example, in the query 
-   *
-   *   dcdate:998690406 AND (title:"ouagadougou" 
-   *   OR title:"capitol of burkina fazo"), 
-   *
-   * parentheses group the ORs together so they are as a distinct 
-   * entity from the AND.
-   * 
    * @param  string  Query string
    */
--- 112,115 ----
***************
*** 169,176 ****
    * This method will populate the result set array
    * Returns an array of the following form:
!   *   Array([0]=>Array([dcdate]=>"2001-10-14"[dctitle]=>"Some title")
!   *         [1]=>Array([dcdate]=>"2001-10-15"[dctitle]=>"Another title"))
    * the fields returned in the array is determined by the 
!   * setResultFields method (e.g. setResultFields("dcdate, dctitle")
    *
    * @return boolean False if error
--- 135,142 ----
    * This method will populate the result set array
    * Returns an array of the following form:
!   *   Array([0]=>Array([date]=>"20011014203201"[title]=>"Some title")
!   *         [1]=>Array([date]=>"20010816121407"[title]=>"Another title"))
    * the fields returned in the array is determined by the 
!   * setResultFields method (e.g. setResultFields("date, title")
    *
    * @return boolean False if error
***************
*** 198,252 ****
      return $this->errormsg;
    }  
- 
-   /**
-   * Get the result set
-   *
-   * The method will return an xml formatted result of the following form:
-   * 
-   * <?xml version="1.0" encoding="utf-8"?>
-   * <resultset query="query" sortorder="descending" fields="dcdate, dctitle" hits=10 totalhits="112" spanstart="1" spanend="10" timespent="0.0017489194869995">
-   *   <doc id="1">
-   *     <dcdate></dcdate>
-   *     <dctitle></dctitle>
-   *   </doc>
-   *   <doc id="2">
-   *     <dcdate></dcdate>
-   *     <dctitle></dctitle>
-   *   </doc>  
-   *  ..
-   *  .
-   * </resultset>
-   *
-   * @return  string  Result set
-   */
-   function getXmlResultSet() {
-     global $HTTP_SERVER_VARS;
-     $address = "http://" . $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["SCRIPT_NAME"];
-     $resultsetarray=$this->getResultSet();
-     $spanstart=$this->offset+1;
-     if ($this->numhitstotal==0) {
-       $spanend="";
-       $spanstart="";
-     }
-     elseif ($this->numhits < $this->hitsperset) {
-       $spanend=$this->offset+$this->numhits;
-     }
-     else {
-       $spanend=$this->offset+$this->hitsperset;    
-     }
-     $retval='<?xml version="1.0" encoding="utf-8"?>'."\n";
-     $retval.=sprintf('<resultset address="%s" query="%s" sortorder="%s" fields="%s" hits="%d" totalhits="%d" hitsperset="%d" offset="%d" spanstart="%d" spanend="%d" timespent="%s">', $address, $this->query, $this->sortorder, implode(" ", $this->resultfields), $this->numhits, $this->numhitstotal, $this->hitsperset, $this->offset, $spanstart, $spanend, $this->timespent) . "\n";    
-     
-     $i=$this->offset;
-     while (list($setkey,$result)=each($this->resultset)) {
-       $retval.='  <doc id="'.++$i.'">'."\n";
-       while (list($key,$val)=each($result)) {
-         $retval.="    <".$key.">".$val."</".$key.">\n";
-       }
-       $retval.="  </doc>\n";
-     }        
-     $retval.="</resultset>\n";
-     return $retval; 
-   }
  }
  ?>
--- 164,167 ----

Index: nutch.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal/nutch.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nutch.inc	4 Oct 2005 23:40:45 -0000	1.2
--- nutch.inc	5 Oct 2005 22:42:47 -0000	1.3
***************
*** 198,203 ****
  		      if ($this->numhitstotal > 0) {
  		        foreach ($this->resultset as $key => $val) {
! 		            if (in_array("dcformat", $this->resultfields)) {
! 		                $this->resultset[$key]['dcformat'] = $this->mime[$key]['primary'] . "/" . $this->mime[$key]['sub'];
  		            }
  		            if (in_array("archiveidentifier", $this->resultfields)) {
--- 198,203 ----
  		      if ($this->numhitstotal > 0) {
  		        foreach ($this->resultset as $key => $val) {
! 		            if (in_array("mime", $this->resultfields)) {
! 		                $this->resultset[$key]['mime'] = $this->mime[$key]['primary'] . "/" . $this->mime[$key]['sub'];
  		            }
  		            if (in_array("archiveidentifier", $this->resultfields)) {
***************
*** 283,292 ****
            break;
          case "NUTCH:PRIMARYTYPE":
!           if (in_array("dcformat", $this->resultfields)) {
              $this->mime[$this->hitno]['primary'] .= $data;
            }
            break;          
          case "NUTCH:SUBTYPE":
!           if (in_array("dcformat", $this->resultfields)) {
              $this->mime[$this->hitno]['sub'] .= $data;
            }
--- 283,292 ----
            break;
          case "NUTCH:PRIMARYTYPE":
!           if (in_array("mime", $this->resultfields)) {
              $this->mime[$this->hitno]['primary'] .= $data;
            }
            break;          
          case "NUTCH:SUBTYPE":
!           if (in_array("mime", $this->resultfields)) {
              $this->mime[$this->hitno]['sub'] .= $data;
            }

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever index.jsp,1.2,1.3

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18468/src/webapps/arcretriever

Modified Files:
	index.jsp 
Log Message:

* src/webapps/arcretriever/index.jsp 
    Fix text.  Needs more work.


Index: index.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/index.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.jsp	5 Oct 2005 21:22:52 -0000	1.2
--- index.jsp	5 Oct 2005 21:34:58 -0000	1.3
***************
*** 8,13 ****
  <body bgcolor="#FFFFFF">
    <H1><img src="./images/logo.jpg" border=0 alt="Nordic Web Archive">
!    &nbsp NWA ARC Retriever</H1>
!    <p>TO BE UPDATED</p>
    <p>This application is
     capable of delivering web documents from archives in the ARC format.</p>
--- 8,12 ----
  <body bgcolor="#FFFFFF">
    <H1><img src="./images/logo.jpg" border=0 alt="Nordic Web Archive">
!    &nbsp ARC Retriever</H1>
    <p>This application is
     capable of delivering web documents from archives in the ARC format.</p>
***************
*** 18,21 ****
--- 17,21 ----
    <%=request.getRequestURL().substring(0, request.getRequestURL().lastIndexOf("/")).concat("/arcretriever")%>
     </A></P>
+    <p>TODO: Document different request types.</p>
  
    <H2>wera</H2>
***************
*** 23,27 ****
     <A href='http://archive-access.sourceforge.net/projects/wera/'>this page</A>.
  
!   <H2>Licenseinformation</H2>
     The arcretriever is open source software. Read <A href="LICENSE.txt">more</A>
     about the license information.
--- 23,27 ----
     <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.

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever/WEB-INF web.xml,1.1,1.2

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15407/src/webapps/arcretriever/WEB-INF

Modified Files:
	web.xml 
Log Message:
* src/webapps/arcretriever/error.jsp 
* src/webapps/arcretriever/index.jsp 
* src/webapps/arcretriever/WEB-INF/web.xml
    Point at new package for the arcretriever.



Index: web.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web.xml	5 Oct 2005 18:15:55 -0000	1.1
--- web.xml	5 Oct 2005 21:22:52 -0000	1.2
***************
*** 14,18 ****
      <servlet>
      	<servlet-name>arcretriever</servlet-name>
!     	<servlet-class>no.nb.nwa.ARCRetriever</servlet-class>
      </servlet>
      <servlet-mapping>
--- 14,18 ----
      <servlet>
      	<servlet-name>arcretriever</servlet-name>
!     	<servlet-class>no.nb.nwa.retriever.ARCRetriever</servlet-class>
      </servlet>
      <servlet-mapping>

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever error.jsp,1.1,1.2 index.jsp,1.1,1.2

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15407/src/webapps/arcretriever

Modified Files:
	error.jsp index.jsp 
Log Message:
* src/webapps/arcretriever/error.jsp 
* src/webapps/arcretriever/index.jsp 
* src/webapps/arcretriever/WEB-INF/web.xml
    Point at new package for the arcretriever.



Index: index.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.jsp	5 Oct 2005 18:15:55 -0000	1.1
--- index.jsp	5 Oct 2005 21:22:52 -0000	1.2
***************
*** 10,28 ****
     &nbsp NWA ARC Retriever</H1>
     <p>TO BE UPDATED</p>
!   <p>This web application is a part of the NWA Toolset. The application is
     capable of delivering web documents from archives in the ARC format.</p>
  
!   <H2>Configuring the NWA toolset for using the ARC retriever</H2>
!   <P>In the NWA toolset's config.inc file set the value of $document_retriever
!    to <A HREF="ArcRetriever">
!   <%=request.getRequestURL().substring(0, request.getRequestURL().lastIndexOf("/")).concat("/ArcRetriever")%>
     </A></P>
  
!   <H2>NWA Toolset</H2>
!    You can find information about the NWA project and the NWA Toolset at
!    <A href='http://nwa.nb.no/'>this page</A>.
  
    <H2>Licenseinformation</H2>
!    The NWA Toolset is open source software. Read <A href="LICENSE.txt">more</A>
     about the license information.
  </body>
--- 10,28 ----
     &nbsp NWA ARC Retriever</H1>
     <p>TO BE UPDATED</p>
!   <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>
  
!   <H2>wera</H2>
!    You can find information about wera at
!    <A href='http://archive-access.sourceforge.net/projects/wera/'>this page</A>.
  
    <H2>Licenseinformation</H2>
!    The arcretriever is open source software. Read <A href="LICENSE.txt">more</A>
     about the license information.
  </body>

Index: error.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/error.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** error.jsp	5 Oct 2005 18:15:55 -0000	1.1
--- error.jsp	5 Oct 2005 21:22:52 -0000	1.2
***************
*** 1,4 ****
  <%@
! 	page contentType="text/xml" pageEncoding="UTF-8" isErrorPage="true" import="no.nb.nwa.*"
  %><%
  	out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
--- 1,5 ----
  <%@
! 	page contentType="text/xml" pageEncoding="UTF-8" isErrorPage="true"
!         import="no.nb.nwa.retriever.*"
  %><%
  	out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");

[Archive-access-cvs] archive-access/projects/wera/lib arc-1.5.1-200508191341.jar,NONE,1.1 commons-httpclient-3.0-alpha2.jar,NONE,1.1 commons-logging-1.0.4.jar,NONE,1.1 dsi-unimi-it-1.0.0.kb.jar,NONE,1.1

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3108/lib

Added Files:
	arc-1.5.1-200508191341.jar commons-httpclient-3.0-alpha2.jar 
	commons-logging-1.0.4.jar dsi-unimi-it-1.0.0.kb.jar 
Log Message:
Add libs needed by arcretreiver.


--- NEW FILE: commons-logging-1.0.4.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dsi-unimi-it-1.0.0.kb.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: commons-httpclient-3.0-alpha2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: arc-1.5.1-200508191341.jar ---
(This appears to be a binary file; contents omitted.)

[Archive-access-cvs] archive-access/projects/wera/lib - New directory

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2705/lib

Log Message:
Directory /cvsroot/archive-access/archive-access/projects/wera/lib added to the repository

[Archive-access-cvs] archive-access/projects/wera maven.xml,1.2,1.3 project.properties,1.2,1.3 project.xml,1.5,1.6

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719

Modified Files:
	maven.xml project.properties project.xml 
Log Message:
Added building of the arcretriever war file.


Index: maven.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maven.xml	5 Oct 2005 00:06:30 -0000	1.2
--- maven.xml	5 Oct 2005 18:15:54 -0000	1.3
***************
*** 19,26 ****
          </exec>
      </goal>
- 
-     <!--Make jar a noop because this is a php project.-->
-     <goal name="jar" />
- 
      <preGoal name="xdoc:jelly-transform">
          <attainGoal name="faq" />
--- 19,22 ----
***************
*** 28,31 ****
--- 24,30 ----
      </preGoal>
  
+     <goal name="jar:jar" 
+         description="Blind out jar:jar -- we don't want a jar made"/>
+ 
      <postGoal name="site:generate" >
          <copy todir="${maven.build.dir}/docs/images">
***************
*** 38,41 ****
--- 37,43 ----
      <postGoal name="dist:prepare-bin-filesystem">
          <echo>[wera] dist:prepare-bin-filesystem postGoal</echo>
+         <!--Make up the arcretriever war file.-->
+         <attainGoal name="war" />
+ 
          <!--Set filter token used in a few instances below.-->
          <filter token="VERSION" value="${pom.currentVersion}" />
***************
*** 55,61 ****
            </fileset>
          </copy>
!         <!--Copy over the just made war files into the distribution copy.-->
          <copy todir="${maven.dist.bin.assembly.dir}/webapps">
!           <fileset dir="${maven.build.dir}/webapps" />
          </copy>
      </postGoal>
--- 57,68 ----
            </fileset>
          </copy>
! 
!         <!--Copy webapps into distribution webapps subdir.-->
!         <mkdir dir="${maven.dist.bin.assembly.dir}/webapps" />
          <copy todir="${maven.dist.bin.assembly.dir}/webapps">
!           <fileset dir="${maven.build.dir}/webapps" >
!             <exclude name="arcretriever/**" />
!           </fileset>
!           <fileset file="${maven.build.dir}/${maven.war.final.name}" />
          </copy>
      </postGoal>

Index: project.properties
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.properties	5 Oct 2005 00:06:30 -0000	1.2
--- project.properties	5 Oct 2005 18:15:54 -0000	1.3
***************
*** 22,23 ****
--- 22,34 ----
  maven.sdocbook.html.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
  maven.sdocbook.fo.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
+ 
+ # Local jars to add to classpath.
+ maven.jar.override = on
+ maven.jar.arc = ${basedir}/lib/arc-1.5.1-200508191341.jar
+ maven.jar.dsi-unimi-it = ${basedir}/lib/dsi-unimi-it-1.0.0.kb.jar
+ maven.jar.commons-logging-local = ${basedir}/lib/commons-logging-1.0.4.jar
+ maven.jar.commons-httpclient-local = ${basedir}/lib/commons-httpclient-3.0-rc3.jar
+ 
+ 
+ # Properties for building the ArcRetriever WAR.
+ maven.war.final.name = arcretriever.war

Index: project.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** project.xml	5 Oct 2005 00:06:30 -0000	1.5
--- project.xml	5 Oct 2005 18:15:54 -0000	1.6
***************
*** 113,116 ****
--- 113,192 ----
    <!-- jar files the project is dependent on -->
      <dependencies>
+         <dependency>
+             <id>dsi-unimi-it</id>
+             <version>1.0.0</version>
+             <url>http://mg4j.dsi.unimi.it/</url>
+             <properties>
+                 <war.bundle>true</war.bundle>
+                 <ear.bundle>true</ear.bundle>
+                 <ear.bundle.dir>APP-INF/lib</ear.bundle.dir>
+                 <description>Alternatives to String, 
+                 StringBuffer, unsynchronized I/0, and a ConsistentHashFunction.
+                 Made from subsets of mg4j-0.9.1 and fastutil-4.4.0,
+                 -- two jars that came of the ubicrawler project,
+                 http://ubi0.iit.cnr.it/projects/ubi/ -- using autojar:
+                 java -jar ~/workspace/autojar-1.2.2/autojar-1.2.2.jar -v -o
+                 dss.unimi.it-1.0.0.jar -c fastutil-4.4.0/fastutil-4.4.0.jar:mg4j-0.9.1/mg4j-0.9.1.jar:ubix-1.0.3/ubix-1.0.3.jar: it.unimi.dsi.mg4j.util.MutableString.class it.unimi.dsi.mg4j.io.FastBufferedInputStream.class it.unimi.dsi.mg4j.io.FastBufferedOutputStream.class it.unimi.dsi.mg4j.io.FastBufferedReader.class it.unimi.dsi.mg4j.io.FastByteArrayInputStream.class it.unimi.dsi.mg4j.io.FastByteArrayOutputStream.class it.unimi.dsi.mg4j.io.FastMultiByteArrayInputStream.class it.unimi.dsi.ubix.ConsistentHashFunction.class</description>
+                 <license>MG4J, ConsistentHashFunction, and fastutils are
+                 LGPL</license>
+             </properties>
+         </dependency>
+         <dependency>
+             <id>commons-logging-local</id>
+             <version>1.0.4</version>
+             <url>http://jakarta.apache.org/commons/logging.html</url>
+             <properties>
+                 <war.bundle>true</war.bundle>
+                 <ear.bundle>true</ear.bundle>
+                 <ear.bundle.dir>APP-INF/lib</ear.bundle.dir>
+                 <description>Provides logging adapters.
+                 Need to give this component an id other than the natural
+                 one of 'commons-logging' because of bug in 1.0.2 maven;
+                 our project.properties override that forces maven to use
+                 a local copy rather than pull one from the net is causing
+                 it confusion on initial setup (This feature worked fine in
+                 earlier mavens).
+                 </description>
+                 <license>Apache 2.0
+                 http://www.apache.org/licenses/LICENSE-2.0</license>
+             </properties>
+         </dependency>
+         <dependency>
+             <id>commons-httpclient</id>
+             <version>3.0-rc2</version>
+             <url>http://jakarta.apache.org/commons/httpclient/</url>
+             <properties>
+                 <war.bundle>true</war.bundle>
+                 <description>This package is used for fetching URIs via http.
+                 </description>
+                 <license>Apache 2.0
+                 http://www.apache.org/licenses/LICENSE-2.0</license>
+             </properties>
+         </dependency>
+         <dependency>
+             <groupId>tomcat</groupId>
+             <artifactId>servlet-api</artifactId>
+             <version>5.0.18</version>
+             <url>http://jakarta.apache.org/tomcat/</url>
+             <properties>
+                 <description />
+                 <license>
+                     http://jakarta.apache.org/site/legal.html
+                 </license>
+             </properties>
+         </dependency>
+         <dependency>
+             <id>arc</id>
+             <version>1.5.0</version>
+             <url>http://crawltools.archive.org:8080/cruisecontrol/buildresults/HEAD-heritrix</url>
+             <properties>
+                 <war.bundle>true</war.bundle>
+                 <description>ARC file reader/writers.  See under
+                 'Build Artifacts' under above link.  From Heritrix crawler
+                 at crawler.archive.org.
+                 </description>
+                 <license>LGPL</license>
+             </properties>
+         </dependency>
      </dependencies>
  

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever LICENSE.txt,NONE,1.1 error.jsp,NONE,1.1 index.jsp,NONE,1.1 style.css,NONE,1.1

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719/src/webapps/arcretriever

Added Files:
	LICENSE.txt error.jsp index.jsp style.css 
Log Message:
Added building of the arcretriever war file.


--- NEW FILE: LICENSE.txt ---
arcretreiver is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public license (GPL) reproduced below.  

		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program 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 General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- NEW FILE: index.jsp ---
<%@ page language="java"%>
<!DOCTYPE HTML PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
 <TITLE>arcretriever</TITLE>
 <LINK REL="STYLESHEET" TYPE="text/css" HREF="style.css">
</head>
<body bgcolor="#FFFFFF">
  <H1><img src="./images/logo.jpg" border=0 alt="Nordic Web Archive">
   &nbsp NWA ARC Retriever</H1>
   <p>TO BE UPDATED</p>
  <p>This web application is a part of the NWA Toolset. The application is
   capable of delivering web documents from archives in the ARC format.</p>

  <H2>Configuring the NWA toolset for using the ARC retriever</H2>
  <P>In the NWA toolset's config.inc file set the value of $document_retriever
   to <A HREF="ArcRetriever">
  <%=request.getRequestURL().substring(0, request.getRequestURL().lastIndexOf("/")).concat("/ArcRetriever")%>
   </A></P>

  <H2>NWA Toolset</H2>
   You can find information about the NWA project and the NWA Toolset at
   <A href='http://nwa.nb.no/'>this page</A>.

  <H2>Licenseinformation</H2>
   The NWA Toolset is open source software. Read <A href="LICENSE.txt">more</A>
   about the license information.
</body>
</html>

--- NEW FILE: style.css ---
body
	{
	background-color: White;
	margin: 5px 5px 5px 5px;
	font-family: arial, helvetica, helv, sans-serif;
	font-size: 12px
}
td, p, div, ul, ol, select, textarea
	{
	font-family: arial, helvetica, helv, sans-serif;
	font-size: 12px	
	}
b {font-weight: bold}
a {text-decoration: none}

/* Custom classes */
.page {
	background-color: White;
	color : Black;
}
.pageheader {
	background-color: #FFFFFF;
	color : Black;
	//background-image : url(pix/line_header_background.jpg);
	font-weight : bold;
	font-family: arial, helvetica, helv, sans-serif;
	font-size: 12px	
}
.footer {
	background-color: #FFFFFF;
	color : White;
	//background-image : url(pix/line_header_background.jpg);
}
.white {
	color : White;
}
.grey {
	background-color: #BBBBBB;
}

--- NEW FILE: error.jsp ---
<%@
	page contentType="text/xml" pageEncoding="UTF-8" isErrorPage="true" import="no.nb.nwa.*"
%><%
	out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
	ArcRetrieverException are;
	if (exception instanceof ArcRetrieverException) {
		are = (ArcRetrieverException) exception;
	} else {
		are = new ArcRetrieverException(7, exception);
	}
%>
<retrievermessage>
  <head>
    <errorcode><%=are.getErrorCode()%></errorcode>
    <errormessage><%=are.getLocalizedMessage()%></errormessage>
  </head><%
  	if (are.getCause() != null) {
  		out.println("\n  <body>");
  		out.println("Cause: " + are.getCause().getClass().getName() + ": " + are.getCause().getLocalizedMessage());
  		out.println("\nStack trace:");
		StackTraceElement[] trace = are.getCause().getStackTrace();
  		for (int i=0; i<trace.length; i++) {
  			out.println(trace[i].toString().replace("<", "&lt;").replace(">", "&gt;"));
  		}
  		out.println("  </body>");
  	}%>
</retrievermessage>

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever/WEB-INF web.xml,NONE,1.1

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719/src/webapps/arcretriever/WEB-INF

Added Files:
	web.xml 
Log Message:
Added building of the arcretriever war file.


--- NEW FILE: web.xml ---
<?xml version="1.0" ?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

<!-- Copyright (c) 2002 by ObjectLearn. All Rights Reserved. -->
<web-app>
    <display-name>arcretriever</display-name>
    <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.ARCRetriever</servlet-class>
    </servlet>
    <servlet-mapping>
    	<servlet-name>arcretriever</servlet-name>
    	<url-pattern>/arcretriever</url-pattern>
    </servlet-mapping>

    <welcome-file-list>
		<welcome-file>index.jsp</welcome-file>
	</welcome-file-list>

	<error-page>
		<error-code>404</error-code>
		<location>/error.jsp</location>
	</error-page>
</web-app>

[Archive-access-cvs] archive-access/projects/wera/src/java/no/nb/nwa/retriever AID.java,NONE,1.1 ARCRetriever.java,NONE,1.1 ArcRetrieverException.java,NONE,1.1

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/java/no/nb/nwa/retriever
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719/src/java/no/nb/nwa/retriever

Added Files:
	AID.java ARCRetriever.java ArcRetrieverException.java 
Log Message:
Added building of the arcretriever war file.


--- NEW FILE: AID.java ---
/*
 *  This file is part of The NWA Toolset.
 *
 *  Copyright (C) 2001-2002 Royal Library in Stockholm,
 *                          Royal Library in Copenhagen,
 *                          Helsinki University Library of Finland, 
 *                          National Library of Norway,
 *                          National and University Library of Iceland.
 *
 *  The NWA Toolset is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  The NWA Toolset 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 General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with The NWA Toolset; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

package no.nb.nwa.retriever;

/**
 * 
 * @author John Erik Halse
 *  
 */
public class AID {

    private final String aid;

    private final String filename;

    private final long offset;

    /**
     * @throws ArcRetrieverException
     *  
     */
    public AID(String aid) throws ArcRetrieverException {
        try {
            this.aid = aid;
            int filenameOffset = aid.indexOf('/');
            this.filename = aid.substring(filenameOffset);
            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;
    }

    /**
     * @return Returns the offset.
     */
    public long getOffset() {
        return offset;
    }

    public String toString() {
        return aid;
    }
}

--- NEW FILE: ARCRetriever.java ---
/*
 *  This file is part of The NWA Toolset.
 *
 *  Copyright (C) 2001-2002 Royal Library in Stockholm,
 *                          Royal Library in Copenhagen,
 *                          Helsinki University Library of Finland, 
 *                          National Library of Norway,
 *                          National and University Library of Iceland.
 *
 *  The NWA Toolset is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  The NWA Toolset 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 General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with The NWA Toolset; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

package no.nb.nwa.retriever;

import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HeaderGroup;
import org.archive.io.arc.ARCReader;
import org.archive.io.arc.ARCReaderFactory;
import org.archive.io.arc.ARCRecord;
import org.archive.io.arc.ARCRecordMetaData;
import org.archive.util.ArchiveUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;

/**
 * 
 * @author John Erik Halse
 *  
 */
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) {
            handleException(response, e);
        }
    }

    protected void doPost(HttpServletRequest request,
            HttpServletResponse response) throws ServletException, IOException {
        this.doGet(request, response);
    }

    public void getFileStatus(HttpServletResponse response, AID aid)
            throws ArcRetrieverException {
        response.setContentType("text/xml; charset=UTF-8");

        String status = "";
        String status_long = "";
        File file = new File(aid.getFilename());
        ARCReader arc = null;
        try {
            arc = ARCReaderFactory.get(file);
            ARCRecord rec = null;
            try {
                rec = arc.get(aid.getOffset());
                status = "online";
                status_long = "Document is available.";
            } catch (IOException e) {
                status = "non-existent";
                status_long = "No document at offset: " + aid.getOffset();
            } finally {
                if (rec != null) rec.close();
            }
        } catch (IOException e) {
            status = "non-existent";
            //            status_long = "File '" + file.getAbsolutePath()
            status_long = "File '" + aid.getFilename()
                    + "' doesn't exist or is not an ARC file.";
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                if (arc != null) arc.close();
            } catch (IOException e) {
            }
        }

        try {
            Document dom = DocumentBuilderFactory.newInstance()
                    .newDocumentBuilder().newDocument();
            Node msg = dom.appendChild(dom.createElement("retrievermessage"));
            Node head = msg.appendChild(dom.createElement("head"));
            addTextElement(head, "reqtype", "getfilestatus");
            addTextElement(head, "aid", aid.toString());
            Node body = msg.appendChild(dom.createElement("body"));
            addTextElement(body, "filestatus", status);
            addTextElement(body, "filestatus_long", status_long);

            Transformer transformer = TransformerFactory.newInstance()
                    .newTransformer();
            transformer.setOutputProperty("indent", "yes");
            Result res = new StreamResult(response.getOutputStream());
            Source source = new DOMSource(dom);
            transformer.transform(source, res);
        } catch (ParserConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (IOException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        }
    }

    public void getArchiveInfo(HttpServletResponse response)
            throws ArcRetrieverException {
        response.setContentType("text/xml; charset=UTF-8");

        try {
            Document dom = DocumentBuilderFactory.newInstance()
                    .newDocumentBuilder().newDocument();
            Node msg = dom.appendChild(dom.createElement("retrievermessage"));
            Node head = msg.appendChild(dom.createElement("head"));
            addTextElement(head, "reqtype", "getarchiveinfo");
            Node body = msg.appendChild(dom.createElement("body"));
            addTextElement(body, "info", "ArcRetriever");

            Transformer transformer = TransformerFactory.newInstance()
                    .newTransformer();
            transformer.setOutputProperty("indent", "yes");
            Result res = new StreamResult(response.getOutputStream());
            Source source = new DOMSource(dom);
            transformer.transform(source, res);
        } catch (ParserConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (IOException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        }
    }

    public void getMeta(HttpServletResponse response, AID aid)
            throws ArcRetrieverException {
        ARCReader arc = null;
        ARCRecord rec = null;
        OutputStream out = null;
        try {
            File file = new File(aid.getFilename());
            try {
                arc = ARCReaderFactory.get(file);
                rec = arc.get(aid.getOffset());
            } catch (IOException e) {
                throw new ArcRetrieverException(
                        ArcRetrieverException.ERROR_OBJECT_NOT_ACCESSIBLE);
            } catch (Exception e) {
                throw new ArcRetrieverException(
                        ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
            }
            ARCRecordMetaData meta = rec.getMetaData();
            out = response.getOutputStream();
            HeaderGroup headers = new HeaderGroup();
            headers.setHeaders(rec.getHttpHeaders());

            response.setContentType("text/xml; charset=UTF-8");

            Document dom = DocumentBuilderFactory.newInstance()
                    .newDocumentBuilder().newDocument();
            Node msg = dom.appendChild(dom.createElement("retrievermessage"));
            Node head = msg.appendChild(dom.createElement("head"));
            addTextElement(head, "reqtype", "getmeta");
            addTextElement(head, "aid", aid.toString());
            Node body = msg.appendChild(dom.createElement("body"));
            Node metadata = body.appendChild(dom.createElement("metadata"));
            addTextElement(metadata, "url", meta.getUrl());
            String arcDate = meta.getDate();
            addTextElement(metadata, "archival_time", arcDate);

            try {
                // Trying to parse dates in the following format:
                // Mon, 14 Jun 2004 11:13:02 GMT
                DateFormat df = new SimpleDateFormat(
                        "E, d MMM yyyy HH:mm:ss z", Locale.US);
                String lastModDate = getHttpHeader(headers, "last-modified");
                lastModDate = ArchiveUtils.get14DigitDate(df.parse(lastModDate)
                        .getTime());
                addTextElement(metadata, "last_modified_time", lastModDate);
            } catch (ParseException e) {
                addTextElement(metadata, "last_modified_time", arcDate);
            } catch (NullPointerException e) {
                addTextElement(metadata, "last_modified_time", arcDate);
            }
            addTextElement(metadata, "content_length", getHttpHeader(headers,
                    "content-length"));
            Node contenttype = metadata.appendChild(dom
                    .createElement("contenttype"));
            addTextElement(contenttype, "type", meta.getMimetype());
            String contentTypeString = getHttpHeader(headers, "content-type");
            String charset = "";
            if (contentTypeString != null) {
                Matcher m = charsetPattern.matcher(contentTypeString
                        .toLowerCase());
                if (m.matches()) {
                    charset = m.group(1);
                }
            }
            addTextElement(contenttype, "charset", charset);
            addTextElement(metadata, "filestatus", "online");
            addTextElement(metadata, "filestatus_long", "");
            // TODO: Fix.
            // String header = rec.getHttpHeaderString().replaceAll("\r", "");
            String header = "UNIMPLEMENTED-TODO";
            //remove illegal XML-characters
            header = header.replaceAll("[\\p{Cc}&&[^\\u0009\\u000A\\u000D]]+",
                    "???");
            header = header.trim();
            rec.close();
            addTextElement(metadata, "content_checksum", meta.getDigest());
            arc.close();

            addTextElement(metadata, "http-header", header);

            Transformer transformer = TransformerFactory.newInstance()
                    .newTransformer();
            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
            Result res = new StreamResult(out);
            Source source = new DOMSource(dom);
            transformer.transform(source, res);
        } catch (ParserConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerConfigurationException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (IOException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } catch (TransformerException e) {
            throw new ArcRetrieverException(
                    ArcRetrieverException.ERROR_BAD_FUNCTION_ARGUMENT, e);
        } finally {
            try {
                if (out != null) out.close();
            } catch (IOException e) {
            }
        }
    }

    private String getHttpHeader(HeaderGroup headers, String headerName) {
        Header header = headers.getCondensedHeader(headerName);
        return header == null ? "" : header.getValue();
    }

    private void addTextElement(Node parent, String elementName, String value) {
        value = value == null ? "" : value;
        Document dom = parent.getOwnerDocument();
        parent.appendChild(dom.createElement(elementName)).appendChild(
                dom.createTextNode(value));
    }

    private void addCDataElement(Node parent, String elementName, String value) {
        value = value == null ? "" : value;
        Document dom = parent.getOwnerDocument();
        parent.appendChild(dom.createElement(elementName)).appendChild(
                dom.createCDATASection(value));
    }

    public void getDocument(HttpServletResponse response, AID aid)
            throws Exception {
        OutputStream out = response.getOutputStream();
        ARCRecord rec = null;
        ARCReader arc = null;
        File file = new File(aid.getFilename());
        arc = ARCReaderFactory.get(file);
        rec = arc.get(aid.getOffset());
        ARCRecordMetaData meta = rec.getMetaData();
        rec.skipHttpHeader();
        HeaderGroup headers = new HeaderGroup();
        headers.setHeaders(rec.getHttpHeaders());
        String contentTypeString = getHttpHeader(headers, "content-type");
        response.setContentType(contentTypeString);
        //response.setContentLength((int) meta.getLength());

        byte[] buf = new byte[1024];
        int c;
        while ((c = rec.read(buf)) != -1) {
            out.write(buf, 0, c);
        }
        out.flush();
        rec.close();
        arc.close();
    }

    private void handleException(HttpServletResponse response, Throwable t)
            throws UnsupportedEncodingException, IOException {
        response.setContentType("text/xml; charset=UTF-8");
        PrintWriter out = new PrintWriter(new OutputStreamWriter(response
                .getOutputStream(), "UTF-8"));
        out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
        ArcRetrieverException are;
        if (t instanceof ArcRetrieverException) {
            are = (ArcRetrieverException) t;
        } else {
            are = new ArcRetrieverException(7, t);
        }

        out.println("<retrievermessage>");
        out.println("  <head>");
        out.println("    <errorcode>" + are.getErrorCode() + "</errorcode>");
        out.println("    <errormessage>" + are.getLocalizedMessage()
                + "</errormessage>");
        out.println("  </head>");
        if (are.getCause() != null) {
            out.println("\n  <body>");
            out.println("Cause: " + are.getCause().getClass().getName() + ": "
                    + are.getCause().getLocalizedMessage());
            out.println("\nStack trace:");
            StackTraceElement[] trace = are.getCause().getStackTrace();
            for (int i = 0; i < trace.length; i++) {
                out.println(trace[i].toString().replaceAll("<", "&lt;").replaceAll(
                        ">", "&gt;"));
            }
            out.println("  </body>");
        }
        out.println("</retrievermessage>");
        out.flush();
        out.close();
    }
}

--- NEW FILE: ArcRetrieverException.java ---
/*
 *  This file is part of The NWA Toolset.
 *
 *  Copyright (C) 2001-2002 Royal Library in Stockholm,
 *                          Royal Library in Copenhagen,
 *                          Helsinki University Library of Finland, 
 *                          National Library of Norway,
 *                          National and University Library of Iceland.
 *
 *  The NWA Toolset is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  The NWA Toolset 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 General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with The NWA Toolset; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

package no.nb.nwa.retriever;


/**
 * 
 * @author John Erik Halse
 *
 */
public class ArcRetrieverException extends Exception {
    public final static int ERROR_REQTYPE_MISSING = 1;
    public final static int ERROR_ARCHIVE_IDENTIFIER_MISSING = 2;
    public final static int ERROR_UNSUPPORTED_REQTYPE = 3;
    public final static int ERROR_UNABLE_TO_PARSE_ARCHIVE_IDENTIFIER = 4;
    public final static int ERROR_DOCUMENT_ROOT_NOT_SET = 5;
    public final static int ERROR_OBJECT_NOT_ACCESSIBLE = 6;
    public final static int ERROR_BAD_FUNCTION_ARGUMENT = 7;

    private final static String[] msg = {
        "",
        "Reqtype missing",
        "Archive Identifier missing",
        "Unsupported reqtype",
        "Unable to parse Archive Identifier",
        "Document Root not set",
        "Object not accessible",
        "Bad function argument"
    };
    
    private final int errorCode;
    
    /**
     * 
     */
    private ArcRetrieverException() {
        this.errorCode = 0;
    }

    /**
     * @param type
     */
    public ArcRetrieverException(int type) {
        super(msg[type]);
        this.errorCode = type;
    }

    /**
     * @param type
     * @param cause
     */
    public ArcRetrieverException(int type, Throwable cause) {
        super(msg[type], cause);
        this.errorCode = type;
    }
    
    public int getErrorCode() {
        return errorCode;
    }
}

[Archive-access-cvs] archive-access/projects/wera/src/webapps ArcRetriever.war,1.1,NONE

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719/src/webapps

Removed Files:
	ArcRetriever.war 
Log Message:
Added building of the arcretriever war file.


--- ArcRetriever.war DELETED ---

[Archive-access-cvs] archive-access/projects/wera/src/webapps/arcretriever/images logo.jpg,NONE,1.1

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/arcretriever/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1719/src/webapps/arcretriever/images

Added Files:
	logo.jpg 
Log Message:
Added building of the arcretriever war file.


--- NEW FILE: logo.jpg ---
(This appears to be a binary file; contents omitted.)

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib config.inc,1.2,1.3

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472/lib

Modified Files:
	config.inc 
Log Message:
changing NwaToolset references to WERA

Index: config.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.inc	4 Oct 2005 23:40:44 -0000	1.2
--- config.inc	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 5,9 ****
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland, 
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
--- 5,9 ----
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland,
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
***************
*** 37,41 ****
  
  // Path to includefiles
! $conf_rootpath = "/opt/lampp/htdocs/archive-access-wera";
  $conf_includepath = "$conf_rootpath/lib";
  $conf_searchenginepath = "$conf_includepath/seal";
--- 37,41 ----
  
  // Path to includefiles
! $conf_rootpath = "/opt/lampp/htdocs/aaWera";
  $conf_includepath = "$conf_rootpath/lib";
  $conf_searchenginepath = "$conf_includepath/seal";
***************
*** 43,47 ****
  // What search engine to use
  $conf_searchengine = "nutch";
! $conf_searchengine_url = "http://wbsearch04.archive.org:8080/nutchwax/opensearch";
  $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc";
  $conf_index_class = $conf_searchengine . "Search";
--- 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:8080/nutchwax/opensearch";
  $conf_index_file = $conf_searchenginepath . "/" . $conf_searchengine . ".inc";
  $conf_index_class = $conf_searchengine . "Search";
***************
*** 61,65 ****
  
  // URL of gui installation
! $conf_http_host = "http://localhost/archive-access-wera";
  
  // Logo
--- 62,66 ----
  
  // URL of gui installation
! $conf_http_host = "http://localhost/aaWera";
  
  // Logo
***************
*** 91,96 ****
  // Mapping to collections reciding at other hosts
  // Not needed when all of the indexed material is served by this installation 
! // $conf_locations["ext1"] = "http://somewhereelse1.com/nwatoolset/result.php";
! // $conf_locations["ext2"] = "http://somewhereelse2.com/nwatoolset/result.php";
  
  // JavaScript disable/enabled for archived pages viewed in Archive Document View
--- 92,97 ----
  // Mapping to collections reciding at other hosts
  // Not needed when all of the indexed material is served by this installation 
! // $conf_locations["ext1"] = "http://somewhereelse1.com/wera/result.php";
! // $conf_locations["ext2"] = "http://somewhereelse2.com/wera/result.php";
  
  // JavaScript disable/enabled for archived pages viewed in Archive Document View

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera help.php,1.1,1.2 overview.php,1.2,1.3 documentDispatcher.php,1.2,1.3 index.php,1.2,1.3 result.php,1.2,1.3 top.php,1.2,1.3 asearch.php,1.2,1.3

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472

Modified Files:
	help.php overview.php documentDispatcher.php index.php 
	result.php top.php asearch.php 
Log Message:
changing NwaToolset references to WERA

Index: result.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/result.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** result.php	4 Oct 2005 23:40:44 -0000	1.2
--- result.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,5 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
--- 1,5 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
***************
*** 9,18 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,24 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

Index: asearch.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/asearch.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** asearch.php	4 Oct 2005 23:40:44 -0000	1.2
--- asearch.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,7 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
!  *  Copyright (C) 2001-2004 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
--- 1,7 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
!  *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
***************
*** 9,18 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,24 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

Index: index.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	4 Oct 2005 23:40:44 -0000	1.2
--- index.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,7 ****
  <?php
- 
- 
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
--- 1,5 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
***************
*** 11,20 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 22,26 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

Index: documentDispatcher.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/documentDispatcher.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** documentDispatcher.php	4 Oct 2005 23:40:44 -0000	1.2
--- documentDispatcher.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,7 ****
  <?php
- 
- 
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
--- 1,5 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
***************
*** 11,20 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 22,26 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
***************
*** 232,236 ****
  	  /*
  	  *  $js_regex = "'<script[^>]*?>.*?</script>'si";
! 	  *  $js_replace = "<script language=\"Javascript\"><!-- NWA HAS BEEN CONFIGURED TO DISABLE THIS JAVASCRIPT SECTION. --></script>";
  	  *  $content_nojs = preg_replace($js_regex,$js_replace,$content);
  	  *  print($js. $content_nojs);
--- 230,234 ----
  	  /*
  	  *  $js_regex = "'<script[^>]*?>.*?</script>'si";
! 	  *  $js_replace = "<script language=\"Javascript\"><!-- WERA HAS BEEN CONFIGURED TO DISABLE THIS JAVASCRIPT SECTION. --></script>";
  	  *  $content_nojs = preg_replace($js_regex,$js_replace,$content);
  	  *  print($js. $content_nojs);
***************
*** 251,255 ****
  
  
!     $js_replace = array("<script language=\"Javascript\"><!-- NWA HAS BEEN CONFIGURED TO DISABLE THIS JAVASCRIPT SECTION - FOR THIS PAGE. --></script>",
      "",
      "",
--- 249,253 ----
  
  
!     $js_replace = array("<script language=\"Javascript\"><!-- WERA HAS BEEN CONFIGURED TO DISABLE THIS JAVASCRIPT SECTION - FOR THIS PAGE. --></script>",
      "",
      "",

Index: top.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/top.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** top.php	4 Oct 2005 23:40:44 -0000	1.2
--- top.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,5 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
--- 1,5 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
***************
*** 9,18 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,31 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
  
  /*
   * File: top.php
   *
!  * This file is the top-frame of the NWA browser. This script implements
   * currents the timeline.
   * The top.php is only referenced from the result.php script
--- 20,31 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  
  /*
   * File: top.php
   *
!  * This file is the top-frame of the WERA version browser. This script implements
   * currents the timeline.
   * The top.php is only referenced from the result.php script

Index: overview.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** overview.php	4 Oct 2005 23:40:44 -0000	1.2
--- overview.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 9,18 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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

Index: help.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/help.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** help.php	4 Oct 2005 22:59:27 -0000	1.1
--- help.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,8 ****
  <?php 
- 
  /*
!  *  This file is part of The NWA Toolset.
   *
!  *  Copyright (C) 2001-2004 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
--- 1,7 ----
  <?php 
  /*
!  *  This file is part of WERA.
   *
!  *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
***************
*** 10,19 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 21,25 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
***************
*** 45,49 ****
  <HEAD>
  <link rel="stylesheet" href="<?php print $conf_gui_style;?>" type="text/css">
! <TITLE>NwaToolset help</TITLE>
  </HEAD>
  
--- 44,48 ----
  <HEAD>
  <link rel="stylesheet" href="<?php print $conf_gui_style;?>" type="text/css">
! <TITLE>WERA help</TITLE>
  </HEAD>
  

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/handlers passthrough.php,1.1,1.2 html_javascript.php,1.1,1.2

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472/handlers

Modified Files:
	passthrough.php html_javascript.php 
Log Message:
changing NwaToolset references to WERA

Index: html_javascript.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/handlers/html_javascript.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** html_javascript.php	4 Oct 2005 22:59:27 -0000	1.1
--- html_javascript.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,18 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland, 
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 1,18 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland,
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,24 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
***************
*** 31,35 ****
   * The javascript is based on one of Internet Archives Wayback Machine
   * installations. A few modifications have been made to adapt it to the 
!  * NwaToolset url scheme.
   *
   * Please Note ! 
--- 31,35 ----
   * The javascript is based on one of Internet Archives Wayback Machine
   * installations. A few modifications have been made to adapt it to the 
!  * WERA url scheme.
   *
   * Please Note ! 

Index: passthrough.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/handlers/passthrough.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** passthrough.php	4 Oct 2005 22:59:27 -0000	1.1
--- passthrough.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,18 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland, 
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 1,18 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
!  *                          Helsinki University Library of Finland,
   *                          National Library of Norway,
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,24 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/test findversions.php,1.2,1.3 meta.php,1.1,1.2

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472/test

Modified Files:
	findversions.php meta.php 
Log Message:
changing NwaToolset references to WERA

Index: meta.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/test/meta.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** meta.php	4 Oct 2005 23:49:07 -0000	1.1
--- meta.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,5 ****
  <?php
  /*
!  *  This file is part of The NWA Toolset.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
--- 1,5 ----
  <?php
  /*
!  *  This file is part of WERA.
   *
   *  Copyright (C) 2001-2002 Royal Library in Stockholm,
***************
*** 9,18 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 20,24 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

Index: findversions.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/test/findversions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** findversions.php	4 Oct 2005 23:40:45 -0000	1.2
--- findversions.php	5 Oct 2005 01:38:18 -0000	1.3
***************
*** 1,4 ****
--- 1,28 ----
  <?php
  /*
+  *  This file is part of WERA.
+  *
+  *  Copyright (C) 2001-2002 Royal Library in Stockholm,
+  *                          Royal Library in Copenhagen,
+  *                          Helsinki University Library of Finland,
+  *                          National Library of Norway,
+  *                          National and University Library of Iceland.
+  *
+  *  WERA is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  WERA 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 General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with WERA; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+ /*
   * Created on Aug 29, 2005
   *

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/help no_help.php,1.1,1.2 en_help.php,1.1,1.2

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472/help

Modified Files:
	no_help.php en_help.php 
Log Message:
changing NwaToolset references to WERA

Index: en_help.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/help/en_help.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** en_help.php	4 Oct 2005 22:59:27 -0000	1.1
--- en_help.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,8 ****
  <?php 
- 
  /*
!  *  This file is part of The NWA Toolset.
   *
!  *  Copyright (C) 2001-2004 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
--- 1,7 ----
  <?php 
  /*
!  *  This file is part of WERA.
   *
!  *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
***************
*** 10,19 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 21,25 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

Index: no_help.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/help/no_help.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** no_help.php	4 Oct 2005 22:59:27 -0000	1.1
--- no_help.php	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 1,8 ****
  <?php 
- 
  /*
!  *  This file is part of The NWA Toolset.
   *
!  *  Copyright (C) 2001-2004 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
--- 1,7 ----
  <?php 
  /*
!  *  This file is part of WERA.
   *
!  *  Copyright (C) 2001-2002 Royal Library in Stockholm,
   *                          Royal Library in Copenhagen,
   *                          Helsinki University Library of Finland,
***************
*** 10,19 ****
   *                          National and University Library of Iceland.
   *
!  *  The NWA Toolset is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  The NWA Toolset 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
--- 9,18 ----
   *                          National and University Library of Iceland.
   *
!  *  WERA is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 2 of the License, or
   *  (at your option) any later version.
   *
!  *  WERA 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
***************
*** 21,25 ****
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with The NWA Toolset; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
--- 20,24 ----
   *
   *  You should have received a copy of the GNU General Public License
!  *  along with WERA; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera/lib/seal fast.inc,1.1,1.2

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25472/lib/seal

Modified Files:
	fast.inc 
Log Message:
changing NwaToolset references to WERA

Index: fast.inc
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal/fast.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fast.inc	4 Oct 2005 22:59:28 -0000	1.1
--- fast.inc	5 Oct 2005 01:38:18 -0000	1.2
***************
*** 125,129 ****
      || FAST specific
      || ------------
!     || Used for adapting NWA Search Engine Abstraction Layer queries to FAST Data Search  
      || index structure.
      ||
--- 125,129 ----
      || FAST specific
      || ------------
!     || Used for adapting WERA Search Engine Abstraction Layer queries to FAST Data Search  
      || index structure.
      ||