Changeset 212 for trunk/gsdl

Timestamp:

1999-03-25T15:16:40+12:00 (25 years ago)

Author:

sjboddie

Message:

replaced subjectbrowseaction with browseaction - added browsetools

Location:

trunk/gsdl/src/recpt

Files:

• Makefile (modified) (25 diffs)
• subjectbrowseaction.cpp (deleted)
• subjectbrowseaction.h (deleted)

trunk/gsdl/src/recpt/Makefile

@@ -35 +35 @@
 
 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h \
-                converter.h recptconfig.h cgiutils.h OIDtools.h htmlgen.h \
+                converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \
         statusaction.h pageaction.h comtypes.h recptproto.h \
-        pingaction.h queryaction.h subjectbrowseaction.h
+        pingaction.h queryaction.h browseaction.h
 
 RECEPTHEADERS = 
 
-COLSERVRHEADERS = gdbmclass.h mgq.h mgsearch.h querycache.h queryinfo.h \
+COLSERVRHEADERS = mgq.h mgsearch.h querycache.h queryinfo.h \
                   collectserver.h colservrconfig.h maptools.h
 
@@ -51 +51 @@
 
 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp \
-                converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp \
+                converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetools.cpp \
         htmlgen.cpp statusaction.cpp pageaction.cpp comtypes.cpp \
-        recptproto.cpp pingaction.cpp queryaction.cpp subjectbrowseaction.cpp
+        recptproto.cpp pingaction.cpp queryaction.cpp browseaction.cpp
 
 RECPTSOURCES = recptmain.cpp
 
-COLSERVRSOURCES = gdbmclass.cpp mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp \
+COLSERVRSOURCES = mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp \
                   collectserver.cpp colservrconfig.cpp maptools.cpp
 
@@ -67 +67 @@
 
 COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o \
-                converter.o recptconfig.o cgiutils.o OIDtools.o \
+                converter.o recptconfig.o cgiutils.o OIDtools.o browsetools.o \
         htmlgen.o statusaction.o pageaction.o comtypes.o \
-        recptproto.o pingaction.o queryaction.o subjectbrowseaction.o
+        recptproto.o pingaction.o queryaction.o browseaction.o
 
 RECPTOBJECTS = recptmain.o
 
-COLSERVROBJECTS = gdbmclass.o mgq.o mgsearch.o querycache.o queryinfo.o \
+COLSERVROBJECTS = mgq.o mgsearch.o querycache.o queryinfo.o \
                   collectserver.o colservrconfig.o maptools.o
 
@@ -144 +144 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h action.h \
- recptproto.h comtypes.h converter.h ../../lib/gsdlunicode.h \
- ../../lib/fileutil.h cgiutils.h OIDtools.h /usr/include/assert.h \
- /usr/include/time.h /usr/include/sys/time.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h action.h recptproto.h comtypes.h \
+ converter.h ../../lib/gsdlunicode.h ../../lib/fileutil.h cgiutils.h \
+ /usr/include/assert.h /usr/include/time.h /usr/include/sys/time.h \
  /usr/include/linux/types.h /usr/include/linux/posix_types.h \
  /usr/include/asm/posix_types.h /usr/include/asm/types.h \
@@ -175 +175 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h action.h \
- recptproto.h comtypes.h converter.h ../../lib/gsdlunicode.h \
- recptconfig.h statusaction.h pageaction.h pingaction.h queryaction.h \
- subjectbrowseaction.h ../../packages/fcgi/include/fcgiapp.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h action.h recptproto.h comtypes.h \
+ converter.h ../../lib/gsdlunicode.h recptconfig.h statusaction.h \
+ pageaction.h pingaction.h queryaction.h browseaction.h \
+ ../../packages/fcgi/include/fcgiapp.h \
  /usr/lib/gcc-lib/i486-linux/2.7.2/include/stdarg.h \
  ../../packages/fcgi/include/fcgi_config.h
@@ -224 +225 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h \
+ /usr/include/assert.h
 converter.o: converter.cpp converter.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -249 +251 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h ../../lib/gsdlunicode.h \
- /usr/include/g++/map /usr/include/g++/map.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h ../../lib/gsdlunicode.h
 recptconfig.o: recptconfig.cpp recptconfig.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -271 +273 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h receptionist.h cgiargs.h \
- /usr/include/g++/map /usr/include/g++/map.h ../../lib/display.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h receptionist.h cgiargs.h ../../lib/display.h \
  /usr/include/g++/algorithm /usr/include/g++/algo.h \
  /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
