Changeset 112


Ignore:
Timestamp:
1999-01-12T14:51:06+13:00 (25 years ago)
Author:
rjmcnab
Message:

Standard header.

Location:
trunk/gsdl
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/lib/Makefile

    r100 r112  
    11###########################################################################
    22#
    3 # Makefile.in -- Makefile for general C++ libraries
     3# Makefile -- Makefile for general C++ libraries
    44# Copyright (C) 1999  The New Zealand Digital Library Project
    55#
    … …  
    1111AR = ar
    1212CC = gcc
    13 CCFLAGS =
    14 DEFS = -g
     13CCFLAGS = -g -Wall
     14DEFS =
     15INCLUDES = -I../packages/mg-1.3d/lib
    1516RANLIB = ranlib
    16 INCLUDES = -I../packages/mg-1.3d/lib
    1717
    1818 
    19 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     19COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    2020 
    2121.SUFFIXES:
    … …  
    2929 
    3030
    31 HEADERS = text_h.h display.h cfgread.h fileutil.h gsdlunicode.h
     31HEADERS = \
     32  cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
     33  display.h      gsdlconf.h     site.h
    3234
    33 SOURCES = text_t.cpp display.cpp cfgread.cpp fileutil.cpp gsdlunicode.cpp
    3435
    35 OBJECTS = text_t.o display.o cfgread.o fileutil.o gsdlunicode.o
     36SOURCES = \
     37  cfgread.cpp      fileutil.cpp     text_t.cpp \
     38  display.cpp      gsdlunicode.cpp
     39
     40OBJECTS = \
     41  cfgread.o        fileutil.o       text_t.o   \
     42  display.o        gsdlunicode.o 
     43
    3644 
    3745all: gsdllib.a
    3846
    39 gsdllib.a: $(OBJECTS)
     47
     48GSDLLIBOBJECTS = text_t.o display.o cfgread.o fileutil.o gsdlunicode.o
     49
     50gsdllib.a: $(GSDLLIBOBJECTS)
    4051    rm -f gsdllib.a
    41     $(AR) cru gsdllib.a $(OBJECTS)
     52    $(AR) cru gsdllib.a $(GSDLLIBOBJECTS)
    4253    $(RANLIB) gsdllib.a
    4354

  • trunk/gsdl/lib/cfgread.cpp

    r100 r112  
    1212/*
    1313   $Log$
     14   Revision 1.3  1999/01/12 01:50:57  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.2  1999/01/08 02:33:13  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

  • trunk/gsdl/lib/display.cpp

    r100 r112  
    1212/*
    1313   $Log$
     14   Revision 1.4  1999/01/12 01:50:57  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.3  1999/01/08 02:33:13  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

  • trunk/gsdl/lib/fileutil.cpp

    r100 r112  
    1212/*
    1313   $Log$
     14   Revision 1.4  1999/01/12 01:50:59  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.3  1999/01/08 02:33:14  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

  • trunk/gsdl/lib/gsdlconf.h

    r103 r112  
    11/**********************************************************************
    22 *
    3  * gsdlconf.h --
     3 * gsdlconf.h -- system specific includes
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    1515
    1616
     17#ifdef __GNUG__
     18#  include <iostream.h>
     19#  include <map>
     20#else
     21#  ifndef USE_OBJECTSPACE
     22#    include <iostream>
     23#  else
     24#    include <ospace\std\iostream>
     25#    include <ospace\std\map>
     26#  endif
     27#endif
    1728
    1829

  • trunk/gsdl/lib/text_t.cpp

    r100 r112  
    1212/*
    1313   $Log$
     14   Revision 1.4  1999/01/12 01:51:00  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.3  1999/01/08 02:33:16  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

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

    r110 r112  
    1212/*
    1313   $Log$
     14   Revision 1.2  1999/01/12 01:51:01  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.1  1999/01/08 09:02:15  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224
    … …  
    3638
    3739
    38 static int my_stricmp (const char *str1, const char *str2) {
    39   char c1, c2;
    40 
    41   if ((str1 == NULL) || (str2 == NULL)) {
    42     if ((str1 == NULL) && (str2 == NULL)) return 0;
    43     if (str1 == NULL) return -1;
    44     return 1;
    45   }
    46 
    47   while (((c1 = tolower(*str1)) != '\0') ||
    48      ((c2 = tolower(*str2)) != '\0')) {
    49     if (c1 < c2) return -1;
    50     if (c1 > c2) return 1;
    51 
    52     str1++;
    53     str2++;
    54   }
    55 
    56   if ((*str1 == '\0') && (*str2 == '\0')) return 0;
    57   if (*str1 == '\0') return -1;
    58   return 1;
    59 }
     40static int compare_str (const void *e1, const void *e2) {
     41#ifdef __WIN32__
     42  return _stricmp(*((char**)e1), *((char**)e2));
     43#else
     44  return strcasecmp(*((char**)e1), *((char**)e2)); 
     45#endif
     46}
     47
    6048
    6149
    … …  
    609597      getdelimitstr (here, end, ' ', firstword);
    610598      word = firstword.getcstr();
    611       if ((my_stricmp(word, "the") != 0) && (my_stricmp(word, "a") != 0) &&
    612       (my_stricmp(word, "an") != 0)) break;
     599      if ((compare_str(word, "the") != 0) && (compare_str(word, "a") != 0) &&
     600      (compare_str(word, "an") != 0)) break;
    613601    }
    614602    here ++;
    … …  
    631619  lname = lastname.getcstr();
    632620 
    633   while ((my_stricmp(lname, "jnr") == 0) || (my_stricmp(lname, "snr") == 0) ||
    634      (my_stricmp(lname, "esq") == 0)) {
     621  while ((compare_str(lname, "jnr") == 0) || (compare_str(lname, "snr") == 0) ||
     622     (compare_str(lname, "esq") == 0)) {
    635623    lastname = words.back();
    636624    words.pop_back();
    … …  
    655643void string_sort (char **array, int len) {
    656644  qsort((void*)array, (unsigned int)(len), sizeof(char*), compare_str);
    657 }
    658 
    659 static int compare_str (const void *e1, const void *e2) {
    660 #ifdef __WIN32__
    661   return _stricmp(*((char**)e1), *((char**)e2));
    662 #else
    663   return strcasecmp(*((char**)e1), *((char**)e2)); 
    664 #endif
    665645}
    666646

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

    r110 r112  
    9999char ** string_add (char **array, int *len, char *str);
    100100void string_sort (char **array, int len);
    101 static int compare_str (const void *e1, const void *e2);
    102101void string_free(char **array, int len);
    103102text_t format_date (const text_t &date);

  • trunk/gsdl/src/colservr/mgq.c

    r110 r112  
    11/**********************************************************************
    22 *
    3  * mgq.c --
     3 * mgq.c -- cut-down version of mgquery
    44 * Copyright (C) 1999  The New Zealand Digital Library Project
    55 *
    … …  
    1212/*
    1313   $Log$
     14   Revision 1.2  1999/01/12 01:51:02  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.1  1999/01/08 09:02:22  rjmcnab
    1519
    … …  
    1822 */
    1923
    20 static char *RCSID = "$Id$";
    21 
    2224
    2325#include "mgq.h"
    24 
    25 /* cut-down version of mgquery */
    2626
    2727
    … …  
    557557  int i;
    558558  query_data *qd = NULL;
    559   FILE *deb = NULL;
     559  /*  FILE *deb = NULL; */
    560560  init_dbcache ();
    561561

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

    r110 r112  
    1212/*
    1313   $Log$
     14   Revision 1.2  1999/01/12 01:51:02  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.1  1999/01/08 09:02:16  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

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

    r110 r112  
    1212/*
    1313   $Log$
     14   Revision 1.2  1999/01/12 01:51:02  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.1  1999/01/08 09:02:18  rjmcnab
    1519
    … …  
    1721
    1822 */
    19 
    20 static char *RCSID = "$Id$";
    2123
    2224

  • trunk/gsdl/src/library/Makefile

    r99 r112  
    11###########################################################################
    22#
    3 # Makefile -- Makefile for the server program
    4 # Copyright (C) 1998 Rodger McNab, Stefan Boddie
     3# Makefile --
     4# Copyright (C) 1999  The New Zealand Digital Library Project
    55#
    6 # This program is free software; you can redistribute it and/or modify
    7 # it under the terms of the GNU General Public License as published by
    8 # the Free Software Foundation; either version 2 of the License, or
    9 # (at your option) any later version.
    10 #
    11 # This program is distributed in the hope that it will be useful,
    12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
    13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    14 # GNU General Public License for more details.
    15 #
    16 # You should have received a copy of the GNU General Public License
    17 # along with this program; if not, write to the Free Software
    18 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    19 #
    20 #       @(#)Makefile.in 1.3 16 Mar 1994
     6# PUT COPYRIGHT NOTICE HERE
    217#
    228###########################################################################
    … …  
    2511AR = ar
    2612CC = gcc
    27 CCFLAGS = -g
     13CCFLAGS = -g -Wall
    2814DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI -DGSDLSERVER
    29 RANLIB = ranlib
    3015INCLUDES = -I../../lib -I../../packages/mg-1.3d -I../../packages/mg-1.3d/lib \
    3116           -I../../packages/mg-1.3d/src/text -I../../packages/fcgi/include
     17RANLIB = ranlib
    3218LDFLAGS = -lg++ -lgdbm
    3319LIBS = ../../lib/gsdllib.a
    … …  
    3521
    3622 
    37 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     23COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    3824LINK = $(CC) $(LDFLAGS) -o $@
    3925 
    … …  
    4632.cpp.o:
    4733    $(COMPILE) $<
     34
    4835 
     36COLSERVRHEADERS = gdbmclass.h mgq.h mgsearch.h querycache.h queryinfo.h
    4937
    50 HEADERS = \
    51     browse.h         gdbmclass.h     cgiargs.h   \
    52     querycache.h     mgq.h       queryinfo.h  \
    53     libinterface.h   mgsearch.h      locateinfo.h \
    54     cgiwrap.h
     38RECPTHEADERS = cgiargs.h
    5539
    56 SOURCES = \
    57     browse.cpp       gdbmclass.cpp   cgiargs.cpp \
    58     querycache.cpp   mgq.c       queryinfo.cpp \
    59     libinterface.cpp mgsearch.cpp    locateinfo.cpp \
    60     cgiwrap.h
     40HEADERS = $(COLSERVRHEADERS) $(RECPTHEADERS) \
     41    browse.h cgiwrap.h libinterface.h locateinfo.h
    6142
    6243
    63 OBJECTS = \
    64     browse.o         gdbmclass.o     cgiargs.o   \
    65     querycache.o     mgq.o       queryinfo.o   \
    66     libinterface.o   mgsearch.o      locateinfo.o \
    67     cgiwrap.o
     44COLSERVRSOURCES = gdbmclass.cpp mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp
     45
     46RECPTSOURCES = cgiargs.cpp
     47
     48SOURCES = $(COLSERVRSOURCES) $(RECPTSOURCES) \
     49    browse.cpp cgiwrap.cpp libinterface.cpp locateinfo.cpp
     50
     51
     52COLSERVROBJECTS = gdbmclass.o mgq.o mgsearch.o querycache.o queryinfo.o
     53
     54RECPTOBJECTS = cgiargs.o
     55
     56OBJECTS = $(COLSERVROBJECTS) $(RECPTOBJECTS) \
     57    browse.o cgiwrap.o libinterface.o locateinfo.o
    6858
    6959 
    7060all : $(OBJECTS)
    7161
     62# querycache.cpp querycache.h gdbmclass.cpp gdbmclass.h queryinfo.cpp queryinfo.h mgq.c mgq.h mgsearch.cpp mgsearch.h:
     63$(COLSERVRHEADERS) $(COLSERVRSOURCES):
     64    ln -s ../colservr/$@
     65
     66# cgiargs.cpp cgiargs.h:
     67$(RECPTHEADERS) $(RECPTSOURCES):
     68    ln -s ../recpt/$@
     69
    7270clean:
    73     rm -f $(OBJECTS)
     71    rm -f $(OBJECTS) $(COLSERVRHEADERS) $(COLSERVRSOURCES) $(RECPTHEADERS) $(RECPTSOURCES)
    7472
    7573install:
    … …  
    8280# DO NOT DELETE
    8381
    84 browse.o: browse.h ../../lib/text_t.h gdbmclass.h cgiargs.h
    8582gdbmclass.o: ../../lib/text_t.h gdbmclass.h
    8683gdbmclass.o: ../../packages/mg-1.3d/lib/unitool.h ../../lib/gsdlunicode.h
    8784gdbmclass.o: ../../lib/fileutil.h
    88 cgiargs.o: cgiargs.h ../../lib/text_t.h
    89 querycache.o: querycache.h ../../lib/text_t.h queryinfo.h
    90 mgq.o: ../../packages/mg-1.3d/sysfuncs.h ../../packages/mg-1.3d/lib/pathmax.h
     85mgq.o: mgq.h ../../packages/mg-1.3d/sysfuncs.h
     86mgq.o: ../../packages/mg-1.3d/lib/pathmax.h
    9187mgq.o: ../../packages/mg-1.3d/lib/getopt.h
    9288mgq.o: ../../packages/mg-1.3d/lib/messages.h
    … …  
    9692mgq.o: ../../packages/mg-1.3d/lib/huffman.h
    9793mgq.o: ../../packages/mg-1.3d/lib/filestats.h
    98 mgq.o: ../../packages/mg-1.3d/src/text/mg.h
    9994mgq.o: ../../packages/mg-1.3d/src/text/lists.h
    10095mgq.o: ../../packages/mg-1.3d/src/text/backend.h
    … …  
    10297mgq.o: ../../packages/mg-1.3d/src/text/term_lists.h
    10398mgq.o: ../../packages/mg-1.3d/src/text/query_term_list.h
     99mgq.o: ../../packages/mg-1.3d/src/text/mg.h
    104100mgq.o: ../../packages/mg-1.3d/src/text/environment.h
    105101mgq.o: ../../packages/mg-1.3d/src/text/globals.h
    … …  
    107103mgq.o: ../../packages/mg-1.3d/src/text/commands.h
    108104mgq.o: ../../packages/mg-1.3d/src/text/text_get.h
    109 mgq.o: ../../packages/mg-1.3d/lib/local_strings.h mgq.h
     105mgq.o: ../../packages/mg-1.3d/lib/local_strings.h
     106mgsearch.o: mgsearch.h ../../lib/text_t.h querycache.h queryinfo.h mgq.h
     107mgsearch.o: locateinfo.h ../../lib/gsdlunicode.h
     108mgsearch.o: ../../packages/mg-1.3d/lib/unitool.h
     109querycache.o: querycache.h ../../lib/text_t.h queryinfo.h
    110110queryinfo.o: queryinfo.h ../../lib/text_t.h
     111cgiargs.o: cgiargs.h ../../lib/text_t.h ../../lib/gsdlunicode.h
     112browse.o: browse.h ../../lib/text_t.h gdbmclass.h cgiargs.h
     113cgiwrap.o: cgiwrap.h libinterface.h browse.h ../../lib/text_t.h gdbmclass.h
     114cgiwrap.o: cgiargs.h queryinfo.h mgsearch.h querycache.h ../../lib/display.h
     115cgiwrap.o: ../../lib/gsdlunicode.h ../../lib/cfgread.h ../../lib/fileutil.h
     116cgiwrap.o: ../../packages/fcgi/include/fcgiapp.h
     117cgiwrap.o: ../../packages/fcgi/include/fcgi_config.h ../../lib/site.h
    111118libinterface.o: libinterface.h browse.h ../../lib/text_t.h gdbmclass.h
    112119libinterface.o: cgiargs.h queryinfo.h mgsearch.h querycache.h
    113120libinterface.o: ../../lib/display.h ../../lib/gsdlunicode.h
    114121libinterface.o: ../../lib/fileutil.h ../../lib/cfgread.h
    115 mgsearch.o: mgq.h mgsearch.h ../../lib/text_t.h querycache.h queryinfo.h
    116 mgsearch.o: locateinfo.h ../../lib/gsdlunicode.h
    117 mgsearch.o: ../../packages/mg-1.3d/lib/unitool.h
     122libinterface.o: ../../packages/mg-1.3d/lib/unitool.h
    118123locateinfo.o: locateinfo.h ../../lib/text_t.h ../../lib/fileutil.h
    119 cgiwrap.o: libinterface.h browse.h ../../lib/text_t.h gdbmclass.h cgiargs.h
    120 cgiwrap.o: queryinfo.h mgsearch.h querycache.h ../../lib/display.h
    121 cgiwrap.o: ../../lib/gsdlunicode.h

  • trunk/gsdl/src/library/browse.cpp

    r91 r112  
     1/**********************************************************************
     2 *
     3 * browse.cpp --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12/*
     13   $Log$
     14   Revision 1.7  1999/01/12 01:51:03  rjmcnab
     15
     16   Standard header.
     17
     18 */
     19
     20
    121#include "browse.h"
     22
    223
    324

  • trunk/gsdl/src/library/browse.h

    r32 r112  
     1/**********************************************************************
     2 *
     3 * browse.h --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12
    113#ifndef BROWSE_H
    214#define BROWSE_H
     15
    316
    417#include "text_t.h"

  • trunk/gsdl/src/library/cgiwrap.cpp

    r91 r112  
     1/**********************************************************************
     2 *
     3 * cgiwrap.cpp --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12/*
     13   $Log$
     14   Revision 1.4  1999/01/12 01:51:04  rjmcnab
     15
     16   Standard header.
     17
     18 */
     19
     20
     21#include "cgiwrap.h"
    122#include <stdlib.h>
    223
    … …  
    1435#endif
    1536
    16 #include "cgiwrap.h"
    1737#include "cfgread.h"
    1838#include "fileutil.h"

  • trunk/gsdl/src/library/cgiwrap.h

    r89 r112  
     1/**********************************************************************
     2 *
     3 * cgiwrap.h --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12
    113#ifndef CGIWRAP_H
    214#define CGIWRAP_H
     15
    316
    417#include "libinterface.h"

  • trunk/gsdl/src/library/libinterface.cpp

    r99 r112  
     1/**********************************************************************
     2 *
     3 * libinterface.cpp --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12/*
     13   $Log$
     14   Revision 1.10  1999/01/12 01:51:04  rjmcnab
     15
     16   Standard header.
     17
     18 */
     19
     20
     21#include "libinterface.h"
    122#include <string.h>
    223#include <stdio.h>
    … …  
    425#include <ctype.h>
    526#include <time.h>
    6 #include "libinterface.h"
    727#include "cgiargs.h"
    828#include "fileutil.h"
    … …  
    522542void libinterface::args_tounicode (cgiargsclass &args,
    523543                   inconvertclass &inconvert) {
    524   utf8outconvertclass text_t2utf8;
    525544  cgiargsclass::iterator here = args.begin();
    526545  cgiargsclass::iterator end = args.end();

  • trunk/gsdl/src/library/libinterface.h

    r99 r112  
     1/**********************************************************************
     2 *
     3 * libinterface.h --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12
    113#ifndef LIBINTERFACE_H
    214#define LIBINTERFACE_H
     15
    316
    417#include "browse.h"
    … …  
    180193};
    181194
     195
    182196#endif

  • trunk/gsdl/src/library/locateinfo.cpp

    r91 r112  
     1/**********************************************************************
     2 *
     3 * locateinfo.cpp --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12/*
     13   $Log$
     14   Revision 1.4  1999/01/12 01:51:05  rjmcnab
     15
     16   Standard header.
     17
     18 */
     19
     20
    121#include "locateinfo.h"
    222#include "fileutil.h"

  • trunk/gsdl/src/library/locateinfo.h

    r91 r112  
     1/**********************************************************************
     2 *
     3 * locateinfo.h --
     4 * Copyright (C) 1999  The New Zealand Digital Library Project
     5 *
     6 * PUT COPYRIGHT NOTICE HERE
     7 *
     8 * $Id$
     9 *
     10 *********************************************************************/
     11
     12
    113#ifndef LOCATEINFO_H
    214#define LOCATEINFO_H
     15
    316
    417#include "text_t.h"
    … …  
    922text_t gettextsuffix (const text_t &collection);
    1023
     24
    1125#endif

  • trunk/gsdl/src/recpt/cgiargs.cpp

    r108 r112  
    1212/*
    1313   $Log$
     14   Revision 1.2  1999/01/12 01:51:06  rjmcnab
     15
     16   Standard header.
     17
    1418   Revision 1.1  1999/01/08 08:40:54  rjmcnab
    1519
    … …  
    2125
    2226 */
    23 
    24 static char *RCSID = "$Id$";
    2527
    2628

  • trunk/gsdl/src/recpt/recptconfinfo.cpp

    r108 r112  
    11/**********************************************************************
    22 *
    3  * confinfo.cpp -- tools for reading and storing some general types of
    4  *                 configuration data
     3 * recptconfinfo.cpp -- tools for reading and storing configuration data
     4 *                      needed by the receptionist
    55 * Copyright (C) 1999  The New Zealand Digital Library Project
    66 *
    … …  
    1313/*
    1414   $Log$
     15   Revision 1.2  1999/01/12 01:51:06  rjmcnab
     16
     17   Standard header.
     18
    1519   Revision 1.1  1999/01/08 08:41:07  rjmcnab
    1620
    … …  
    2226
    2327
    24 #include "confinfo.h"
     28#include "recptconfinfo.h"
    2529
    2630bool recpt_cfg_info_t::read_cfg_file (const text_t &filename) {

  • trunk/gsdl/src/recpt/recptconfinfo.h

    r108 r112  
    11/**********************************************************************
    22 *
    3  * confinfo.h -- tools for reading and storing some general types of
    4  *               configuration data
     3 * recptconfinfo.h -- tools for reading and storing configuration data
     4 *                    needed by the receptionist
    55 * Copyright (C) 1999  The New Zealand Digital Library Project
    66 *
    … …  
    1212
    1313
    14 #ifndef CONFINFO_H
    15 #define CONFINFO_H
     14#ifndef RECPTCONFINFO_H
     15#define RECPTCONFINFO_H
    1616
    1717
Note: See TracChangeset for help on using the changeset viewer.