Index: /gsdl/trunk/lib/Makefile.in
===================================================================
--- /gsdl/trunk/lib/Makefile.in	(revision 15461)
+++ /gsdl/trunk/lib/Makefile.in	(revision 15462)
@@ -29,33 +29,11 @@
 CC = @CC@
 CPP = @CXX@
-#CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 CCFLAGS = @CFLAGS@
-MCFLAGS = -Wall -Wunused
 DEFS = @DEFS@
 INCLUDES = -I../indexers/mg/lib -I..
-MICO_DIR = @MICO_DIR@
-ifeq ($(MICO_DIR), default)
-MICO_INC = -I../packages/mico/mico/include
-MICO_PATH = ../bin/linux/
-else
-ifeq ($(MICO_DIR), yes)
-MICO_INC =
-else
-MICO_INC = -I$(MICO_DIR)
-endif
-MICO_PATH =
-endif
-MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../indexers/mg/lib $(MICO_INC) -I..
 RANLIB = @RANLIB@
-USE_CORBA = @USE_CORBA@
 
 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
-
-ifneq ($(USE_CORBA), 0)
-MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
-else
-MCOMPILE = $(COMPILE)
-endif
 
 .SUFFIXES:
@@ -68,23 +46,4 @@
 	$(CPPCOMPILE) $< 
 
-.SUFFIXES: .mpp .o
-.mpp.o:
-	$(MCOMPILE) $<
-
-
-
-
-ifneq ($(USE_CORBA), 0)
-CORBAHEADERS = \
-  corbaconv_text_t.h corbatext_t.h
-CORBASOURCES = \
-  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp
-CORBAOBJECTS = \
-  corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o 
-else
-CORBAHEADERS = 
-CORBASOURCE = 
-CORBAOBJECTS = 
-endif
 
 HEADERS = \
@@ -93,5 +52,5 @@
   gsdltimes.h      gsdltools.h      gsdlunicode.h    infodbclass.h \
   md5.h            OIDtools.h       phrases.h        text_t.h \
-  $(CORBAHEADERS)  gsdlconf.h
+  gsdlconf.h
 
 SOURCES = \
@@ -99,6 +58,5 @@
   display.cpp      fileutil.cpp     gdbmclass.cpp    gsdlsitecfg.cpp \
   gsdltimes.cpp    gsdltools.cpp    gsdlunicode.cpp  infodbclass.cpp \
-  md5.cpp          OIDtools.cpp     phrases.cpp      text_t.cpp \
-  $(CORBASOURCES)
+  md5.cpp          OIDtools.cpp     phrases.cpp      text_t.cpp
 
 OBJECTS = \
@@ -106,15 +64,8 @@
   display.o        fileutil.o       gdbmclass.o      gsdlsitecfg.o \
   gsdltimes.o      gsdltools.o      gsdlunicode.o    infodbclass.o \
-  md5.o            OIDtools.o       phrases.o        text_t.o \
-  $(CORBAOBJECTS)
+  md5.o            OIDtools.o       phrases.o        text_t.o
 
 
 all: gsdllib.a
-corbaiface_skel.h: corbaiface.idl
-	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
-corbaiface_skel.mpp: corbaiface.idl
-	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
-corbaiface.mpp: corbaiface.idl
-	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
 
 GSDLLIBOBJECTS = $(OBJECTS)
@@ -126,5 +77,5 @@
 
 clean:
-	rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
+	rm -f $(OBJECTS) gsdllib.a
 
 distclean: clean