@@ -298 +300 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h
+OIDtools.o: OIDtools.cpp OIDtools.h ../../lib/text_t.h \
+ ../../lib/gsdlconf.h ../../lib/site.h /usr/include/g++/vector \
+ /usr/include/g++/vector.h /usr/include/g++/function.h \
+ /usr/include/g++/algobase.h /usr/include/g++/pair.h \
+ /usr/include/g++/iterator.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/stddef.h \
+ /usr/include/g++/iostream.h /usr/include/g++/streambuf.h \
+ /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/sys/cdefs.h /usr/include/g++/defalloc.h \
+ /usr/include/g++/new.h /usr/include/g++/std/new.h \
+ /usr/include/g++/std/cstddef.h /usr/include/stdlib.h \
+ /usr/include/features.h /usr/include/errno.h \
+ /usr/include/linux/errno.h /usr/include/asm/errno.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/limits.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/syslimits.h \
+ /usr/include/limits.h /usr/include/posix1_lim.h \
+ /usr/include/linux/limits.h /usr/include/posix2_lim.h \
+ /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
+ /usr/include/g++/set.h /usr/include/g++/tree.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
  /usr/include/g++/map.h
-OIDtools.o: OIDtools.cpp OIDtools.h
+browsetools.o: browsetools.cpp browsetools.h ../../lib/gsdlconf.h \
+ ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
+ /usr/include/g++/vector.h /usr/include/g++/function.h \
+ /usr/include/g++/algobase.h /usr/include/g++/pair.h \
+ /usr/include/g++/iterator.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/stddef.h \
+ /usr/include/g++/iostream.h /usr/include/g++/streambuf.h \
+ /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/sys/cdefs.h /usr/include/g++/defalloc.h \
+ /usr/include/g++/new.h /usr/include/g++/std/new.h \
+ /usr/include/g++/std/cstddef.h /usr/include/stdlib.h \
+ /usr/include/features.h /usr/include/errno.h \
+ /usr/include/linux/errno.h /usr/include/asm/errno.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/limits.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/syslimits.h \
+ /usr/include/limits.h /usr/include/posix1_lim.h \
+ /usr/include/linux/limits.h /usr/include/posix2_lim.h \
+ /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
+ /usr/include/g++/set.h /usr/include/g++/tree.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h
 htmlgen.o: htmlgen.cpp htmlgen.h ../../lib/gsdlconf.h ../../lib/site.h \
  ../../lib/text_t.h /usr/include/g++/vector /usr/include/g++/vector.h \
@@ -320 +368 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h ../../lib/display.h /usr/include/g++/map \
- /usr/include/g++/map.h /usr/include/g++/algorithm \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
  /usr/include/g++/algo.h /usr/include/g++/heap.h \
  /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h \
@@ -345 +393 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h receptionist.h converter.h ../../lib/gsdlunicode.h \
- /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h receptionist.h \
+ converter.h ../../lib/gsdlunicode.h /usr/include/assert.h
 pageaction.o: pageaction.cpp pageaction.h ../../lib/gsdlconf.h \
  ../../lib/site.h action.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -371 +419 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h receptionist.h converter.h ../../lib/gsdlunicode.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h receptionist.h \
+ converter.h ../../lib/gsdlunicode.h
 comtypes.o: comtypes.cpp comtypes.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -396 +445 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h
 recptproto.o: recptproto.cpp recptproto.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -417 +467 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h comtypes.h /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h comtypes.h /usr/include/assert.h
 pingaction.o: pingaction.cpp pingaction.h ../../lib/gsdlconf.h \
  ../../lib/site.h action.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -438 +489 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h
 queryaction.o: queryaction.cpp queryaction.h ../../lib/gsdlconf.h \
  ../../lib/site.h action.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -463 +514 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h
-subjectbrowseaction.o: subjectbrowseaction.cpp subjectbrowseaction.h \
- action.h ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h
+browseaction.o: browseaction.cpp browseaction.h action.h \
+ ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h \
  /usr/include/g++/vector /usr/include/g++/vector.h \
  /usr/include/g++/function.h /usr/include/g++/algobase.h \
@@ -488 +539 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h recptproto.h \
- comtypes.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h recptproto.h comtypes.h OIDtools.h \
+ browsetools.h
 recptmain.o: recptmain.cpp receptionist.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -513 +565 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h action.h \
- recptproto.h comtypes.h converter.h ../../lib/gsdlunicode.h \
- cgiwrapper.h /usr/include/assert.h
-gdbmclass.o: gdbmclass.cpp ../../lib/text_t.h ../../lib/gsdlconf.h \
- ../../lib/site.h /usr/include/g++/vector /usr/include/g++/vector.h \
- /usr/include/g++/function.h /usr/include/g++/algobase.h \
- /usr/include/g++/pair.h /usr/include/g++/iterator.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2/include/stddef.h \
- /usr/include/g++/iostream.h /usr/include/g++/streambuf.h \
- /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/sys/cdefs.h /usr/include/g++/defalloc.h \
- /usr/include/g++/new.h /usr/include/g++/std/new.h \
- /usr/include/g++/std/cstddef.h /usr/include/stdlib.h \
- /usr/include/features.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2/include/limits.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
- /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h gdbmclass.h /usr/include/gdbm.h \
- ../../packages/mg-1.3d/lib/unitool.h ../../lib/gsdlunicode.h \
- ../../lib/fileutil.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/string.h \
- /usr/include/g++/algorithm /usr/include/g++/algo.h \
- /usr/include/g++/heap.h /usr/include/g++/tempbuf.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h action.h recptproto.h comtypes.h \
+ converter.h ../../lib/gsdlunicode.h cgiwrapper.h \
+ /usr/include/assert.h
 mgq.o: mgq.c mgq.h /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/libio.h \
