Ignore:
Timestamp:
2008-05-20T13:26:50+12:00 (16 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) Renamed mggdbmsourceclass to mgsourceclass, and lucenegdbmsourceclass to lucenesourceclass.

Location:
gsdl/trunk/src/colservr
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/src/colservr/collectset.cpp

    r15592 r15593  
    238238    cserver->add_filter (queryfilter);
    239239   
    240     // add a mg and gdbm source
    241     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
    242     mggdbmsource->set_db_ptr (gdbmhandler);
    243     mggdbmsource->set_textsearchptr (mgsearch);
    244     cserver->add_source (mggdbmsource);
     240    // add a mg source
     241    mgsourceclass *mgsource = new mgsourceclass ();
     242    mgsource->set_db_ptr (gdbmhandler);
     243    mgsource->set_textsearchptr (mgsearch);
     244    cserver->add_source (mgsource);
    245245  }
    246246  else if (buildtype == "mgpp") {
    … …  
    253253    cserver->add_filter (queryfilter);
    254254     
    255     // add a mg and gdbm source
    256     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
    257     mggdbmsource->set_db_ptr (gdbmhandler);
    258     mggdbmsource->set_textsearchptr (mgppsearch);
    259     cserver->add_source (mggdbmsource);
     255    // add a mg source
     256    mgsourceclass *mgsource = new mgsourceclass ();
     257    mgsource->set_db_ptr (gdbmhandler);
     258    mgsource->set_textsearchptr (mgppsearch);
     259    cserver->add_source (mgsource);
    260260  }
    261261  else if (buildtype == "lucene") {
    … …  
    269269    cserver->add_filter (queryfilter);
    270270     
    271     // add a lucene and gdbm source
    272     lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass ();
    273     lucenegdbmsource->set_db_ptr (gdbmhandler);
    274     lucenegdbmsource->set_textsearchptr (lucenesearch);
    275     cserver->add_source (lucenegdbmsource);
     271    // add a lucene source
     272    lucenesourceclass *lucenesource = new lucenesourceclass ();
     273    lucenesource->set_db_ptr (gdbmhandler);
     274    lucenesource->set_textsearchptr (lucenesearch);
     275    cserver->add_source (lucenesource);
    276276  }
    277277

  • gsdl/trunk/src/colservr/lucenesource.cpp

    r15592 r15593  
    11/**********************************************************************
    22 *
    3  * lucenegdbmsource.cpp --
     3 * lucenesource.cpp --
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    3030#include "lucenesearch.h"
    3131
    32 lucenegdbmsourceclass::lucenegdbmsourceclass ()
     32lucenesourceclass::lucenesourceclass ()
    3333  : sourceclass()
    3434{
    … …  
    3636}
    3737
    38 lucenegdbmsourceclass::~lucenegdbmsourceclass () {
     38lucenesourceclass::~lucenesourceclass () {
    3939}
    4040
    41 bool lucenegdbmsourceclass::get_document (const text_t &OID, text_t &doc,
     41bool lucenesourceclass::get_document (const text_t &OID, text_t &doc,
    4242                      comerror_t &err, ostream &logout) {
    4343
    … …  
    4747    // most likely a configuration problem
    4848    logout << text_t2ascii
    49        << "configuration error: lucenegdbmsource contains a null dbclass\n\n";
     49       << "configuration error: lucenesource contains a null dbclass\n\n";
    5050    err = configurationError;
    5151    return true;

  • gsdl/trunk/src/colservr/lucenesource.h

    r15592 r15593  
    11/**********************************************************************
    22 *
    3  * lucenegdbmsource.h --
     3 * lucenesource.h --
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    2525
    2626
    27 #ifndef LUCENEGDBMSOURCE_H
    28 #define LUCENEGDBMSOURCE_H
     27#ifndef LUCENESOURCE_H
     28#define LUCENESOURCE_H
    2929
    3030#include "gsdlconf.h"
    … …  
    3636
    3737
    38 class lucenegdbmsourceclass : public sourceclass {
     38class lucenesourceclass : public sourceclass {
    3939public:
    40   lucenegdbmsourceclass ();
    41   virtual ~lucenegdbmsourceclass ();
     40  lucenesourceclass ();
     41  virtual ~lucenesourceclass ();
    4242
    4343  bool get_document (const text_t &OID, text_t &doc,

  • gsdl/trunk/src/colservr/mgsource.cpp

    r15592 r15593  
    11/**********************************************************************
    22 *
    3  * mggdbmsource.cpp --
     3 * mgsource.cpp --
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    2727
    2828
    29 mggdbmsourceclass::mggdbmsourceclass ()
     29mgsourceclass::mgsourceclass ()
    3030  : sourceclass()
    3131{
    … …  
    3333}
    3434
    35 mggdbmsourceclass::~mggdbmsourceclass ()
     35mgsourceclass::~mgsourceclass ()
    3636{
    3737}

  • gsdl/trunk/src/colservr/mgsource.h

    r15592 r15593  
    11/**********************************************************************
    22 *
    3  * mggdbmsource.h --
     3 * mgsource.h --
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    2525
    2626
    27 #ifndef MGGDBMSOURCE_H
    28 #define MGGDBMSOURCE_H
     27#ifndef MGSOURCE_H
     28#define MGSOURCE_H
    2929
    3030#include "source.h"
    3131
    3232
    33 class mggdbmsourceclass : public sourceclass {
     33class mgsourceclass : public sourceclass {
    3434public:
    35   mggdbmsourceclass ();
    36   virtual ~mggdbmsourceclass ();
     35  mgsourceclass ();
     36  virtual ~mgsourceclass ();
    3737
    3838};
Note: See TracChangeset for help on using the changeset viewer.