Changeset 1074 for branches/corba/gsdl/lib/corbaiface.mpp

Timestamp:

2000-04-06T23:11:40+12:00 (24 years ago)

Author:

cs025

Message:

Corba improvements; tidied client initialisation in corbaproto and also
added a number of changes to the main trunk which somehow had not made
it into the corba branch via update before its instantiation.

Also the dated use of the GSDL_GSDLHOME macro was removed, at the expense
of some particularly poor code in corbaserver where log file creation is
now nowhere near so elegant.

File:

• branches/corba/gsdl/lib/corbaiface.mpp (modified) (8 diffs)

branches/corba/gsdl/lib/corbaiface.mpp

@@ -284 +284 @@
   isBeta = ((corbaColInfoResponse&)_s).isBeta;
   buildDate = ((corbaColInfoResponse&)_s).buildDate;
+  ccsCols = ((corbaColInfoResponse&)_s).ccsCols;
   languages = ((corbaColInfoResponse&)_s).languages;
   numDocs = ((corbaColInfoResponse&)_s).numDocs;
@@ -305 +306 @@
   isBeta = ((corbaColInfoResponse&)_s).isBeta;
   buildDate = ((corbaColInfoResponse&)_s).buildDate;
+  ccsCols = ((corbaColInfoResponse&)_s).ccsCols;
   languages = ((corbaColInfoResponse&)_s).languages;
   numDocs = ((corbaColInfoResponse&)_s).numDocs;
@@ -351 +353 @@
     CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->isBeta ) &&
     CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->buildDate ) &&
+    _marshaller__seq_corbatext_t->demarshal( dc, &((_MICO_T*)v)->ccsCols ) &&
     _marshaller__seq_corbatext_t->demarshal( dc, &((_MICO_T*)v)->languages ) &&
     CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->numDocs ) &&
@@ -369 +372 @@
   CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->isBeta );
   CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->buildDate );
+  _marshaller__seq_corbatext_t->marshal( ec, &((_MICO_T*)v)->ccsCols );
   _marshaller__seq_corbatext_t->marshal( ec, &((_MICO_T*)v)->languages );
   CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->numDocs );
@@ -1160 +1164 @@
   docFreq = ((corbaResultDocInfo&)_s).docFreq;
   metadata = ((corbaResultDocInfo&)_s).metadata;
+  classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType;
+  classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset;
   metaparents = ((corbaResultDocInfo&)_s).metaparents;
 }
@@ -1177 +1183 @@
   docFreq = ((corbaResultDocInfo&)_s).docFreq;
   metadata = ((corbaResultDocInfo&)_s).metadata;
+  classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType;
+  classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset;
   metaparents = ((corbaResultDocInfo&)_s).metaparents;
   return *this;
@@ -1219 +1227 @@
     CORBA::_stcseq_long->demarshal( dc, &((_MICO_T*)v)->docFreq ) &&
     _marshaller_corbaMetadataInfo_map->demarshal( dc, &((_MICO_T*)v)->metadata ) &&
+    _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->classifierMetadataType ) &&
+    CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->classifierMetadataOffset ) &&
     _marshaller__seq_corbaMetadataInfo->demarshal( dc, &((_MICO_T*)v)->metaparents ) &&
     dc.struct_end();
@@ -1233 +1243 @@
   CORBA::_stcseq_long->marshal( ec, &((_MICO_T*)v)->docFreq );
   _marshaller_corbaMetadataInfo_map->marshal( ec, &((_MICO_T*)v)->metadata );
+  _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->classifierMetadataType );
+  CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->classifierMetadataOffset );
   _marshaller__seq_corbaMetadataInfo->marshal( ec, &((_MICO_T*)v)->metaparents );
   ec.struct_end();