@@ -609 +637 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h querycache.h queryinfo.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h querycache.h queryinfo.h \
  /usr/include/g++/algorithm /usr/include/g++/algo.h \
  /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
@@ -636 +665 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h queryinfo.h /usr/include/g++/algorithm \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h queryinfo.h /usr/include/g++/algorithm \
  /usr/include/g++/algo.h /usr/include/g++/heap.h \
  /usr/include/g++/tempbuf.h
@@ -659 +689 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h /usr/include/g++/algorithm \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h /usr/include/g++/algorithm \
  /usr/include/g++/algo.h /usr/include/g++/heap.h \
  /usr/include/g++/tempbuf.h
@@ -682 +713 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h comtypes.h /usr/include/g++/map \
- /usr/include/g++/map.h /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h comtypes.h maptools.h /usr/include/assert.h
 colservrconfig.o: colservrconfig.cpp colservrconfig.h \
  ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h \
@@ -704 +735 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h collectserver.h comtypes.h \
- /usr/include/g++/map /usr/include/g++/map.h ../../lib/fileutil.h \
- ../../lib/cfgread.h /usr/include/g++/fstream.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h collectserver.h comtypes.h maptools.h \
+ ../../lib/fileutil.h ../../lib/cfgread.h /usr/include/g++/fstream.h
+maptools.o: maptools.cpp maptools.h ../../lib/gsdlconf.h \
+ ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
+ /usr/include/g++/vector.h /usr/include/g++/function.h \
+ /usr/include/g++/algobase.h /usr/include/g++/pair.h \
+ /usr/include/g++/iterator.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/stddef.h \
+ /usr/include/g++/iostream.h /usr/include/g++/streambuf.h \
+ /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/sys/cdefs.h /usr/include/g++/defalloc.h \
+ /usr/include/g++/new.h /usr/include/g++/std/new.h \
+ /usr/include/g++/std/cstddef.h /usr/include/stdlib.h \
+ /usr/include/features.h /usr/include/errno.h \
+ /usr/include/linux/errno.h /usr/include/asm/errno.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/limits.h \
+ /usr/lib/gcc-lib/i486-linux/2.7.2/include/syslimits.h \
+ /usr/include/limits.h /usr/include/posix1_lim.h \
+ /usr/include/linux/limits.h /usr/include/posix2_lim.h \
+ /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
+ /usr/include/g++/set.h /usr/include/g++/tree.h \
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h
 nullproto.o: nullproto.cpp nullproto.h ../../lib/gsdlconf.h \
  ../../lib/site.h collectserver.h ../../lib/text_t.h \
@@ -727 +780 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h comtypes.h /usr/include/g++/map \
- /usr/include/g++/map.h recptproto.h colservrconfig.h \
- /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h comtypes.h maptools.h recptproto.h \
+ colservrconfig.h /usr/include/assert.h
 librarymain.o: librarymain.cpp receptionist.h ../../lib/gsdlconf.h \
  ../../lib/site.h ../../lib/text_t.h /usr/include/g++/vector \
@@ -750 +803 @@
  /usr/include/g++/list /usr/include/g++/list.h /usr/include/g++/set \
  /usr/include/g++/set.h /usr/include/g++/tree.h \
- /usr/include/g++/projectn.h cgiargs.h /usr/include/g++/map \
- /usr/include/g++/map.h ../../lib/display.h /usr/include/g++/algorithm \
- /usr/include/g++/algo.h /usr/include/g++/heap.h \
- /usr/include/g++/tempbuf.h /usr/include/g++/fstream.h action.h \
- recptproto.h comtypes.h converter.h ../../lib/gsdlunicode.h \
- cgiwrapper.h nullproto.h collectserver.h /usr/include/assert.h
+ /usr/include/g++/projectn.h /usr/include/g++/map \
+ /usr/include/g++/map.h cgiargs.h ../../lib/display.h \
+ /usr/include/g++/algorithm /usr/include/g++/algo.h \
+ /usr/include/g++/heap.h /usr/include/g++/tempbuf.h \
+ /usr/include/g++/fstream.h action.h recptproto.h comtypes.h \
+ converter.h ../../lib/gsdlunicode.h cgiwrapper.h nullproto.h \
+ collectserver.h maptools.h /usr/include/assert.h