Index: dl/trunk/lib/corbaconv_text_t.h
===================================================================
--- /gsdl/trunk/lib/corbaconv_text_t.h	(revision 15461)
+++ 	(revision )
@@ -1,68 +1,0 @@
-/**********************************************************************
- *
- * corbaconv_text_t.mpp -- conversion support text_t <-> corba_text_t
- * Copyright (C) 1999  The New Zealand Digital Library Project
- *
- * A component of the Greenstone digital library software
- * from the New Zealand Digital Library Project at the
- * University of Waikato, New Zealand.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- *
- *********************************************************************/
-
-
-#ifndef CORBACONV_TEXT_T_H
-#define CORBACONV_TEXT_T_H
-
-#include "text_t.h"
-
-// Inherit from text_t
-// Provide support to convert from corba_text_t to text_t and vice versa
-
-class corbaconv_text_t : public text_t {
-  
-public:
-  // constructors
-  corbaconv_text_t (corbatext_t t);
-
-  void setCorbatext(corbatext_t ct);
-  void getCorbatext(corbatext_t &ct) const;
-  void fillUsString(usString *us) const;
-
-  static void setCorbatext(text_t& t, corbatext_t ct);
-  static void getCorbatext(const text_t& t, corbatext_t &ct);
-  static void fillUsString(const text_t& t, usString *us);
-};
-
-
-inline void corbaconv_text_t::setCorbatext(corbatext_t ct) 
-{ 
-  setCorbatext(*this,ct); 
-}
-
-inline void corbaconv_text_t::getCorbatext(corbatext_t& ct) const
-{ 
-  getCorbatext(*this,ct); 
-}
-
-inline void corbaconv_text_t::fillUsString(usString *us) const
-{
-  fillUsString(*this,us);
-}
-
-#endif
Index: dl/trunk/lib/corbaconv_text_t.mpp
===================================================================
--- /gsdl/trunk/lib/corbaconv_text_t.mpp	(revision 15461)
+++ 	(revision )
@@ -1,109 +1,0 @@
-/**********************************************************************
- *
- * corbaconv_text_t.mpp -- conversion support text_t <-> corba_text_t
- * Copyright (C) 1999  The New Zealand Digital Library Project
- *
- * A component of the Greenstone digital library software
- * from the New Zealand Digital Library Project at the
- * University of Waikato, New Zealand.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- *
- *********************************************************************/
-
-#if defined(GSDL_USE_STL_H) || defined(__APPLE__)
-#include <vector.h>
-#else
-#include <vector>
-#endif
-
-// protocol header
-#include "corbaiface.h"
-using namespace gsdlInterface;
-
-#include "corbatext_t.h"
-
-#include "corbaconv_text_t.h"
-
-
-#if defined(GSDL_USE_OBJECTSPACE)
-#  include <ospace\std\algorithm>
-#elif defined(GSDL_USE_STL_H)
-#  if defined(GSDL_USE_ALGO_H)
-#    include <algo.h>
-#  else
-#    include <algorithm.h>
-#  endif
-#else
-#  include <algorithm>
-#endif
-
-#ifdef HAVE_CONFIG_H
-# ifdef __WIN32__
-#  include "win32cfg.h"
-# else
-#  include "mico/config.h"
-# endif
-#endif
-
-
-// #include "unitool.h" // ****
-
-////////////////////////////////////
-// corbaconv_text_t methods
-////////////////////////////////////
-
-corbaconv_text_t::corbaconv_text_t (corbatext_t t)
-{ 
-  setCorbatext(t);  
-}
-
-void corbaconv_text_t::getCorbatext(const text_t& t, corbatext_t &ct)
-{
-  ct.encoding = 0;
-  fillUsString(t,&ct.text);
-}
-
-void corbaconv_text_t::setCorbatext(text_t& t, corbatext_t ct)
-{
-  t.setencoding(0);
-  t.clear();
-  corbatext_usvector(ct, t.text_as_usvector());
-}
-
-void corbaconv_text_t::fillUsString(const text_t& t, usString *us)
-{
-  unsigned int i;
-  usvector::const_iterator here = t.text_as_usvector().begin();
-  usvector::const_iterator end = t.text_as_usvector().end();
-
-
-  if (end == here)
-    { 	
-      return;
-    }
-  (*us).length(end - here);
-  i = 0;
-
-  while (here != end)
-    {
-      (*us)[i] = *here;
-      i ++;
-      here ++;
-    }
-  
-}
Index: dl/trunk/lib/corbaiface.h
===================================================================
--- /gsdl/trunk/lib/corbaiface.h	(revision 15461)
+++ 	(revision )
@@ -1,614 +1,0 @@
-/*
- *  MICO --- a free CORBA implementation
- *  Copyright (C) 1997-98 Kay Roemer & Arno Puder
- *
- *  This file was automatically generated. DO NOT EDIT!
- */
-
-#if !defined(__CORBAIFACE_H__) || defined(MICO_NO_TOPLEVEL_MODULES)
-#define __CORBAIFACE_H__
-
-#ifndef MICO_NO_TOPLEVEL_MODULES
-#include <CORBA.h>
-#include <mico/throw.h>
-#endif
-
-#ifndef MICO_NO_TOPLEVEL_MODULES
-MICO_NAMESPACE_DECL gsdlInterface {
-#endif
-
-#if !defined(MICO_NO_TOPLEVEL_MODULES) || defined(MICO_MODULE_gsdlInterface)
-
-
-typedef SequenceTmpl<CORBA::UShort,MICO_TID_DEF> usString;
-#ifdef _WINDOWS
-static usString _dummy_usString;
-#endif
-typedef TSeqVar<SequenceTmpl<CORBA::UShort,MICO_TID_DEF> > usString_var;
-typedef TSeqOut<SequenceTmpl<CORBA::UShort,MICO_TID_DEF> > usString_out;
-
-typedef StringSequenceTmpl<CORBA::String_var> stringSeq;
-#ifdef _WINDOWS
-static stringSeq _dummy_stringSeq;
-#endif
-typedef TSeqVar<StringSequenceTmpl<CORBA::String_var> > stringSeq_var;
-typedef TSeqOut<StringSequenceTmpl<CORBA::String_var> > stringSeq_out;
-
-struct corbatext_t;
-typedef TVarVar<corbatext_t> corbatext_t_var;
-typedef TVarOut<corbatext_t> corbatext_t_out;
-
-struct corbatext_t {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbatext_t_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbatext_t();
-  ~corbatext_t();
-  corbatext_t( const corbatext_t& s );
-  corbatext_t& operator=( const corbatext_t& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  usString text;
-  CORBA::UShort encoding;
-  CORBA::ULong length;
-};
-
-typedef SequenceTmpl<corbatext_t,MICO_TID_DEF> corbatext_tarray;
-#ifdef _WINDOWS
-static corbatext_tarray _dummy_corbatext_tarray;
-#endif
-typedef TSeqVar<SequenceTmpl<corbatext_t,MICO_TID_DEF> > corbatext_tarray_var;
-typedef TSeqOut<SequenceTmpl<corbatext_t,MICO_TID_DEF> > corbatext_tarray_out;
-
-typedef corbatext_tarray corbatext_tset;
-#ifdef _WINDOWS
-static corbatext_tset _dummy_corbatext_tset;
-#endif
-typedef TSeqVar<corbatext_tarray > corbatext_tset_var;
-typedef TSeqOut<corbatext_tarray > corbatext_tset_out;
-
-struct corbatext_tmap;
-typedef TVarVar<corbatext_tmap> corbatext_tmap_var;
-typedef TVarOut<corbatext_tmap> corbatext_tmap_out;
-
-struct corbatext_tmap {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbatext_tmap_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbatext_tmap();
-  ~corbatext_tmap();
-  corbatext_tmap( const corbatext_tmap& s );
-  corbatext_tmap& operator=( const corbatext_tmap& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_tarray names;
-  corbatext_tarray values;
-};
-
-enum corbaComError {
-  corbaNoError = 0,
-  corbaAuthenticationFailure,
-  corbaProtocolError,
-  corbaConfigurationError,
-  corbaSystemProblem
-};
-
-typedef corbaComError& corbaComError_out;
-
-struct corbaShortColInfo;
-typedef TVarVar<corbaShortColInfo> corbaShortColInfo_var;
-typedef TVarOut<corbaShortColInfo> corbaShortColInfo_out;
-
-struct corbaShortColInfo {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaShortColInfo_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaShortColInfo();
-  ~corbaShortColInfo();
-  corbaShortColInfo( const corbaShortColInfo& s );
-  corbaShortColInfo& operator=( const corbaShortColInfo& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t name;
-  corbatext_t host;
-  CORBA::Long response;
-};
-
-struct corbaColInfoResponse;
-typedef TVarVar<corbaColInfoResponse> corbaColInfoResponse_var;
-typedef TVarOut<corbaColInfoResponse> corbaColInfoResponse_out;
-
-struct corbaColInfoResponse {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaColInfoResponse_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaColInfoResponse();
-  ~corbaColInfoResponse();
-  corbaColInfoResponse( const corbaColInfoResponse& s );
-  corbaColInfoResponse& operator=( const corbaColInfoResponse& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbaShortColInfo shoftInfo;
-  CORBA::Boolean useBook;
-  CORBA::Boolean isPublic;
-  CORBA::Boolean isBeta;
-  CORBA::ULong buildDate;
-  corbatext_tarray ccsCols;
-  corbatext_tarray languages;
-  CORBA::ULong numDocs;
-  CORBA::ULong numWords;
-  CORBA::ULong numBytes;
-  corbatext_tmap collectionMeta;
-  corbatext_tmap format;
-  corbatext_tmap building;
-  corbatext_t httpdomain;
-  corbatext_t httpprefix;
-  corbatext_t receptionist;
-};
-
-struct corbaDocRequest;
-typedef TVarVar<corbaDocRequest> corbaDocRequest_var;
-typedef TVarOut<corbaDocRequest> corbaDocRequest_out;
-
-struct corbaDocRequest {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaDocRequest_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaDocRequest();
-  ~corbaDocRequest();
-  corbaDocRequest( const corbaDocRequest& s );
-  corbaDocRequest& operator=( const corbaDocRequest& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t OID;
-  corbatext_t docType;
-  corbatext_t docFormat;
-};
-
-struct corbaDocResponse;
-typedef TVarVar<corbaDocResponse> corbaDocResponse_var;
-typedef TVarOut<corbaDocResponse> corbaDocResponse_out;
-
-struct corbaDocResponse {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaDocResponse_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaDocResponse();
-  ~corbaDocResponse();
-  corbaDocResponse( const corbaDocResponse& s );
-  corbaDocResponse& operator=( const corbaDocResponse& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t doc;
-};
-
-enum corbaFilterType {
-  booleanType = 0,
-  integerType,
-  enumeratedType,
-  stringType
-};
-
-typedef corbaFilterType& corbaFilterType_out;
-
-enum corbaFilterRepeatable {
-  onePerQuery = 0,
-  onePerTerm,
-  nPerTerm
-};
-
-typedef corbaFilterRepeatable& corbaFilterRepeatable_out;
-
-struct corbaFilterOption;
-typedef TVarVar<corbaFilterOption> corbaFilterOption_var;
-typedef TVarOut<corbaFilterOption> corbaFilterOption_out;
-
-struct corbaFilterOption {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaFilterOption_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaFilterOption();
-  ~corbaFilterOption();
-  corbaFilterOption( const corbaFilterOption& s );
-  corbaFilterOption& operator=( const corbaFilterOption& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t name;
-  corbaFilterType type;
-  corbaFilterRepeatable repeatable;
-  corbatext_t defaultValue;
-  corbatext_tarray validValues;
-};
-
-typedef SequenceTmpl<corbaFilterOption,MICO_TID_DEF> corbaFilterOptionList;
-#ifdef _WINDOWS
-static corbaFilterOptionList _dummy_corbaFilterOptionList;
-#endif
-typedef TSeqVar<SequenceTmpl<corbaFilterOption,MICO_TID_DEF> > corbaFilterOptionList_var;
-typedef TSeqOut<SequenceTmpl<corbaFilterOption,MICO_TID_DEF> > corbaFilterOptionList_out;
-
-struct corbaFilterOptionsResponse;
-typedef TVarVar<corbaFilterOptionsResponse> corbaFilterOptionsResponse_var;
-typedef TVarOut<corbaFilterOptionsResponse> corbaFilterOptionsResponse_out;
-
-struct corbaFilterOptionsResponse {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaFilterOptionsResponse_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaFilterOptionsResponse();
-  ~corbaFilterOptionsResponse();
-  corbaFilterOptionsResponse( const corbaFilterOptionsResponse& s );
-  corbaFilterOptionsResponse& operator=( const corbaFilterOptionsResponse& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbaFilterOptionList options;
-  corbatext_tarray names;
-};
-
-struct corbaOptionValue;
-typedef TVarVar<corbaOptionValue> corbaOptionValue_var;
-typedef TVarOut<corbaOptionValue> corbaOptionValue_out;
-
-struct corbaOptionValue {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaOptionValue_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaOptionValue();
-  ~corbaOptionValue();
-  corbaOptionValue( const corbaOptionValue& s );
-  corbaOptionValue& operator=( const corbaOptionValue& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t name;
-  corbatext_t value;
-};
-
-typedef SequenceTmpl<corbaOptionValue,MICO_TID_DEF> corbaOptionValue_array;
-#ifdef _WINDOWS
-static corbaOptionValue_array _dummy_corbaOptionValue_array;
-#endif
-typedef TSeqVar<SequenceTmpl<corbaOptionValue,MICO_TID_DEF> > corbaOptionValue_array_var;
-typedef TSeqOut<SequenceTmpl<corbaOptionValue,MICO_TID_DEF> > corbaOptionValue_array_out;
-
-struct corbaFilterRequest;
-typedef TVarVar<corbaFilterRequest> corbaFilterRequest_var;
-typedef TVarOut<corbaFilterRequest> corbaFilterRequest_out;
-
-struct corbaFilterRequest {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaFilterRequest_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaFilterRequest();
-  ~corbaFilterRequest();
-  corbaFilterRequest( const corbaFilterRequest& s );
-  corbaFilterRequest& operator=( const corbaFilterRequest& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t filter;
-  corbaOptionValue_array filterOptions;
-  corbatext_tarray docSet;
-  CORBA::Long filterResultOptions;
-  corbatext_t requestParams;
-  corbatext_t refParams;
-  corbatext_tset fields;
-  CORBA::Boolean getParents;
-};
-
-struct corbaTermInfo;
-typedef TVarVar<corbaTermInfo> corbaTermInfo_var;
-typedef TVarOut<corbaTermInfo> corbaTermInfo_out;
-
-struct corbaTermInfo {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaTermInfo_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaTermInfo();
-  ~corbaTermInfo();
-  corbaTermInfo( const corbaTermInfo& s );
-  corbaTermInfo& operator=( const corbaTermInfo& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t term;
-  CORBA::Long frequency;
-  corbatext_tarray matchTerms;
-};
-
-typedef SequenceTmpl<corbaTermInfo,MICO_TID_DEF> corbaTermInfo_array;
-#ifdef _WINDOWS
-static corbaTermInfo_array _dummy_corbaTermInfo_array;
-#endif
-typedef TSeqVar<SequenceTmpl<corbaTermInfo,MICO_TID_DEF> > corbaTermInfo_array_var;
-typedef TSeqOut<SequenceTmpl<corbaTermInfo,MICO_TID_DEF> > corbaTermInfo_array_out;
-
-struct corbaMetadataInfo;
-typedef TVarVar<corbaMetadataInfo> corbaMetadataInfo_var;
-typedef TVarOut<corbaMetadataInfo> corbaMetadataInfo_out;
-
-struct corbaMetadataInfo {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaMetadataInfo_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaMetadataInfo();
-  ~corbaMetadataInfo();
-  corbaMetadataInfo( const corbaMetadataInfo& s );
-  corbaMetadataInfo& operator=( const corbaMetadataInfo& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t params;
-  CORBA::Boolean isRef;
-  corbatext_tarray values;
-  CORBA::Long id;
-  CORBA::Long parentid;
-};
-
-typedef SequenceTmpl<corbaMetadataInfo,MICO_TID_DEF> corbaMetadataInfo_array;
-#ifdef _WINDOWS
-static corbaMetadataInfo_array _dummy_corbaMetadataInfo_array;
-#endif
-typedef TSeqVar<SequenceTmpl<corbaMetadataInfo,MICO_TID_DEF> > corbaMetadataInfo_array_var;
-typedef TSeqOut<SequenceTmpl<corbaMetadataInfo,MICO_TID_DEF> > corbaMetadataInfo_array_out;
-
-struct corbaMetadataInfo_map;
-typedef TVarVar<corbaMetadataInfo_map> corbaMetadataInfo_map_var;
-typedef TVarOut<corbaMetadataInfo_map> corbaMetadataInfo_map_out;
-
-struct corbaMetadataInfo_map {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaMetadataInfo_map_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaMetadataInfo_map();
-  ~corbaMetadataInfo_map();
-  corbaMetadataInfo_map( const corbaMetadataInfo_map& s );
-  corbaMetadataInfo_map& operator=( const corbaMetadataInfo_map& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_tarray names;
-  corbaMetadataInfo_array values;
-};
-
-typedef SequenceTmpl<CORBA::Long,MICO_TID_DEF> corbaDocFreq_array;
-#ifdef _WINDOWS
-static corbaDocFreq_array _dummy_corbaDocFreq_array;
-#endif
-typedef TSeqVar<SequenceTmpl<CORBA::Long,MICO_TID_DEF> > corbaDocFreq_array_var;
-typedef TSeqOut<SequenceTmpl<CORBA::Long,MICO_TID_DEF> > corbaDocFreq_array_out;
-
-struct corbaResultDocInfo;
-typedef TVarVar<corbaResultDocInfo> corbaResultDocInfo_var;
-typedef TVarOut<corbaResultDocInfo> corbaResultDocInfo_out;
-
-struct corbaResultDocInfo {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaResultDocInfo_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaResultDocInfo();
-  ~corbaResultDocInfo();
-  corbaResultDocInfo( const corbaResultDocInfo& s );
-  corbaResultDocInfo& operator=( const corbaResultDocInfo& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  corbatext_t OID;
-  CORBA::Long resultNum;
-  CORBA::Long ranking;
-  CORBA::Long termsMatched;
-  CORBA::Long phraseMatched;
-  corbaDocFreq_array docFreq;
-  corbaMetadataInfo_map metadata;
-  corbatext_t classifierMetadataType;
-  CORBA::Long classifierMetadataOffset;
-  corbaMetadataInfo_array metaparents;
-};
-
-typedef SequenceTmpl<corbaResultDocInfo,MICO_TID_DEF> corbaResultDocInfo_array;
-#ifdef _WINDOWS
-static corbaResultDocInfo_array _dummy_corbaResultDocInfo_array;
-#endif
-typedef TSeqVar<SequenceTmpl<corbaResultDocInfo,MICO_TID_DEF> > corbaResultDocInfo_array_var;
-typedef TSeqOut<SequenceTmpl<corbaResultDocInfo,MICO_TID_DEF> > corbaResultDocInfo_array_out;
-
-enum corbaIsApprox {
-  resultExact = 0,
-  resultApprox,
-  resultMany
-};
-
-typedef corbaIsApprox& corbaIsApprox_out;
-
-struct corbaFilterResponse;
-typedef TVarVar<corbaFilterResponse> corbaFilterResponse_var;
-typedef TVarOut<corbaFilterResponse> corbaFilterResponse_out;
-
-struct corbaFilterResponse {
-  #ifdef HAVE_TYPEDEF_OVERLOAD
-  typedef corbaFilterResponse_var _var_type;
-  #endif
-  #ifdef HAVE_EXPLICIT_STRUCT_OPS
-  corbaFilterResponse();
-  ~corbaFilterResponse();
-  corbaFilterResponse( const corbaFilterResponse& s );
-  corbaFilterResponse& operator=( const corbaFilterResponse& s );
-  #endif //HAVE_EXPLICIT_STRUCT_OPS
-
-  CORBA::Long numDocs;
-  corbaIsApprox isApprox;
-  corbaTermInfo_array termInfo;
-  corbaResultDocInfo_array docInfo;
-};
-
-class corbaiface;
-typedef corbaiface *corbaiface_ptr;
-typedef corbaiface_ptr corbaifaceRef;
-typedef ObjVar<corbaiface> corbaiface_var;
-typedef ObjOut<corbaiface> corbaiface_out;
-
-
-// Common definitions for interface corbaiface
-class corbaiface : 
-  virtual public CORBA::Object
-{
-  public:
-    virtual ~corbaiface();
-
-    #ifdef HAVE_TYPEDEF_OVERLOAD
-    typedef corbaiface_ptr _ptr_type;
-    typedef corbaiface_var _var_type;
-    #endif
-
-    static corbaiface_ptr _narrow( CORBA::Object_ptr obj );
-    static corbaiface_ptr _narrow( CORBA::AbstractBase_ptr obj );
-    static corbaiface_ptr _duplicate( corbaiface_ptr _obj )
-    {
-      CORBA::Object::_duplicate (_obj);
-      return _obj;
-    }
-
-    static corbaiface_ptr _nil()
-    {
-      return 0;
-    }
-
-    virtual void *_narrow_helper( const char *repoid );
-    static vector<CORBA::Narrow_proto> *_narrow_helpers;
-    static bool _narrow_helper2( CORBA::Object_ptr obj );
-
-    virtual CORBA::Boolean initialise( corbaComError& error ) = 0;
-    virtual void configure( const corbatext_t& key, const corbatext_tarray& cfgline, corbaComError& error ) = 0;
-    virtual void collectionList( corbatext_tarray& collist, corbaComError& error ) = 0;
-    virtual void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error ) = 0;
-    virtual void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error ) = 0;
-    virtual void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error ) = 0;
-    virtual void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error ) = 0;
-    virtual void getFilterInfo( const corbatext_t& collection, corbatext_tarray& filterNames, corbaComError& error ) = 0;
-    virtual void getFilterOptions( const corbatext_t& collection, const corbatext_t& option, corbaFilterOptionsResponse& response, corbaComError& error ) = 0;
-    virtual void filter( const corbatext_t& collection, const corbaFilterRequest& request, corbaFilterResponse& response, corbaComError& error ) = 0;
-
-  protected:
-    corbaiface() {};
-  private:
-    corbaiface( const corbaiface& );
-    void operator=( const corbaiface& );
-};
-
-// Stub for interface corbaiface
-class corbaiface_stub:
-  virtual public corbaiface
-{
-  public:
-    virtual ~corbaiface_stub();
-    CORBA::Boolean initialise( corbaComError& error );
-    void configure( const corbatext_t& key, const corbatext_tarray& cfgline, corbaComError& error );
-    void collectionList( corbatext_tarray& collist, corbaComError& error );
-    void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error );
-    void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error );
-    void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error );
-    void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error );
-    void getFilterInfo( const corbatext_t& collection, corbatext_tarray& filterNames, corbaComError& error );
-    void getFilterOptions( const corbatext_t& collection, const corbatext_t& option, corbaFilterOptionsResponse& response, corbaComError& error );
-    void filter( const corbatext_t& collection, const corbaFilterRequest& request, corbaFilterResponse& response, corbaComError& error );
-
-  private:
-    void operator=( const corbaiface_stub& );
-};
-
-class corbaiface_skel :
-  virtual public StaticMethodDispatcher,
-  virtual public corbaiface
-{
-  public:
-    corbaiface_skel( const CORBA::BOA::ReferenceData & = CORBA::BOA::ReferenceData() );
-    virtual ~corbaiface_skel();
-    corbaiface_skel( CORBA::Object_ptr obj );
-    virtual bool dispatch( CORBA::StaticServerRequest_ptr _req, CORBA::Environment &_env );
-    corbaiface_ptr _this();
-
-};
-
-#endif // !defined(MICO_NO_TOPLEVEL_MODULES) || defined(MICO_MODULE_gsdlInterface)
-
-#ifndef MICO_NO_TOPLEVEL_MODULES
-
-} MICO_NAMESPACE_END_DECL
-#endif
-
-
-
-#ifndef MICO_CONF_NO_POA
-
-#endif // MICO_CONF_NO_POA
-
-#if !defined(MICO_NO_TOPLEVEL_MODULES) || defined(MICO_MODULE__GLOBAL)
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbatext_t;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbatext_tmap;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaComError;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaShortColInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaColInfoResponse;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaDocRequest;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaDocResponse;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterType;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterRepeatable;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterOption;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterOptionsResponse;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaOptionValue;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterRequest;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaTermInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaMetadataInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaMetadataInfo_map;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaResultDocInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaIsApprox;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterResponse;
-
-extern CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaiface;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbatext_t;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaFilterOption;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaOptionValue;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaTermInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaMetadataInfo;
-
-extern CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaResultDocInfo;
-
-#endif // !defined(MICO_NO_TOPLEVEL_MODULES) || defined(MICO_MODULE__GLOBAL)
-
-
-#if !defined(MICO_NO_TOPLEVEL_MODULES) && !defined(MICO_IN_GENERATED_CODE)
-#include <mico/template_impl.h>
-#endif
-
-#endif
Index: dl/trunk/lib/corbaiface.idl
===================================================================
--- /gsdl/trunk/lib/corbaiface.idl	(revision 15461)
+++ 	(revision )
@@ -1,231 +1,0 @@
-// basic elements for text
-
-module gsdlInterface {
-
-typedef sequence<unsigned short> usString;
-
-typedef sequence<string> stringSeq;
-
-struct corbatext_t
-{ 
-  usString text;
-  unsigned short encoding;
-  unsigned long  length;
-};
-
-typedef sequence<corbatext_t> corbatext_tarray;
-
-typedef corbatext_tarray corbatext_tset;
-
-struct corbatext_tmap
-{
-  corbatext_tarray names;
-  corbatext_tarray values;
-};
-
-// standard error values
-
-enum corbaComError
-{ corbaNoError, 
-  corbaAuthenticationFailure, 
-  corbaProtocolError, 
-  corbaConfigurationError, 
-  corbaSystemProblem
-};
-
-//
-// getColInfo response
-//
-
-struct corbaShortColInfo
-{
-  corbatext_t name;
-  corbatext_t host;
-  long        response;
-};
-
-struct corbaColInfoResponse
-{
-  boolean       useBook;
-  corbaShortColInfo shoftInfo;
-  boolean           isPublic;
-  boolean           isBeta;
-  unsigned long     buildDate;
-  corbatext_tarray  ccsCols;        // Added 05/04/2000
-  corbatext_tarray  languages;
-  unsigned long     numDocs;
-  unsigned long     numWords;
-  unsigned long     numBytes;
-  corbatext_tmap    collectionMeta;
-  corbatext_tmap    format;
-  corbatext_tmap    building;
-  corbatext_t       httpdomain ;    // Added 27/07/2000
-  corbatext_t       httpprefix;     // Added 27/07/2000
-  corbatext_t       receptionist;
-};
-
-//
-// getDocument request
-//
-
-struct corbaDocRequest
-{ 
-  corbatext_t OID;
-  corbatext_t docType;
-  corbatext_t docFormat;
-};
-
-//
-// getDocument response
-//
-
-struct corbaDocResponse
-{ 
-  corbatext_t doc;
-};
-
-enum corbaFilterType
-{
-  booleanType,
-  integerType,
-  enumeratedType,
-  stringType
-};
-
-enum corbaFilterRepeatable
-{
-  onePerQuery,
-  onePerTerm,
-  nPerTerm
-};
-
-struct corbaFilterOption
-{
-  corbatext_t           name;
-  corbaFilterType       type;
-  corbaFilterRepeatable repeatable;
-  corbatext_t           defaultValue;
-  corbatext_tarray      validValues;
-};
-
-typedef sequence<corbaFilterOption> corbaFilterOptionList;
-
-struct corbaFilterOptionsResponse
-{
-  corbaFilterOptionList options;
-  corbatext_tarray      names;
-};
-
-//
-// structures for filter call
-//
-
-struct corbaOptionValue
-{
-  corbatext_t name;
-  corbatext_t value;
-};
-
-typedef sequence<corbaOptionValue> corbaOptionValue_array;
-
-struct corbaFilterRequest
-{ 
-  corbatext_t            filter;
-  corbaOptionValue_array filterOptions;
-  corbatext_tarray       docSet;
-  long                   filterResultOptions;
-  corbatext_t            requestParams;
-  corbatext_t            refParams;
-  corbatext_tset         fields;
-  boolean                getParents;
-};
-
-struct corbaTermInfo
-{
-  corbatext_t      term;
-  long             frequency;
-  corbatext_tarray matchTerms;
-};
-
-typedef sequence<corbaTermInfo> corbaTermInfo_array;
-
-struct corbaMetadataInfo
-{
-  corbatext_t      params;
-  boolean          isRef;
-  corbatext_tarray values;
-  long             id;
-  long             parentid; // dodge for avoiding pointers for the moment
-};
-
-typedef sequence<corbaMetadataInfo> corbaMetadataInfo_array;
-
-struct corbaMetadataInfo_map
-{ 
-  corbatext_tarray        names;
-  corbaMetadataInfo_array values;
-};
-
-typedef sequence<long> corbaDocFreq_array;
-
-struct corbaResultDocInfo
-{
-  corbatext_t             OID;
-  long                    resultNum;
-  long                    ranking;
-  long                    termsMatched;
-  long                    phraseMatched;
-  corbaDocFreq_array      docFreq;
-  corbaMetadataInfo_map   metadata;
-  corbatext_t             classifierMetadataType;    // Added 05/04/2000
-  long                    classifierMetadataOffset;  // Added 05/04/2000
-  corbaMetadataInfo_array metaparents;
-};
-
-typedef sequence<corbaResultDocInfo> corbaResultDocInfo_array;
-
-enum corbaIsApprox
-{
-  resultExact,
-  resultApprox,
-  resultMany
-};
-
-struct corbaFilterResponse
-{
-  long                     numDocs;
-  corbaIsApprox            isApprox;
-  corbaTermInfo_array      termInfo;
-  corbaResultDocInfo_array docInfo;
-};
-
-interface corbaiface
-{
-  boolean   initialise(inout corbaComError error);
-  void      configure(in corbatext_t key, in corbatext_tarray cfgline,
-		      inout corbaComError error);
-  void      collectionList(inout corbatext_tarray collist,
-			   inout corbaComError error);
-  void      hasCollection(in corbatext_t corbaCollection, inout boolean has,
-		       inout corbaComError error);
-  void      ping(in corbatext_t collection, inout boolean wasSuccess, inout corbaComError error);
-  void      getDocument(in corbatext_t collection,
-			inout corbaDocRequest request, inout corbaDocResponse response,
-			inout corbaComError error);
-  void      getCollectInfo(in corbatext_t collection,
-			   inout corbaColInfoResponse response,
-			   inout corbaComError error);
-  void      getFilterInfo(in corbatext_t collection, 
-                          inout corbatext_tarray filterNames, 
-			  inout corbaComError error);
-  void      getFilterOptions(in corbatext_t collection,
-                             in corbatext_t option,
-                             inout corbaFilterOptionsResponse response,
-			     inout corbaComError error);
-  void      filter(in corbatext_t collection,
-		   in corbaFilterRequest request,
-                   inout corbaFilterResponse response,
-                   inout corbaComError error);
-};
-
-};
Index: dl/trunk/lib/corbaiface.mpp
===================================================================
--- /gsdl/trunk/lib/corbaiface.mpp	(revision 15461)
+++ 	(revision )
@@ -1,2000 +1,0 @@
-/*
- *  MICO --- a free CORBA implementation
- *  Copyright (C) 1997-98 Kay Roemer & Arno Puder
- *
- *  This file was automatically generated. DO NOT EDIT!
- */
-
-#include "corbaiface.h"
-
-//--------------------------------------------------------
-//  Implementation of stubs
-//--------------------------------------------------------
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbatext_t::corbatext_t()
-{
-}
-
-gsdlInterface::corbatext_t::corbatext_t( const corbatext_t& _s )
-{
-  text = ((corbatext_t&)_s).text;
-  encoding = ((corbatext_t&)_s).encoding;
-  length = ((corbatext_t&)_s).length;
-}
-
-gsdlInterface::corbatext_t::~corbatext_t()
-{
-}
-
-gsdlInterface::corbatext_t&
-gsdlInterface::corbatext_t::operator=( const corbatext_t& _s )
-{
-  text = ((corbatext_t&)_s).text;
-  encoding = ((corbatext_t&)_s).encoding;
-  length = ((corbatext_t&)_s).length;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbatext_t : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbatext_t _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbatext_t::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbatext_t::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbatext_t::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbatext_t::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    CORBA::_stcseq_ushort->demarshal( dc, &((_MICO_T*)v)->text ) &&
-    CORBA::_stc_ushort->demarshal( dc, &((_MICO_T*)v)->encoding ) &&
-    CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->length ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbatext_t::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  CORBA::_stcseq_ushort->marshal( ec, &((_MICO_T*)v)->text );
-  CORBA::_stc_ushort->marshal( ec, &((_MICO_T*)v)->encoding );
-  CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->length );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbatext_t;
-
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbatext_tmap::corbatext_tmap()
-{
-}
-
-gsdlInterface::corbatext_tmap::corbatext_tmap( const corbatext_tmap& _s )
-{
-  names = ((corbatext_tmap&)_s).names;
-  values = ((corbatext_tmap&)_s).values;
-}
-
-gsdlInterface::corbatext_tmap::~corbatext_tmap()
-{
-}
-
-gsdlInterface::corbatext_tmap&
-gsdlInterface::corbatext_tmap::operator=( const corbatext_tmap& _s )
-{
-  names = ((corbatext_tmap&)_s).names;
-  values = ((corbatext_tmap&)_s).values;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbatext_tmap : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbatext_tmap _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbatext_tmap::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbatext_tmap::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbatext_tmap::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbatext_tmap::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->names ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->values ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbatext_tmap::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->names );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->values );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbatext_tmap;
-
-
-class _Marshaller_gsdlInterface_corbaComError : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaComError _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaComError::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaComError::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaComError::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaComError::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong ul;
-  if( !dc.enumeration( ul ) )
-    return FALSE;
-  *(_MICO_T*) v = (_MICO_T) ul;
-  return TRUE;
-}
-
-void _Marshaller_gsdlInterface_corbaComError::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.enumeration( (CORBA::ULong) *(_MICO_T *) v );
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaComError;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaShortColInfo::corbaShortColInfo()
-{
-}
-
-gsdlInterface::corbaShortColInfo::corbaShortColInfo( const corbaShortColInfo& _s )
-{
-  name = ((corbaShortColInfo&)_s).name;
-  host = ((corbaShortColInfo&)_s).host;
-  response = ((corbaShortColInfo&)_s).response;
-}
-
-gsdlInterface::corbaShortColInfo::~corbaShortColInfo()
-{
-}
-
-gsdlInterface::corbaShortColInfo&
-gsdlInterface::corbaShortColInfo::operator=( const corbaShortColInfo& _s )
-{
-  name = ((corbaShortColInfo&)_s).name;
-  host = ((corbaShortColInfo&)_s).host;
-  response = ((corbaShortColInfo&)_s).response;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaShortColInfo : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaShortColInfo _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaShortColInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaShortColInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaShortColInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaShortColInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->name ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->host ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->response ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaShortColInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->name );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->host );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->response );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaShortColInfo;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaColInfoResponse::corbaColInfoResponse()
-{
-}
-
-gsdlInterface::corbaColInfoResponse::corbaColInfoResponse( const corbaColInfoResponse& _s )
-{
-  shoftInfo = ((corbaColInfoResponse&)_s).shoftInfo;
-  useBook = ((corbaColInfoResponse&)_s).useBook;
-  isPublic = ((corbaColInfoResponse&)_s).isPublic;
-  isBeta = ((corbaColInfoResponse&)_s).isBeta;
-  buildDate = ((corbaColInfoResponse&)_s).buildDate;
-  ccsCols = ((corbaColInfoResponse&)_s).ccsCols;
-  languages = ((corbaColInfoResponse&)_s).languages;
-  numDocs = ((corbaColInfoResponse&)_s).numDocs;
-  numWords = ((corbaColInfoResponse&)_s).numWords;
-  numBytes = ((corbaColInfoResponse&)_s).numBytes;
-  collectionMeta = ((corbaColInfoResponse&)_s).collectionMeta;
-  format = ((corbaColInfoResponse&)_s).format;
-  building = ((corbaColInfoResponse&)_s).building;
-  httpdomain = ((corbaColInfoResponse&)_s).httpdomain;
-  httpprefix = ((corbaColInfoResponse&)_s).httpprefix;
-  receptionist = ((corbaColInfoResponse&)_s).receptionist;
-}
-
-gsdlInterface::corbaColInfoResponse::~corbaColInfoResponse()
-{
-}
-
-gsdlInterface::corbaColInfoResponse&
-gsdlInterface::corbaColInfoResponse::operator=( const corbaColInfoResponse& _s )
-{
-  shoftInfo = ((corbaColInfoResponse&)_s).shoftInfo;
-  useBook = ((corbaColInfoResponse&)_s).useBook;
-  isPublic = ((corbaColInfoResponse&)_s).isPublic;
-  isBeta = ((corbaColInfoResponse&)_s).isBeta;
-  buildDate = ((corbaColInfoResponse&)_s).buildDate;
-  ccsCols = ((corbaColInfoResponse&)_s).ccsCols;
-  languages = ((corbaColInfoResponse&)_s).languages;
-  numDocs = ((corbaColInfoResponse&)_s).numDocs;
-  numWords = ((corbaColInfoResponse&)_s).numWords;
-  numBytes = ((corbaColInfoResponse&)_s).numBytes;
-  collectionMeta = ((corbaColInfoResponse&)_s).collectionMeta;
-  format = ((corbaColInfoResponse&)_s).format;
-  building = ((corbaColInfoResponse&)_s).building;
-  httpdomain = ((corbaColInfoResponse&)_s).httpdomain;
-  httpprefix = ((corbaColInfoResponse&)_s).httpprefix;
-  receptionist = ((corbaColInfoResponse&)_s).receptionist;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaColInfoResponse : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaColInfoResponse _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaColInfoResponse::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaColInfoResponse::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaColInfoResponse::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaColInfoResponse::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbaShortColInfo->demarshal( dc, &((_MICO_T*)v)->shoftInfo ) &&
-    CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->useBook ) &&
-    CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->isPublic ) &&
-    CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->isBeta ) &&
-    CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->buildDate ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->ccsCols ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->languages ) &&
-    CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->numDocs ) &&
-    CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->numWords ) &&
-    CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->numBytes ) &&
-    _marshaller_gsdlInterface_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->collectionMeta ) &&
-    _marshaller_gsdlInterface_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->format ) &&
-    _marshaller_gsdlInterface_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->building ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpdomain ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpprefix ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->receptionist ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaColInfoResponse::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbaShortColInfo->marshal( ec, &((_MICO_T*)v)->shoftInfo );
-  CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->useBook );
-  CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->isPublic );
-  CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->isBeta );
-  CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->buildDate );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->ccsCols );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->languages );
-  CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->numDocs );
-  CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->numWords );
-  CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->numBytes );
-  _marshaller_gsdlInterface_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->collectionMeta );
-  _marshaller_gsdlInterface_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->format );
-  _marshaller_gsdlInterface_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->building );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpdomain );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpprefix );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->receptionist );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaColInfoResponse;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaDocRequest::corbaDocRequest()
-{
-}
-
-gsdlInterface::corbaDocRequest::corbaDocRequest( const corbaDocRequest& _s )
-{
-  OID = ((corbaDocRequest&)_s).OID;
-  docType = ((corbaDocRequest&)_s).docType;
-  docFormat = ((corbaDocRequest&)_s).docFormat;
-}
-
-gsdlInterface::corbaDocRequest::~corbaDocRequest()
-{
-}
-
-gsdlInterface::corbaDocRequest&
-gsdlInterface::corbaDocRequest::operator=( const corbaDocRequest& _s )
-{
-  OID = ((corbaDocRequest&)_s).OID;
-  docType = ((corbaDocRequest&)_s).docType;
-  docFormat = ((corbaDocRequest&)_s).docFormat;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaDocRequest : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaDocRequest _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaDocRequest::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaDocRequest::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaDocRequest::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaDocRequest::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->OID ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->docType ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->docFormat ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaDocRequest::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->OID );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->docType );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->docFormat );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaDocRequest;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaDocResponse::corbaDocResponse()
-{
-}
-
-gsdlInterface::corbaDocResponse::corbaDocResponse( const corbaDocResponse& _s )
-{
-  doc = ((corbaDocResponse&)_s).doc;
-}
-
-gsdlInterface::corbaDocResponse::~corbaDocResponse()
-{
-}
-
-gsdlInterface::corbaDocResponse&
-gsdlInterface::corbaDocResponse::operator=( const corbaDocResponse& _s )
-{
-  doc = ((corbaDocResponse&)_s).doc;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaDocResponse : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaDocResponse _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaDocResponse::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaDocResponse::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaDocResponse::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaDocResponse::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->doc ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaDocResponse::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->doc );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaDocResponse;
-
-
-class _Marshaller_gsdlInterface_corbaFilterType : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterType _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterType::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterType::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterType::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterType::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong ul;
-  if( !dc.enumeration( ul ) )
-    return FALSE;
-  *(_MICO_T*) v = (_MICO_T) ul;
-  return TRUE;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterType::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.enumeration( (CORBA::ULong) *(_MICO_T *) v );
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterType;
-
-
-class _Marshaller_gsdlInterface_corbaFilterRepeatable : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterRepeatable _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterRepeatable::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRepeatable::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRepeatable::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterRepeatable::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong ul;
-  if( !dc.enumeration( ul ) )
-    return FALSE;
-  *(_MICO_T*) v = (_MICO_T) ul;
-  return TRUE;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRepeatable::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.enumeration( (CORBA::ULong) *(_MICO_T *) v );
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterRepeatable;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaFilterOption::corbaFilterOption()
-{
-}
-
-gsdlInterface::corbaFilterOption::corbaFilterOption( const corbaFilterOption& _s )
-{
-  name = ((corbaFilterOption&)_s).name;
-  type = ((corbaFilterOption&)_s).type;
-  repeatable = ((corbaFilterOption&)_s).repeatable;
-  defaultValue = ((corbaFilterOption&)_s).defaultValue;
-  validValues = ((corbaFilterOption&)_s).validValues;
-}
-
-gsdlInterface::corbaFilterOption::~corbaFilterOption()
-{
-}
-
-gsdlInterface::corbaFilterOption&
-gsdlInterface::corbaFilterOption::operator=( const corbaFilterOption& _s )
-{
-  name = ((corbaFilterOption&)_s).name;
-  type = ((corbaFilterOption&)_s).type;
-  repeatable = ((corbaFilterOption&)_s).repeatable;
-  defaultValue = ((corbaFilterOption&)_s).defaultValue;
-  validValues = ((corbaFilterOption&)_s).validValues;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaFilterOption : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterOption _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterOption::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOption::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOption::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterOption::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->name ) &&
-    _marshaller_gsdlInterface_corbaFilterType->demarshal( dc, &((_MICO_T*)v)->type ) &&
-    _marshaller_gsdlInterface_corbaFilterRepeatable->demarshal( dc, &((_MICO_T*)v)->repeatable ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->defaultValue ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->validValues ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOption::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->name );
-  _marshaller_gsdlInterface_corbaFilterType->marshal( ec, &((_MICO_T*)v)->type );
-  _marshaller_gsdlInterface_corbaFilterRepeatable->marshal( ec, &((_MICO_T*)v)->repeatable );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->defaultValue );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->validValues );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterOption;
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaFilterOptionsResponse::corbaFilterOptionsResponse()
-{
-}
-
-gsdlInterface::corbaFilterOptionsResponse::corbaFilterOptionsResponse( const corbaFilterOptionsResponse& _s )
-{
-  options = ((corbaFilterOptionsResponse&)_s).options;
-  names = ((corbaFilterOptionsResponse&)_s).names;
-}
-
-gsdlInterface::corbaFilterOptionsResponse::~corbaFilterOptionsResponse()
-{
-}
-
-gsdlInterface::corbaFilterOptionsResponse&
-gsdlInterface::corbaFilterOptionsResponse::operator=( const corbaFilterOptionsResponse& _s )
-{
-  options = ((corbaFilterOptionsResponse&)_s).options;
-  names = ((corbaFilterOptionsResponse&)_s).names;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaFilterOptionsResponse : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterOptionsResponse _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterOptionsResponse::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOptionsResponse::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOptionsResponse::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterOptionsResponse::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller__seq_gsdlInterface_corbaFilterOption->demarshal( dc, &((_MICO_T*)v)->options ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->names ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaFilterOptionsResponse::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller__seq_gsdlInterface_corbaFilterOption->marshal( ec, &((_MICO_T*)v)->options );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->names );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterOptionsResponse;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaOptionValue::corbaOptionValue()
-{
-}
-
-gsdlInterface::corbaOptionValue::corbaOptionValue( const corbaOptionValue& _s )
-{
-  name = ((corbaOptionValue&)_s).name;
-  value = ((corbaOptionValue&)_s).value;
-}
-
-gsdlInterface::corbaOptionValue::~corbaOptionValue()
-{
-}
-
-gsdlInterface::corbaOptionValue&
-gsdlInterface::corbaOptionValue::operator=( const corbaOptionValue& _s )
-{
-  name = ((corbaOptionValue&)_s).name;
-  value = ((corbaOptionValue&)_s).value;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaOptionValue : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaOptionValue _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaOptionValue::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaOptionValue::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaOptionValue::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaOptionValue::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->name ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->value ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaOptionValue::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->name );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->value );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaOptionValue;
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaFilterRequest::corbaFilterRequest()
-{
-}
-
-gsdlInterface::corbaFilterRequest::corbaFilterRequest( const corbaFilterRequest& _s )
-{
-  filter = ((corbaFilterRequest&)_s).filter;
-  filterOptions = ((corbaFilterRequest&)_s).filterOptions;
-  docSet = ((corbaFilterRequest&)_s).docSet;
-  filterResultOptions = ((corbaFilterRequest&)_s).filterResultOptions;
-  requestParams = ((corbaFilterRequest&)_s).requestParams;
-  refParams = ((corbaFilterRequest&)_s).refParams;
-  fields = ((corbaFilterRequest&)_s).fields;
-  getParents = ((corbaFilterRequest&)_s).getParents;
-}
-
-gsdlInterface::corbaFilterRequest::~corbaFilterRequest()
-{
-}
-
-gsdlInterface::corbaFilterRequest&
-gsdlInterface::corbaFilterRequest::operator=( const corbaFilterRequest& _s )
-{
-  filter = ((corbaFilterRequest&)_s).filter;
-  filterOptions = ((corbaFilterRequest&)_s).filterOptions;
-  docSet = ((corbaFilterRequest&)_s).docSet;
-  filterResultOptions = ((corbaFilterRequest&)_s).filterResultOptions;
-  requestParams = ((corbaFilterRequest&)_s).requestParams;
-  refParams = ((corbaFilterRequest&)_s).refParams;
-  fields = ((corbaFilterRequest&)_s).fields;
-  getParents = ((corbaFilterRequest&)_s).getParents;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaFilterRequest : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterRequest _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterRequest::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRequest::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRequest::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterRequest::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->filter ) &&
-    _marshaller__seq_gsdlInterface_corbaOptionValue->demarshal( dc, &((_MICO_T*)v)->filterOptions ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->docSet ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->filterResultOptions ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->requestParams ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->refParams ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->fields ) &&
-    CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->getParents ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaFilterRequest::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->filter );
-  _marshaller__seq_gsdlInterface_corbaOptionValue->marshal( ec, &((_MICO_T*)v)->filterOptions );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->docSet );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->filterResultOptions );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->requestParams );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->refParams );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->fields );
-  CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->getParents );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterRequest;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaTermInfo::corbaTermInfo()
-{
-}
-
-gsdlInterface::corbaTermInfo::corbaTermInfo( const corbaTermInfo& _s )
-{
-  term = ((corbaTermInfo&)_s).term;
-  frequency = ((corbaTermInfo&)_s).frequency;
-  matchTerms = ((corbaTermInfo&)_s).matchTerms;
-}
-
-gsdlInterface::corbaTermInfo::~corbaTermInfo()
-{
-}
-
-gsdlInterface::corbaTermInfo&
-gsdlInterface::corbaTermInfo::operator=( const corbaTermInfo& _s )
-{
-  term = ((corbaTermInfo&)_s).term;
-  frequency = ((corbaTermInfo&)_s).frequency;
-  matchTerms = ((corbaTermInfo&)_s).matchTerms;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaTermInfo : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaTermInfo _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaTermInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaTermInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaTermInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaTermInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->term ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->frequency ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->matchTerms ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaTermInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->term );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->frequency );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->matchTerms );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaTermInfo;
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaMetadataInfo::corbaMetadataInfo()
-{
-}
-
-gsdlInterface::corbaMetadataInfo::corbaMetadataInfo( const corbaMetadataInfo& _s )
-{
-  params = ((corbaMetadataInfo&)_s).params;
-  isRef = ((corbaMetadataInfo&)_s).isRef;
-  values = ((corbaMetadataInfo&)_s).values;
-  id = ((corbaMetadataInfo&)_s).id;
-  parentid = ((corbaMetadataInfo&)_s).parentid;
-}
-
-gsdlInterface::corbaMetadataInfo::~corbaMetadataInfo()
-{
-}
-
-gsdlInterface::corbaMetadataInfo&
-gsdlInterface::corbaMetadataInfo::operator=( const corbaMetadataInfo& _s )
-{
-  params = ((corbaMetadataInfo&)_s).params;
-  isRef = ((corbaMetadataInfo&)_s).isRef;
-  values = ((corbaMetadataInfo&)_s).values;
-  id = ((corbaMetadataInfo&)_s).id;
-  parentid = ((corbaMetadataInfo&)_s).parentid;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaMetadataInfo : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaMetadataInfo _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaMetadataInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaMetadataInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->params ) &&
-    CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->isRef ) &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->values ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->id ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->parentid ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->params );
-  CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->isRef );
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->values );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->id );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->parentid );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaMetadataInfo;
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaMetadataInfo_map::corbaMetadataInfo_map()
-{
-}
-
-gsdlInterface::corbaMetadataInfo_map::corbaMetadataInfo_map( const corbaMetadataInfo_map& _s )
-{
-  names = ((corbaMetadataInfo_map&)_s).names;
-  values = ((corbaMetadataInfo_map&)_s).values;
-}
-
-gsdlInterface::corbaMetadataInfo_map::~corbaMetadataInfo_map()
-{
-}
-
-gsdlInterface::corbaMetadataInfo_map&
-gsdlInterface::corbaMetadataInfo_map::operator=( const corbaMetadataInfo_map& _s )
-{
-  names = ((corbaMetadataInfo_map&)_s).names;
-  values = ((corbaMetadataInfo_map&)_s).values;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaMetadataInfo_map : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaMetadataInfo_map _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaMetadataInfo_map::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo_map::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo_map::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaMetadataInfo_map::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller__seq_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->names ) &&
-    _marshaller__seq_gsdlInterface_corbaMetadataInfo->demarshal( dc, &((_MICO_T*)v)->values ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaMetadataInfo_map::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller__seq_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->names );
-  _marshaller__seq_gsdlInterface_corbaMetadataInfo->marshal( ec, &((_MICO_T*)v)->values );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaMetadataInfo_map;
-
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaResultDocInfo::corbaResultDocInfo()
-{
-}
-
-gsdlInterface::corbaResultDocInfo::corbaResultDocInfo( const corbaResultDocInfo& _s )
-{
-  OID = ((corbaResultDocInfo&)_s).OID;
-  resultNum = ((corbaResultDocInfo&)_s).resultNum;
-  ranking = ((corbaResultDocInfo&)_s).ranking;
-  termsMatched = ((corbaResultDocInfo&)_s).termsMatched;
-  phraseMatched = ((corbaResultDocInfo&)_s).phraseMatched;
-  docFreq = ((corbaResultDocInfo&)_s).docFreq;
-  metadata = ((corbaResultDocInfo&)_s).metadata;
-  classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType;
-  classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset;
-  metaparents = ((corbaResultDocInfo&)_s).metaparents;
-}
-
-gsdlInterface::corbaResultDocInfo::~corbaResultDocInfo()
-{
-}
-
-gsdlInterface::corbaResultDocInfo&
-gsdlInterface::corbaResultDocInfo::operator=( const corbaResultDocInfo& _s )
-{
-  OID = ((corbaResultDocInfo&)_s).OID;
-  resultNum = ((corbaResultDocInfo&)_s).resultNum;
-  ranking = ((corbaResultDocInfo&)_s).ranking;
-  termsMatched = ((corbaResultDocInfo&)_s).termsMatched;
-  phraseMatched = ((corbaResultDocInfo&)_s).phraseMatched;
-  docFreq = ((corbaResultDocInfo&)_s).docFreq;
-  metadata = ((corbaResultDocInfo&)_s).metadata;
-  classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType;
-  classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset;
-  metaparents = ((corbaResultDocInfo&)_s).metaparents;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaResultDocInfo : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaResultDocInfo _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaResultDocInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaResultDocInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaResultDocInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaResultDocInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->OID ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->resultNum ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->ranking ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->termsMatched ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->phraseMatched ) &&
-    CORBA::_stcseq_long->demarshal( dc, &((_MICO_T*)v)->docFreq ) &&
-    _marshaller_gsdlInterface_corbaMetadataInfo_map->demarshal( dc, &((_MICO_T*)v)->metadata ) &&
-    _marshaller_gsdlInterface_corbatext_t->demarshal( dc, &((_MICO_T*)v)->classifierMetadataType ) &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->classifierMetadataOffset ) &&
-    _marshaller__seq_gsdlInterface_corbaMetadataInfo->demarshal( dc, &((_MICO_T*)v)->metaparents ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaResultDocInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->OID );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->resultNum );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->ranking );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->termsMatched );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->phraseMatched );
-  CORBA::_stcseq_long->marshal( ec, &((_MICO_T*)v)->docFreq );
-  _marshaller_gsdlInterface_corbaMetadataInfo_map->marshal( ec, &((_MICO_T*)v)->metadata );
-  _marshaller_gsdlInterface_corbatext_t->marshal( ec, &((_MICO_T*)v)->classifierMetadataType );
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->classifierMetadataOffset );
-  _marshaller__seq_gsdlInterface_corbaMetadataInfo->marshal( ec, &((_MICO_T*)v)->metaparents );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaResultDocInfo;
-
-
-
-class _Marshaller_gsdlInterface_corbaIsApprox : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaIsApprox _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaIsApprox::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaIsApprox::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaIsApprox::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaIsApprox::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong ul;
-  if( !dc.enumeration( ul ) )
-    return FALSE;
-  *(_MICO_T*) v = (_MICO_T) ul;
-  return TRUE;
-}
-
-void _Marshaller_gsdlInterface_corbaIsApprox::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.enumeration( (CORBA::ULong) *(_MICO_T *) v );
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaIsApprox;
-
-#ifdef HAVE_EXPLICIT_STRUCT_OPS
-gsdlInterface::corbaFilterResponse::corbaFilterResponse()
-{
-}
-
-gsdlInterface::corbaFilterResponse::corbaFilterResponse( const corbaFilterResponse& _s )
-{
-  numDocs = ((corbaFilterResponse&)_s).numDocs;
-  isApprox = ((corbaFilterResponse&)_s).isApprox;
-  termInfo = ((corbaFilterResponse&)_s).termInfo;
-  docInfo = ((corbaFilterResponse&)_s).docInfo;
-}
-
-gsdlInterface::corbaFilterResponse::~corbaFilterResponse()
-{
-}
-
-gsdlInterface::corbaFilterResponse&
-gsdlInterface::corbaFilterResponse::operator=( const corbaFilterResponse& _s )
-{
-  numDocs = ((corbaFilterResponse&)_s).numDocs;
-  isApprox = ((corbaFilterResponse&)_s).isApprox;
-  termInfo = ((corbaFilterResponse&)_s).termInfo;
-  docInfo = ((corbaFilterResponse&)_s).docInfo;
-  return *this;
-}
-#endif
-
-class _Marshaller_gsdlInterface_corbaFilterResponse : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaFilterResponse _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaFilterResponse::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterResponse::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller_gsdlInterface_corbaFilterResponse::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaFilterResponse::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  return
-    dc.struct_begin() &&
-    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->numDocs ) &&
-    _marshaller_gsdlInterface_corbaIsApprox->demarshal( dc, &((_MICO_T*)v)->isApprox ) &&
-    _marshaller__seq_gsdlInterface_corbaTermInfo->demarshal( dc, &((_MICO_T*)v)->termInfo ) &&
-    _marshaller__seq_gsdlInterface_corbaResultDocInfo->demarshal( dc, &((_MICO_T*)v)->docInfo ) &&
-    dc.struct_end();
-}
-
-void _Marshaller_gsdlInterface_corbaFilterResponse::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  ec.struct_begin();
-  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->numDocs );
-  _marshaller_gsdlInterface_corbaIsApprox->marshal( ec, &((_MICO_T*)v)->isApprox );
-  _marshaller__seq_gsdlInterface_corbaTermInfo->marshal( ec, &((_MICO_T*)v)->termInfo );
-  _marshaller__seq_gsdlInterface_corbaResultDocInfo->marshal( ec, &((_MICO_T*)v)->docInfo );
-  ec.struct_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaFilterResponse;
-
-
-// Stub interface corbaiface
-gsdlInterface::corbaiface::~corbaiface()
-{
-}
-
-void *gsdlInterface::corbaiface::_narrow_helper( const char *_rid )
-{
-  if( strcmp( _rid, "IDL:gsdlInterface/corbaiface:1.0" ) == 0 )
-    return (void *)this;
-  return NULL;
-}
-
-bool gsdlInterface::corbaiface::_narrow_helper2( CORBA::Object_ptr _obj )
-{
-  if( strcmp( _obj->_repoid(), "IDL:gsdlInterface/corbaiface:1.0" ) == 0) {
-    return true;
-  }
-  for( vector<CORBA::Narrow_proto>::size_type _i = 0;
-       _narrow_helpers && _i < _narrow_helpers->size(); _i++ ) {
-    bool _res = (*(*_narrow_helpers)[ _i ])( _obj );
-    if( _res )
-      return true;
-  }
-  return false;
-}
-
-gsdlInterface::corbaiface_ptr gsdlInterface::corbaiface::_narrow( CORBA::Object_ptr _obj )
-{
-  gsdlInterface::corbaiface_ptr _o;
-  if( !CORBA::is_nil( _obj ) ) {
-    void *_p;
-    if( (_p = _obj->_narrow_helper( "IDL:gsdlInterface/corbaiface:1.0" )))
-      return _duplicate( (gsdlInterface::corbaiface_ptr) _p );
-    if( _narrow_helper2( _obj ) ||
-       ( _obj->_is_a_remote( "IDL:gsdlInterface/corbaiface:1.0" ) ) ) {
-      _o = new gsdlInterface::corbaiface_stub;
-      _o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
-      return _o;
-    }
-  }
-  return _nil();
-}
-
-gsdlInterface::corbaiface_ptr
-gsdlInterface::corbaiface::_narrow( CORBA::AbstractBase_ptr _obj )
-{
-  return _narrow (_obj->_to_object());
-}
-
-gsdlInterface::corbaiface_stub::~corbaiface_stub()
-{
-}
-
-CORBA::Boolean gsdlInterface::corbaiface_stub::initialise( gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::Boolean _res;
-  CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-
-  CORBA::StaticRequest __req( this, "initialise" );
-  __req.add_inout_arg( &_error );
-  __req.set_result( &__res );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-  return _res;
-}
-
-
-void gsdlInterface::corbaiface_stub::configure( const gsdlInterface::corbatext_t& key, const gsdlInterface::corbatext_tarray& cfgline, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _key( _marshaller_gsdlInterface_corbatext_t, &key );
-  CORBA::StaticAny _cfgline( _marshaller__seq_gsdlInterface_corbatext_t, &cfgline );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "configure" );
-  __req.add_in_arg( &_key );
-  __req.add_in_arg( &_cfgline );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::collectionList( gsdlInterface::corbatext_tarray& collist, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collist( _marshaller__seq_gsdlInterface_corbatext_t, &collist );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "collectionList" );
-  __req.add_inout_arg( &_collist );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::hasCollection( const gsdlInterface::corbatext_t& corbaCollection, CORBA::Boolean& has, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _corbaCollection( _marshaller_gsdlInterface_corbatext_t, &corbaCollection );
-  CORBA::StaticAny _has( CORBA::_stc_boolean, &has );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "hasCollection" );
-  __req.add_in_arg( &_corbaCollection );
-  __req.add_inout_arg( &_has );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::ping( const gsdlInterface::corbatext_t& collection, CORBA::Boolean& wasSuccess, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "ping" );
-  __req.add_in_arg( &_collection );
-  __req.add_inout_arg( &_wasSuccess );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::getDocument( const gsdlInterface::corbatext_t& collection, gsdlInterface::corbaDocRequest& request, gsdlInterface::corbaDocResponse& response, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _request( _marshaller_gsdlInterface_corbaDocRequest, &request );
-  CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaDocResponse, &response );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "getDocument" );
-  __req.add_in_arg( &_collection );
-  __req.add_inout_arg( &_request );
-  __req.add_inout_arg( &_response );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::getCollectInfo( const gsdlInterface::corbatext_t& collection, gsdlInterface::corbaColInfoResponse& response, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaColInfoResponse, &response );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "getCollectInfo" );
-  __req.add_in_arg( &_collection );
-  __req.add_inout_arg( &_response );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::getFilterInfo( const gsdlInterface::corbatext_t& collection, gsdlInterface::corbatext_tarray& filterNames, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _filterNames( _marshaller__seq_gsdlInterface_corbatext_t, &filterNames );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "getFilterInfo" );
-  __req.add_in_arg( &_collection );
-  __req.add_inout_arg( &_filterNames );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::getFilterOptions( const gsdlInterface::corbatext_t& collection, const gsdlInterface::corbatext_t& option, gsdlInterface::corbaFilterOptionsResponse& response, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _option( _marshaller_gsdlInterface_corbatext_t, &option );
-  CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaFilterOptionsResponse, &response );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "getFilterOptions" );
-  __req.add_in_arg( &_collection );
-  __req.add_in_arg( &_option );
-  __req.add_inout_arg( &_response );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-void gsdlInterface::corbaiface_stub::filter( const gsdlInterface::corbatext_t& collection, const gsdlInterface::corbaFilterRequest& request, gsdlInterface::corbaFilterResponse& response, gsdlInterface::corbaComError& error )
-{
-  CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-  CORBA::StaticAny _request( _marshaller_gsdlInterface_corbaFilterRequest, &request );
-  CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaFilterResponse, &response );
-  CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::StaticRequest __req( this, "filter" );
-  __req.add_in_arg( &_collection );
-  __req.add_in_arg( &_request );
-  __req.add_inout_arg( &_response );
-  __req.add_inout_arg( &_error );
-
-  __req.invoke();
-
-  mico_sii_throw( &__req, 
-    0);
-}
-
-
-#ifdef HAVE_NAMESPACE
-namespace gsdlInterface { vector<CORBA::Narrow_proto> * corbaiface::_narrow_helpers; }
-#else
-vector<CORBA::Narrow_proto> * gsdlInterface::corbaiface::_narrow_helpers;
-#endif
-
-class _Marshaller_gsdlInterface_corbaiface : public CORBA::StaticTypeInfo {
-    typedef gsdlInterface::corbaiface_ptr _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller_gsdlInterface_corbaiface::create() const
-{
-  return (StaticValueType) new _MICO_T( 0 );
-}
-
-void _Marshaller_gsdlInterface_corbaiface::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = ::gsdlInterface::corbaiface::_duplicate( *(_MICO_T*) s );
-}
-
-void _Marshaller_gsdlInterface_corbaiface::free( StaticValueType v ) const
-{
-  CORBA::release( *(_MICO_T *) v );
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller_gsdlInterface_corbaiface::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::Object_ptr obj;
-  if (!CORBA::_stc_Object->demarshal(dc, &obj))
-    return FALSE;
-  *(_MICO_T *) v = ::gsdlInterface::corbaiface::_narrow( obj );
-  CORBA::Boolean ret = CORBA::is_nil (obj) || !CORBA::is_nil (*(_MICO_T *)v);
-  CORBA::release (obj);
-  return ret;
-}
-
-void _Marshaller_gsdlInterface_corbaiface::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::Object_ptr obj = *(_MICO_T *) v;
-  CORBA::_stc_Object->marshal( ec, &obj );
-}
-
-CORBA::StaticTypeInfo *_marshaller_gsdlInterface_corbaiface;
-
-class _Marshaller__seq_gsdlInterface_corbatext_t : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbatext_t,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbatext_t::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbatext_t::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbatext_t::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbatext_t::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbatext_t->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbatext_t::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbatext_t->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbatext_t;
-
-class _Marshaller__seq_gsdlInterface_corbaFilterOption : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbaFilterOption,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbaFilterOption::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaFilterOption::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaFilterOption::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbaFilterOption::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbaFilterOption->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbaFilterOption::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbaFilterOption->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaFilterOption;
-
-class _Marshaller__seq_gsdlInterface_corbaOptionValue : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbaOptionValue,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbaOptionValue::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaOptionValue::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaOptionValue::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbaOptionValue::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbaOptionValue->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbaOptionValue::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbaOptionValue->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaOptionValue;
-
-class _Marshaller__seq_gsdlInterface_corbaTermInfo : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbaTermInfo,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbaTermInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaTermInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaTermInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbaTermInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbaTermInfo->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbaTermInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbaTermInfo->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaTermInfo;
-
-class _Marshaller__seq_gsdlInterface_corbaMetadataInfo : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbaMetadataInfo,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbaMetadataInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaMetadataInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaMetadataInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbaMetadataInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbaMetadataInfo->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbaMetadataInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbaMetadataInfo->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaMetadataInfo;
-
-class _Marshaller__seq_gsdlInterface_corbaResultDocInfo : public CORBA::StaticTypeInfo {
-    typedef SequenceTmpl<gsdlInterface::corbaResultDocInfo,MICO_TID_DEF> _MICO_T;
-  public:
-    StaticValueType create () const;
-    void assign (StaticValueType dst, const StaticValueType src) const;
-    void free (StaticValueType) const;
-    CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
-    void marshal (CORBA::DataEncoder &, StaticValueType) const;
-};
-
-
-CORBA::StaticValueType _Marshaller__seq_gsdlInterface_corbaResultDocInfo::create() const
-{
-  return (StaticValueType) new _MICO_T;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaResultDocInfo::assign( StaticValueType d, const StaticValueType s ) const
-{
-  *(_MICO_T*) d = *(_MICO_T*) s;
-}
-
-void _Marshaller__seq_gsdlInterface_corbaResultDocInfo::free( StaticValueType v ) const
-{
-  delete (_MICO_T*) v;
-}
-
-CORBA::Boolean _Marshaller__seq_gsdlInterface_corbaResultDocInfo::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
-{
-  CORBA::ULong len;
-  if( !dc.seq_begin( len ) )
-    return FALSE;
-  ((_MICO_T *) v)->length( len );
-  for( CORBA::ULong i = 0; i < len; i++ ) {
-    if( !_marshaller_gsdlInterface_corbaResultDocInfo->demarshal( dc, &(*(_MICO_T*)v)[i] ) )
-      return FALSE;
-  }
-  return dc.seq_end();
-}
-
-void _Marshaller__seq_gsdlInterface_corbaResultDocInfo::marshal( CORBA::DataEncoder &ec, StaticValueType v ) const
-{
-  CORBA::ULong len = ((_MICO_T *) v)->length();
-  ec.seq_begin( len );
-  for( CORBA::ULong i = 0; i < len; i++ )
-    _marshaller_gsdlInterface_corbaResultDocInfo->marshal( ec, &(*(_MICO_T*)v)[i] );
-  ec.seq_end();
-}
-
-CORBA::StaticTypeInfo *_marshaller__seq_gsdlInterface_corbaResultDocInfo;
-
-struct __tc_init_CORBAIFACE {
-  __tc_init_CORBAIFACE()
-  {
-    _marshaller_gsdlInterface_corbatext_t = new _Marshaller_gsdlInterface_corbatext_t;
-    _marshaller_gsdlInterface_corbatext_tmap = new _Marshaller_gsdlInterface_corbatext_tmap;
-    _marshaller_gsdlInterface_corbaComError = new _Marshaller_gsdlInterface_corbaComError;
-    _marshaller_gsdlInterface_corbaShortColInfo = new _Marshaller_gsdlInterface_corbaShortColInfo;
-    _marshaller_gsdlInterface_corbaColInfoResponse = new _Marshaller_gsdlInterface_corbaColInfoResponse;
-    _marshaller_gsdlInterface_corbaDocRequest = new _Marshaller_gsdlInterface_corbaDocRequest;
-    _marshaller_gsdlInterface_corbaDocResponse = new _Marshaller_gsdlInterface_corbaDocResponse;
-    _marshaller_gsdlInterface_corbaFilterType = new _Marshaller_gsdlInterface_corbaFilterType;
-    _marshaller_gsdlInterface_corbaFilterRepeatable = new _Marshaller_gsdlInterface_corbaFilterRepeatable;
-    _marshaller_gsdlInterface_corbaFilterOption = new _Marshaller_gsdlInterface_corbaFilterOption;
-    _marshaller_gsdlInterface_corbaFilterOptionsResponse = new _Marshaller_gsdlInterface_corbaFilterOptionsResponse;
-    _marshaller_gsdlInterface_corbaOptionValue = new _Marshaller_gsdlInterface_corbaOptionValue;
-    _marshaller_gsdlInterface_corbaFilterRequest = new _Marshaller_gsdlInterface_corbaFilterRequest;
-    _marshaller_gsdlInterface_corbaTermInfo = new _Marshaller_gsdlInterface_corbaTermInfo;
-    _marshaller_gsdlInterface_corbaMetadataInfo = new _Marshaller_gsdlInterface_corbaMetadataInfo;
-    _marshaller_gsdlInterface_corbaMetadataInfo_map = new _Marshaller_gsdlInterface_corbaMetadataInfo_map;
-    _marshaller_gsdlInterface_corbaResultDocInfo = new _Marshaller_gsdlInterface_corbaResultDocInfo;
-    _marshaller_gsdlInterface_corbaIsApprox = new _Marshaller_gsdlInterface_corbaIsApprox;
-    _marshaller_gsdlInterface_corbaFilterResponse = new _Marshaller_gsdlInterface_corbaFilterResponse;
-    _marshaller_gsdlInterface_corbaiface = new _Marshaller_gsdlInterface_corbaiface;
-    _marshaller__seq_gsdlInterface_corbatext_t = new _Marshaller__seq_gsdlInterface_corbatext_t;
-    _marshaller__seq_gsdlInterface_corbaFilterOption = new _Marshaller__seq_gsdlInterface_corbaFilterOption;
-    _marshaller__seq_gsdlInterface_corbaOptionValue = new _Marshaller__seq_gsdlInterface_corbaOptionValue;
-    _marshaller__seq_gsdlInterface_corbaTermInfo = new _Marshaller__seq_gsdlInterface_corbaTermInfo;
-    _marshaller__seq_gsdlInterface_corbaMetadataInfo = new _Marshaller__seq_gsdlInterface_corbaMetadataInfo;
-    _marshaller__seq_gsdlInterface_corbaResultDocInfo = new _Marshaller__seq_gsdlInterface_corbaResultDocInfo;
-  }
-};
-
-static __tc_init_CORBAIFACE __init_CORBAIFACE;
-
Index: dl/trunk/lib/corbaiface_skel.mpp
===================================================================
--- /gsdl/trunk/lib/corbaiface_skel.mpp	(revision 15461)
+++ 	(revision )
@@ -1,274 +1,0 @@
-/*
- *  MICO --- a free CORBA implementation
- *  Copyright (C) 1997-98 Kay Roemer & Arno Puder
- *
- *  This file was automatically generated. DO NOT EDIT!
- */
-#include "corbaiface.h"
-
-//--------------------------------------------------------
-//  Implementation of skeletons
-//--------------------------------------------------------
-
-gsdlInterface::corbaiface_skel::corbaiface_skel( const CORBA::BOA::ReferenceData &_id )
-{
-  CORBA::ImplementationDef_var _impl =
-    _find_impl( "IDL:gsdlInterface/corbaiface:1.0", "corbaiface" );
-  assert( !CORBA::is_nil( _impl ) );
-  _create_ref( _id,
-    0,
-    _impl,
-    "IDL:gsdlInterface/corbaiface:1.0" );
-  register_dispatcher( new StaticInterfaceDispatcherWrapper<corbaiface_skel>( this ) );
-}
-
-gsdlInterface::corbaiface_skel::corbaiface_skel( CORBA::Object_ptr _obj )
-{
-  CORBA::ImplementationDef_var _impl =
-    _find_impl( "IDL:gsdlInterface/corbaiface:1.0", "corbaiface" );
-  assert( !CORBA::is_nil( _impl ) );
-  _restore_ref( _obj,
-    CORBA::BOA::ReferenceData(),
-    0,
-    _impl );
-  register_dispatcher( new StaticInterfaceDispatcherWrapper<corbaiface_skel>( this ) );
-}
-
-gsdlInterface::corbaiface_skel::~corbaiface_skel()
-{
-}
-
-bool gsdlInterface::corbaiface_skel::dispatch( CORBA::StaticServerRequest_ptr _req, CORBA::Environment & /*_env*/ )
-{
-  #ifdef HAVE_EXCEPTIONS
-  try {
-  #endif
-    switch (mico_string_hash (_req->op_name(), 17)) {
-    case 0:
-      if( strcmp( _req->op_name(), "collectionList" ) == 0 ) {
-        corbatext_tarray collist;
-        CORBA::StaticAny _collist( _marshaller__seq_gsdlInterface_corbatext_t, &collist );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_inout_arg( &_collist );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        collectionList( collist, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 3:
-      if( strcmp( _req->op_name(), "ping" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        CORBA::Boolean wasSuccess;
-        CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_wasSuccess );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        ping( collection, wasSuccess, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 7:
-      if( strcmp( _req->op_name(), "filter" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbaFilterRequest request;
-        CORBA::StaticAny _request( _marshaller_gsdlInterface_corbaFilterRequest, &request );
-        corbaFilterResponse response;
-        CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaFilterResponse, &response );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_in_arg( &_request );
-        _req->add_inout_arg( &_response );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        filter( collection, request, response, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 9:
-      if( strcmp( _req->op_name(), "getFilterOptions" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbatext_t option;
-        CORBA::StaticAny _option( _marshaller_gsdlInterface_corbatext_t, &option );
-        corbaFilterOptionsResponse response;
-        CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaFilterOptionsResponse, &response );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_in_arg( &_option );
-        _req->add_inout_arg( &_response );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        getFilterOptions( collection, option, response, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 10:
-      if( strcmp( _req->op_name(), "getCollectInfo" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbaColInfoResponse response;
-        CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaColInfoResponse, &response );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_response );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        getCollectInfo( collection, response, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 11:
-      if( strcmp( _req->op_name(), "initialise" ) == 0 ) {
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        CORBA::Boolean _res;
-        CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-        _req->add_inout_arg( &_error );
-        _req->set_result( &__res );
-
-        if( !_req->read_args() )
-          return true;
-
-        _res = initialise( error );
-        _req->write_results();
-        return true;
-      }
-      if( strcmp( _req->op_name(), "getFilterInfo" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbatext_tarray filterNames;
-        CORBA::StaticAny _filterNames( _marshaller__seq_gsdlInterface_corbatext_t, &filterNames );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_filterNames );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        getFilterInfo( collection, filterNames, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 12:
-      if( strcmp( _req->op_name(), "hasCollection" ) == 0 ) {
-        corbatext_t corbaCollection;
-        CORBA::StaticAny _corbaCollection( _marshaller_gsdlInterface_corbatext_t, &corbaCollection );
-        CORBA::Boolean has;
-        CORBA::StaticAny _has( CORBA::_stc_boolean, &has );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_corbaCollection );
-        _req->add_inout_arg( &_has );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        hasCollection( corbaCollection, has, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 13:
-      if( strcmp( _req->op_name(), "configure" ) == 0 ) {
-        corbatext_t key;
-        CORBA::StaticAny _key( _marshaller_gsdlInterface_corbatext_t, &key );
-        corbatext_tarray cfgline;
-        CORBA::StaticAny _cfgline( _marshaller__seq_gsdlInterface_corbatext_t, &cfgline );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_key );
-        _req->add_in_arg( &_cfgline );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        configure( key, cfgline, error );
-        _req->write_results();
-        return true;
-      }
-      if( strcmp( _req->op_name(), "getDocument" ) == 0 ) {
-        corbatext_t collection;
-        CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbaDocRequest request;
-        CORBA::StaticAny _request( _marshaller_gsdlInterface_corbaDocRequest, &request );
-        corbaDocResponse response;
-        CORBA::StaticAny _response( _marshaller_gsdlInterface_corbaDocResponse, &response );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_request );
-        _req->add_inout_arg( &_response );
-        _req->add_inout_arg( &_error );
-
-        if( !_req->read_args() )
-          return true;
-
-        getDocument( collection, request, response, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    }
-  #ifdef HAVE_EXCEPTIONS
-  } catch( CORBA::SystemException_catch &_ex ) {
-    _req->set_exception( _ex->_clone() );
-    _req->write_results();
-    return true;
-  } catch( ... ) {
-    assert( 0 );
-    return true;
-  }
-  #endif
-  return false;
-}
-
-gsdlInterface::corbaiface_ptr gsdlInterface::corbaiface_skel::_this()
-{
-  return gsdlInterface::corbaiface::_duplicate( this );
-}
-
Index: dl/trunk/lib/corbatext_t.h
===================================================================
--- /gsdl/trunk/lib/corbatext_t.h	(revision 15461)
+++ 	(revision )
@@ -1,13 +1,0 @@
-void corbatext_fillChar(corbatext_t *t, char *text);
-void corbatext_usvector(corbatext_t t, vector<unsigned short>& us);
-char *corbatext_string(corbatext_t t);
-#ifdef TEXT_T_H
-void corbatext_arrayToCorbaArray(text_tarray t, corbatext_tarray *ca);
-void corbatext_corbaArrayToArray(corbatext_tarray ca, text_tarray *ta);
-void corbatext_mapToCorbaMap(text_tmap tm, corbatext_tmap *cm);
-void corbatext_corbaMapToMap(corbatext_tmap cm, text_tmap &tm);
-void corbatext_setToCorbaArray(text_tset set, corbatext_tset *cset);
-void corbatext_corbaArrayToSet(corbatext_tset cset, text_tset *set);
-corbatext_t_var corbatext_corbatext(text_t t);
-int corbatext_corbatext(text_t t, corbatext_t_var ct);
-#endif
Index: dl/trunk/lib/corbatext_t.mpp
===================================================================
--- /gsdl/trunk/lib/corbatext_t.mpp	(revision 15461)
+++ 	(revision )
@@ -1,179 +1,0 @@
-// standard headers
-#if defined(GSDL_USE_STL_H)
-#include <iostream.h>
-#include <fstream.h>
-#include <vector.h>
-#else
-#include <iostream>
-#include <fstream>
-#include <vector>
-#endif
-
-// protocol headers
-#include "corbaiface.h"
-using namespace gsdlInterface;
-
-// greenstone headers
-#include "corbaconv_text_t.h"
-
-//local headers
-#include "corbatext_t.h"
-
-void corbatext_fillChar(corbatext_t *t, char *text)
-{
-  unsigned int i;
-
-  t->text.length(0);
-  if (text == NULL)
-      {
-	  return;
-      }
-  for (i = 0; i < strlen(text); i ++)
-      {
-	  t->text[i] = text[i];
-      }  
-  t->encoding = 0;
-}
-
-void corbatext_usvector(corbatext_t t, usvector& us)
-{
-  unsigned int i;
-
-  for (i = 0; i < t.text.length(); i ++)
-    {
-      us.push_back(t.text[i]);
-    }
-}
-
-char *corbatext_string(corbatext_t t)
-{ 
-  char *lcopy;
-  unsigned int i;
-    lcopy = (char *) malloc(t.text.length() + 1);
-    for (i = 0; i < t.text.length(); i ++)
-    {
-      lcopy[i] = (char) t.text[i];
-    }
-    lcopy[i] = '\0';
-    return lcopy;
-}
-
-corbatext_t_var corbatext_corbatext(text_t t)
-{ corbatext_t_var ct;
-// usString_var    us;
-
-  // cout << "Making text\n";
-  ct = new corbatext_t;
-  //  ct->text.length(20);
-  // us = new usString(20);
-  //  cout << ct->text.length() << endl;
-  //  cout << ct->text.maximum() << endl;
-  corbaconv_text_t::fillUsString(t,&ct->text);
-  //t.fillUsString(us);
-  // delete us;
-  // cout << "Encoding text\n";
-  ct->encoding = 0;
-  // cout << "Encoding text\n";
-  return ct;
-}
-
-int corbatext_corbatext(text_t t, corbatext_t_var ct)
-{
-  cout << "A" << endl;
-  corbaconv_text_t::fillUsString(t,&ct->text);
-  cout << "B" << endl;
-  ct->encoding = 0;
-  cout << "C" << endl;
-}
-
-void corbatext_corbaArrayToArray(corbatext_tarray ca, text_tarray *ta)
-{
-  unsigned int i;
-  corbaconv_text_t *cct;
-
-  ta->clear();
-  ta->reserve(ca.length());
-  for (i = 0; i < ca.length(); i ++)
-    {
-      cct = new corbaconv_text_t(ca[i]);
-      ta->push_back(*cct); // cast to text_t
-    }  
-}
-
-void corbatext_arrayToCorbaArray(text_tarray ta, corbatext_tarray *_ca)
-{
-  text_tarray::iterator here = ta.begin();
-  text_tarray::iterator end = ta.end();
-  corbatext_tarray ca(end - here);
-  unsigned int i;
-
-  i = 0;
-  (*_ca).length(end - here);
-
-  while (here != end)
-    {
-      corbatext_t_var ptr;
-      //      cout << "Array: " << (*_ca).maximum() << " " << (*_ca).length() << endl;
-      ptr = corbatext_corbatext(*here);
-      (*_ca)[i] = ptr;
-      here ++;
-      i++;      
-    }
-}
-
-void corbatext_corbaArrayToSet(corbatext_tarray t, text_tset *ts)
-{ unsigned int i;
- 
-  for (i = 0; i < t.length(); i ++)
-    {
-      ts->insert((corbaconv_text_t) t[i]); // further typecast to text_t
-    } 
-
-  return;
-}
-
-void corbatext_setToCorbaArray(text_tset ts, corbatext_tarray *t)
-{
-  corbatext_t str;
-  text_tset::iterator here = ts.begin();
-  text_tset::iterator end = ts.end();
-  unsigned int i;
-
-  i = 0;
-  while (here != end)
-    {
-      (*t).length(i+1);
-      (*t)[i] = *corbatext_corbatext(*here);
-      here ++;
-      i ++;
-    }
-}
-
-void corbatext_mapToCorbaMap(text_tmap map, corbatext_tmap *cmap)
-{
-  text_tmap::iterator here = map.begin();
-  text_tmap::iterator end  = map.end();
-  unsigned int i = 0;
-
-  while (here != end)
-    {
-      (*cmap).names.length(i+1);
-      (*cmap).values.length(i+1);
-      cmap->names[i] = *corbatext_corbatext((*here).first);
-      cmap->values[i] = *corbatext_corbatext((*here).second);
-      here ++;
-      i ++;
-    }
-}
-
-void corbatext_corbaMapToMap(corbatext_tmap cmap, text_tmap &map)
-{
-  unsigned int i;
-
-  for (i = 0; i < cmap.names.length(); i ++)
-    {
-      map.insert(make_pair(*(new corbaconv_text_t(cmap.names[i])), 
-                           *(new corbaconv_text_t(cmap.values[i])))); // further typecast to text_t
-    }
-}
-
