[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() {