- Timestamp:
- 2000-04-06T23:11:40+12:00 (24 years ago)
- Location:
- branches/corba/gsdl
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/corba/gsdl/lib/corbaiface.h
r1068 r1074 130 130 CORBA::Boolean isBeta; 131 131 CORBA::ULong buildDate; 132 corbatext_tarray ccsCols; 132 133 corbatext_tarray languages; 133 134 CORBA::ULong numDocs; … … 398 399 corbaDocFreq_array docFreq; 399 400 corbaMetadataInfo_map metadata; 401 corbatext_t classifierMetadataType; 402 CORBA::Long classifierMetadataOffset; 400 403 corbaMetadataInfo_array metaparents; 401 404 }; -
branches/corba/gsdl/lib/corbaiface.idl
r1068 r1074 49 49 boolean isBeta; 50 50 unsigned long buildDate; 51 corbatext_tarray ccsCols; // Added 05/04/2000 51 52 corbatext_tarray languages; 52 53 unsigned long numDocs; … … 172 173 corbaDocFreq_array docFreq; 173 174 corbaMetadataInfo_map metadata; 175 corbatext_t classifierMetadataType; // Added 05/04/2000 176 long classifierMetadataOffset; // Added 05/04/2000 174 177 corbaMetadataInfo_array metaparents; 175 178 }; -
branches/corba/gsdl/lib/corbaiface.mpp
r1068 r1074 284 284 isBeta = ((corbaColInfoResponse&)_s).isBeta; 285 285 buildDate = ((corbaColInfoResponse&)_s).buildDate; 286 ccsCols = ((corbaColInfoResponse&)_s).ccsCols; 286 287 languages = ((corbaColInfoResponse&)_s).languages; 287 288 numDocs = ((corbaColInfoResponse&)_s).numDocs; … … 305 306 isBeta = ((corbaColInfoResponse&)_s).isBeta; 306 307 buildDate = ((corbaColInfoResponse&)_s).buildDate; 308 ccsCols = ((corbaColInfoResponse&)_s).ccsCols; 307 309 languages = ((corbaColInfoResponse&)_s).languages; 308 310 numDocs = ((corbaColInfoResponse&)_s).numDocs; … … 351 353 CORBA::_stc_boolean->demarshal( dc, &((_MICO_T*)v)->isBeta ) && 352 354 CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->buildDate ) && 355 _marshaller__seq_corbatext_t->demarshal( dc, &((_MICO_T*)v)->ccsCols ) && 353 356 _marshaller__seq_corbatext_t->demarshal( dc, &((_MICO_T*)v)->languages ) && 354 357 CORBA::_stc_ulong->demarshal( dc, &((_MICO_T*)v)->numDocs ) && … … 369 372 CORBA::_stc_boolean->marshal( ec, &((_MICO_T*)v)->isBeta ); 370 373 CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->buildDate ); 374 _marshaller__seq_corbatext_t->marshal( ec, &((_MICO_T*)v)->ccsCols ); 371 375 _marshaller__seq_corbatext_t->marshal( ec, &((_MICO_T*)v)->languages ); 372 376 CORBA::_stc_ulong->marshal( ec, &((_MICO_T*)v)->numDocs ); … … 1160 1164 docFreq = ((corbaResultDocInfo&)_s).docFreq; 1161 1165 metadata = ((corbaResultDocInfo&)_s).metadata; 1166 classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType; 1167 classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset; 1162 1168 metaparents = ((corbaResultDocInfo&)_s).metaparents; 1163 1169 } … … 1177 1183 docFreq = ((corbaResultDocInfo&)_s).docFreq; 1178 1184 metadata = ((corbaResultDocInfo&)_s).metadata; 1185 classifierMetadataType = ((corbaResultDocInfo&)_s).classifierMetadataType; 1186 classifierMetadataOffset = ((corbaResultDocInfo&)_s).classifierMetadataOffset; 1179 1187 metaparents = ((corbaResultDocInfo&)_s).metaparents; 1180 1188 return *this; … … 1219 1227 CORBA::_stcseq_long->demarshal( dc, &((_MICO_T*)v)->docFreq ) && 1220 1228 _marshaller_corbaMetadataInfo_map->demarshal( dc, &((_MICO_T*)v)->metadata ) && 1229 _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->classifierMetadataType ) && 1230 CORBA::_stc_long->demarshal( dc, &((_MICO_T*)v)->classifierMetadataOffset ) && 1221 1231 _marshaller__seq_corbaMetadataInfo->demarshal( dc, &((_MICO_T*)v)->metaparents ) && 1222 1232 dc.struct_end(); … … 1233 1243 CORBA::_stcseq_long->marshal( ec, &((_MICO_T*)v)->docFreq ); 1234 1244 _marshaller_corbaMetadataInfo_map->marshal( ec, &((_MICO_T*)v)->metadata ); 1245 _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->classifierMetadataType ); 1246 CORBA::_stc_long->marshal( ec, &((_MICO_T*)v)->classifierMetadataOffset ); 1235 1247 _marshaller__seq_corbaMetadataInfo->marshal( ec, &((_MICO_T*)v)->metaparents ); 1236 1248 ec.struct_end(); -
branches/corba/gsdl/src/colservr/Makefile.in
r1067 r1074 47 47 RANLIB = @RANLIB@ 48 48 LDFLAGS = @LDFLAGS@ 49 LIBS = -lgdbm -lstdc++ -lm49 LIBS = @LIBS@ 50 50 51 51 GSDLOS = @gsdlos@ -
branches/corba/gsdl/src/colservr/corbaServer.mpp
r1068 r1074 10 10 // library headers 11 11 #include "fileutil.h" 12 #include "gsdlhome.h"12 //#include "gsdlhome.h" 13 13 14 14 // greenstone headers … … 25 25 void corbaresponse_resultDocInfoToCorba(ResultDocInfo_tarray docinfo, corbaResultDocInfo_array &corbainfo); 26 26 27 void corbaresponse_termInfoToCorba(TermInfo_tarray terminfo, corbaTermInfo_array &corbainfo) 28 { 27 void corbaresponse_termInfoToCorba(TermInfo_tarray terminfo, corbaTermInfo_array &corbainfo) { 29 28 TermInfo_tarray::iterator here = terminfo.begin(); 30 29 TermInfo_tarray::iterator end = terminfo.end(); 31 30 unsigned int i; 32 31 33 32 i = 0; 34 33 35 while (here != end) 34 while (here != end) 36 35 { 37 36 corbainfo.length(i+1); … … 68 67 text_tarray collections; 69 68 recptproto *protocol; 69 text_t gsdlhome; 70 70 public: 71 corbaServer(recptproto *protocol) 72 { 73 cout << GSDL_GSDLHOME << endl; 74 if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1); 71 corbaServer(recptproto *protocol, text_t home) 72 { 73 text_t dirname; 74 char * cdirname; 75 this->gsdlhome = home; 76 cout << gsdlhome.getcstr() << endl; 77 dirname = filename_cat(gsdlhome, "/collect"); 78 cdirname = dirname.getcstr(); 79 if (!read_dir (cdirname, collections)) exit (1); 80 delete cdirname; 81 75 82 cout << "Constructing set list server" << endl; 76 83 this->protocol = protocol; 77 84 } 78 85 79 CORBA::Boolean init() 80 { 81 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 86 CORBA::Boolean init() 87 { 88 char *cfname; 89 text_t fname; 90 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 91 cfname = fname.getcstr(); 92 ofstream logout(cfname); 93 delete cfname; 94 82 95 int reply; 83 96 … … 104 117 bool _has; 105 118 comerror_t err; 106 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 119 120 char * cfname; 121 text_t fname; 122 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 123 cfname = fname.getcstr(); 124 ofstream logout(cfname); 125 delete cfname; 107 126 108 127 cct = new corbaconv_text_t(corbaCollect); … … 129 148 130 149 CORBA::Boolean ping(const struct corbatext_t &corbaCollect, corbaComError &corbaError) 131 { 132 text_t collection; 133 bool success; 134 comerror_t error; 135 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 136 137 138 corbaconv_text_t::setCorbatext(collection,corbaCollect); 139 protocol->ping(collection, success, error, logout); 140 141 corbaError = (corbaComError) error; 142 logout.close(); 143 144 return success; 145 } 150 { 151 text_t collection; 152 bool success; 153 comerror_t error; 154 155 char * cfname; 156 text_t fname; 157 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 158 cfname = fname.getcstr(); 159 ofstream logout(cfname); 160 delete cfname; 161 162 corbaconv_text_t::setCorbatext(collection,corbaCollect); 163 protocol->ping(collection, success, error, logout); 164 165 corbaError = (corbaComError) error; 166 logout.close(); 167 168 return success; 169 } 146 170 147 171 void filter(const struct corbatext_t &corbaCollect, … … 155 179 comerror_t error = noError; 156 180 text_t collection; 157 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 181 182 char * cfname; 183 text_t fname; 184 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 185 cfname = fname.getcstr(); 186 ofstream logout(cfname); 187 delete cfname; 158 188 159 189 // copy collection id … … 191 221 comerror_t error; 192 222 text_t collection; 193 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 223 224 char * cfname; 225 text_t fname; 226 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 227 cfname = fname.getcstr(); 228 ofstream logout(cfname); 229 delete cfname; 194 230 195 231 corbaconv_text_t::setCorbatext(collection,corbaCollect); … … 200 236 corbaResponse.buildDate = response.buildDate; 201 237 corbatext_arrayToCorbaArray(response.languages, &corbaResponse.languages); 238 corbatext_arrayToCorbaArray(response.ccsCols, &corbaResponse.ccsCols); 202 239 corbaResponse.numDocs = response.numDocs; 203 240 corbaResponse.numBytes = response.numWords; … … 222 259 InfoFilterOptionsResponse_t response; 223 260 comerror_t error; 224 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt");225 261 unsigned int i; 262 263 char * cfname; 264 text_t fname; 265 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 266 cfname = fname.getcstr(); 267 ofstream logout(cfname); 268 delete cfname; 226 269 227 270 corbaconv_text_t::setCorbatext(collection,corbaCollect); … … 265 308 text_t collection; 266 309 InfoFiltersResponse_t response; 267 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 310 311 char * cfname; 312 text_t fname; 313 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 314 cfname = fname.getcstr(); 315 ofstream logout(cfname); 316 delete cfname; 268 317 269 318 corbaconv_text_t::setCorbatext(collection,corbaCollect); … … 283 332 comerror_t error = noError; 284 333 text_t collection; 285 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 334 335 char * cfname; 336 text_t fname; 337 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 338 cfname = fname.getcstr(); 339 ofstream logout(cfname); 340 delete cfname; 286 341 287 342 // set up request … … 309 364 text_tarray collist; 310 365 comerror_t err; 311 ofstream logout(GSDL_GSDLHOME "/etc/corbaout.txt"); 366 367 char * cfname; 368 text_t fname; 369 fname = filename_cat(gsdlhome, "/etc/corbaout.txt"); 370 cfname = fname.getcstr(); 371 ofstream logout(cfname); 372 delete cfname; 312 373 313 374 protocol->get_collection_list(collist, err, logout); … … 353 414 cout << "Initialised ORB and BOA" << endl; 354 415 355 corbaServer* server = new corbaServer(&protocol );416 corbaServer* server = new corbaServer(&protocol, gsdlhome); 356 417 CORBA::String_var ref = orb->object_to_string( server ); 357 418 … … 362 423 out << ref << endl; 363 424 out.close (); 425 426 cout << "Corba string is " << ref << endl; 364 427 365 428 // indicate readiness and run -
branches/corba/gsdl/src/colservr/queryfilter.cpp
r990 r1074 28 28 /* 29 29 $Log$ 30 Revision 1.22.2.1 2000/04/06 11:11:37 cs025 31 Corba improvements; tidied client initialisation in corbaproto and also 32 added a number of changes to the main trunk which somehow had not made 33 it into the corba branch via update before its instantiation. 34 35 Also the dated use of the GSDL_GSDLHOME macro was removed, at the expense 36 of some particularly poor code in corbaserver where log file creation is 37 now nowhere near so elegant. 38 30 39 Revision 1.22 2000/02/29 01:35:56 sjboddie 31 40 tidied up endianness and fastcgi … … 706 715 vector<queryparamclass> queryfilterparams; 707 716 parse_query_params (request, queryfilterparams, startresults, 708 endresults, phrasematch, logout); 717 endresults, phrasematch, logout); 709 718 710 719 // do query -
branches/corba/gsdl/src/recpt/Makefile.in
r1067 r1074 47 47 RANLIB = @RANLIB@ 48 48 LDFLAGS = @LDFLAGS@ 49 LIBS = -lgdbm -lstdc++ -lm -lcrypt49 LIBS = @LIBS@ 50 50 51 51 GSDLOS = @gsdlos@ … … 158 158 all: $(EXEC) 159 159 160 distclean: 161 rm -f $(OBJECTS) $(EXEC) Makefile 162 160 163 clean: 161 164 rm -f $(OBJECTS) $(EXEC) -
branches/corba/gsdl/src/recpt/corbaclient.mpp
r1068 r1074 59 59 #include "htmlbrowserclass.h" 60 60 61 #include "gsdlhome.h" 61 // #include "gsdlhome.h" 62 #include "recptconfig.h" 62 63 63 64 int main () { 64 65 receptionist recpt; 65 corbaproto nproto; 66 corbaproto nproto; 67 text_t gsdlhome; 68 69 site_cfg_read(gsdlhome); 66 70 67 71 // cout << "GRB 0" << endl; … … 78 82 79 83 mapinconvertclass gbinconvert; 80 gbinconvert.setmapfile ( GSDL_GSDLHOME, "gbku", 0x25a1);84 gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1); 81 85 mapoutconvertclass gboutconvert; 82 gboutconvert.setmapfile ( GSDL_GSDLHOME, "ugbk", 0xa1f5);86 gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5); 83 87 recpt.add_converter ("g", &gbinconvert, &gboutconvert); 84 88 … … 138 142 recpt.add_browser (&ahtmlbrowserclass); 139 143 140 // cout << "GRB 4" << endl;141 142 144 cgiwrapper (recpt, ""); 143 145 -
branches/corba/gsdl/src/recpt/corbaproto.h
r1068 r1074 34 34 35 35 class corbaproto : public recptproto { 36 protected: 36 private: 37 corbaiface_var getCorbaClient(); 38 protected: 37 39 collectservermapclass cservers; 38 40 corbaiface_var client; … … 40 42 CORBA::BOA_var boa; 41 43 CORBA::Object_var obj; 42 public:44 public: 43 45 virtual ~corbaproto() {} 44 46 corbaproto(); -
branches/corba/gsdl/src/recpt/corbaproto.mpp
r1068 r1074 2 2 * 3 3 * corbaproto.cpp -- 4 * Copyright (C) 1999The New Zealand Digital Library Project4 * Copyright (C) 2000 The New Zealand Digital Library Project 5 5 * 6 6 * A component of the Greenstone digital library software … … 158 158 fi ++; 159 159 } 160 160 161 // copy the MetadataInfo map 161 162 MetadataInfo_tmap::iterator mhere = here->metadata.begin(); … … 191 192 mi ++; 192 193 } 194 195 // Copy the classifier variables 196 corbaconv_text_t::getCorbatext(here->classifier_metadata_type, corbainfo[i].classifierMetadataType); 197 corbainfo[i].classifierMetadataOffset = here->classifier_metadata_offset; 193 198 194 199 // Get next Docinfo item … … 262 267 // doc.metadata 263 268 269 // convert metadata classifer information 270 corbaconv_text_t::setCorbatext(doc.classifier_metadata_type,corbainfo[i].classifierMetadataType); 271 doc.classifier_metadata_offset = corbainfo[i].classifierMetadataOffset; 272 264 273 docinfo.push_back(doc); 265 274 } … … 286 295 } 287 296 297 corbaiface_var corbaproto::getCorbaClient() 298 { 299 char *dummyv[1] = {""}; 300 int dummyc = 0; 301 // CORBA variables 302 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 303 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 304 305 // Get ref from "naming service" 306 ifstream in ("/tmp/account.objid"); 307 char ref[1000]; 308 in >> ref; 309 in.close (); 310 311 // startup corba 312 static CORBA::Object_var obj = orb->string_to_object (ref); 313 314 return corbaiface::_narrow( obj ); 315 } 316 288 317 289 318 // this configure will configure each of the collection servers … … 293 322 // created 294 323 295 // cout << "Corbaproto::Configure" << endl; 296 297 char *dummyv[1] = {""}; 298 int dummyc = 0; 299 // CORBA variables 300 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 301 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 302 303 // Get ref from "naming service" 304 ifstream in ("/tmp/account.objid"); 305 char ref[1000]; 306 in >> ref; 307 in.close (); 308 309 // startup corba 310 static CORBA::Object_var obj = orb->string_to_object (ref); 311 312 corbaiface_var lclient = corbaiface::_narrow( obj ); 313 324 // cout << "Corbaproto::Configure" << endl; 314 325 corbatext_t corbaKey; 315 326 corbatext_tarray corbaCfgline; 316 327 328 // get the corba client reference 329 corbaiface_var lclient = this->getCorbaClient(); 330 331 // convert all the requisite structures into their CORBA form 317 332 corbaconv_text_t::getCorbatext(key,corbaKey); 318 333 corbatext_arrayToCorbaArray(cfgline, &corbaCfgline); 319 334 335 // execute the corba transaction 320 336 lclient->configure(corbaKey, corbaCfgline); 321 337 } … … 323 339 // this init will configure and init each of the collection servers 324 340 bool corbaproto::init (ostream &logout) { 325 // cout << "Corbaproto::Init" << endl; 326 327 char *dummyv[1] = {""}; 328 int dummyc = 0; 329 // CORBA variables 330 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 331 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 332 333 // Get ref from "naming service" 334 ifstream in ("/tmp/account.objid"); 335 char ref[1000]; 336 in >> ref; 337 in.close (); 338 339 // startup corba 340 static CORBA::Object_var obj = orb->string_to_object (ref); 341 342 corbaiface_var lclient = corbaiface::_narrow( obj ); 343 341 // cout << "Corbaproto::Init" << endl; 342 343 // get the corba client reference 344 corbaiface_var lclient = this->getCorbaClient(); 345 346 // execute the corba transaction 344 347 return lclient->init(); 345 348 } … … 353 356 ostream &/*logout*/) { 354 357 355 //cout << "Corbaproto::Collection list" << endl;358 cout << "Corbaproto::Collection list" << endl; 356 359 357 360 corbatext_tarray corba_collist; 358 corbatext_t collection;359 361 text_tarray tcollist; 360 362 361 /* collist.erase(collist.begin(),collist.end()); 362 err = noError; 363 364 collectservermapclass::iterator here = cservers.begin(); 365 collectservermapclass::iterator end = cservers.end(); 366 while (here != end) { 367 assert ((*here).second.c != NULL); 368 if ((*here).second.c != NULL) { 369 collist.push_back ((*here).second.c->get_collection_name()); 370 } 371 here++; 372 } 373 */ 374 char *dummyv[1] = {""}; 375 int dummyc = 0; 376 // CORBA variables 377 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 378 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 379 380 // Get ref from "naming service" 381 ifstream in ("/tmp/account.objid"); 382 char ref[1000]; 383 in >> ref; 384 in.close (); 385 386 // startup corba 387 static CORBA::Object_var obj = orb->string_to_object (ref); 388 389 corbaiface_var lclient = corbaiface::_narrow( obj ); 390 363 // get the corba client reference 364 corbaiface_var lclient = this->getCorbaClient(); 365 366 // execute the corba transaction 391 367 lclient->collectionList(corba_collist); 392 368 369 // convert the response back to normal form 393 370 corbatext_corbaArrayToArray(corba_collist, &tcollist); 394 371 collist = tcollist; … … 399 376 void corbaproto::has_collection (const text_t &collection, bool &hascollection, 400 377 comerror_t &err, ostream &/*logout*/) { 401 // cout << "Corbaproto::Has collection" << endl; 402 403 /* hascollection = (cservers.getcollectserver(collection) != NULL); 404 err = noError; 405 return;*/ 406 407 char *dummyv[1] = {""}; 408 int dummyc = 0; 409 corbatext_t_var corbaCollectPtr; 378 // cout << "Corbaproto::Has collection" << endl; 379 410 380 corbatext_t corbaCollection; 411 381 corbaComError corbaError; 412 382 CORBA::Boolean corbaHas; 413 383 414 // CORBA variables 415 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 416 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 417 418 // Get ref from "naming service" 419 ifstream in ("/tmp/account.objid"); 420 char ref[1000]; 421 in >> ref; 422 in.close (); 423 424 // startup corba 425 static CORBA::Object_var obj = orb->string_to_object (ref); 426 427 corbaiface_var lclient = corbaiface::_narrow( obj ); 428 429 // corbaCollectPtr = &corbaCollection; 430 //corbatext_corbatext(collection, corbaCollectPtr); 384 // get the corba client reference 385 corbaiface_var lclient = this->getCorbaClient(); 386 387 // convert all the requisite structures into their CORBA form 431 388 corbaconv_text_t::getCorbatext(collection,corbaCollection); 432 389 390 // execute the corba transaction 433 391 lclient->hasCollection(corbaCollection, corbaHas, corbaError); 434 392 393 // convert the response back to normal form 435 394 hascollection = (corbaHas != 0); 436 395 err = noError; 437 438 396 } 439 397 … … 442 400 // cout << "Corbaproto::Ping" << endl; 443 401 444 char *dummyv[1] = {""};445 int dummyc = 0;446 // CORBA variables447 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" );448 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" );449 450 // Get ref from "naming service"451 ifstream in ("/tmp/account.objid");452 char ref[1000];453 in >> ref;454 in.close ();455 456 // startup corba457 static CORBA::Object_var obj = orb->string_to_object (ref);458 459 corbaiface_var lclient = corbaiface::_narrow( obj );460 461 402 corbatext_t corbaCollect; 462 403 corbaComError corbaError; 463 404 bool success; 464 405 406 // get the corba client reference 407 corbaiface_var lclient = this->getCorbaClient(); 408 409 // convert all the requisite structures into their CORBA form 465 410 corbaconv_text_t::getCorbatext(collection,corbaCollect); 411 412 // execute the corba transaction 466 413 success = lclient->ping(corbaCollect, corbaError); 467 414 468 wassuccess = success; 469 /* 470 wassuccess = (cservers.getcollectserver(collection) != NULL); 471 err = noError; 472 */ 415 // convert the response back to normal form 416 wassuccess = (success != 0); 473 417 } 474 418 … … 478 422 // cout << "Corbaproto::Collectinfo" << endl; 479 423 480 char *dummyv[1] = {""};481 int dummyc = 0;482 483 // CORBA variables484 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" );485 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" );486 487 // Get ref from "naming service"488 ifstream in ("/tmp/account.objid");489 char ref[1000];490 in >> ref;491 in.close ();492 493 // startup corba494 static CORBA::Object_var obj = orb->string_to_object (ref);495 496 corbaiface_var lclient = corbaiface::_narrow( obj );497 498 424 corbatext_t corbaCollection; 499 425 corbaComError corbaError; 500 426 corbaColInfoResponse corbaCollectInfo; 501 427 428 // get the corba client reference 429 corbaiface_var lclient = this->getCorbaClient(); 430 431 // convert all the requisite structures into their CORBA form 502 432 corbaconv_text_t::getCorbatext(collection,corbaCollection); 433 434 // execute the corba transaction 503 435 lclient->getCollectInfo(corbaCollection, corbaCollectInfo, corbaError); 504 436 437 // convert the response back to normal form 505 438 collectinfo.isPublic = corbaCollectInfo.isPublic; 506 439 collectinfo.isBeta = corbaCollectInfo.isBeta; 507 440 collectinfo.buildDate = corbaCollectInfo.buildDate; 441 corbatext_corbaArrayToArray(corbaCollectInfo.ccsCols, &collectinfo.ccsCols); 508 442 corbatext_corbaArrayToArray(corbaCollectInfo.languages, &collectinfo.languages); 509 443 collectinfo.numDocs = corbaCollectInfo.numDocs; … … 516 450 517 451 err = (comerror_t) corbaError; 518 /*519 collectserver *cserver = cservers.getcollectserver (collection);520 if (cserver != NULL) cserver->get_collectinfo (collectinfo, err, logout);521 else err = protocolError;522 */523 452 } 524 453 … … 529 458 // cout << "Corbaproto::Filterinfo" << endl; 530 459 531 char *dummyv[1] = {""};532 int dummyc = 0;533 // CORBA variables534 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" );535 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" );536 537 // Get ref from "naming service"538 ifstream in ("/tmp/account.objid");539 char ref[1000];540 in >> ref;541 in.close ();542 543 // startup corba544 static CORBA::Object_var obj = orb->string_to_object (ref);545 546 corbaiface_var lclient = corbaiface::_narrow( obj );547 548 460 corbatext_t corbaCollection; 549 461 corbatext_tset corbaResponse; 550 462 corbaComError corbaError; 551 463 464 // get the corba client reference 465 corbaiface_var lclient = this->getCorbaClient(); 466 467 // convert all the requisite structures into their CORBA form 552 468 corbaconv_text_t::getCorbatext(collection,corbaCollection); 553 469 470 // execute the corba transaction 554 471 lclient->getFilterInfo(corbaCollection, corbaResponse, corbaError); 555 472 473 // convert the response back to normal form 556 474 corbatext_corbaArrayToSet(corbaResponse, &response.filterNames); 557 475 558 476 err = (comerror_t) corbaError; 559 560 /*561 collectserver *cserver = cservers.getcollectserver (collection);562 if (cserver != NULL) cserver->get_filterinfo (response, err, logout);563 else err = protocolError;564 */565 477 } 566 478 … … 570 482 comerror_t &err, ostream &logout) { 571 483 // cout << "Corbaproto::Filteroptions" << endl; 572 573 char *dummyv[1] = {""};574 int dummyc = 0;575 // CORBA variables576 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" );577 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" );578 579 // Get ref from "naming service"580 ifstream in ("/tmp/account.objid");581 char ref[1000];582 in >> ref;583 in.close ();584 585 // startup corba586 static CORBA::Object_var obj = orb->string_to_object (ref);587 588 corbaiface_var lclient = corbaiface::_narrow( obj );589 484 590 485 corbatext_t corbaCollection; … … 596 491 FilterOption_t *option; 597 492 493 // get the corba client reference 494 corbaiface_var lclient = this->getCorbaClient(); 495 496 // convert all the requisite structures into their CORBA form 598 497 corbaconv_text_t::getCorbatext(collection,corbaCollection); 599 498 corbaconv_text_t::getCorbatext(request.filterName,filterName); 600 499 500 // execute the corba transaction 601 501 lclient->getFilterOptions(corbaCollection, filterName, corbaResponse, corbaError); 602 502 503 // convert the response back to normal form 603 504 for (i = 0; i < corbaResponse.names.length(); i ++) 604 505 { … … 616 517 617 518 err = (comerror_t) corbaError; 618 /*619 collectserver *cserver = cservers.getcollectserver (collection);620 if (cserver != NULL) cserver->get_filteroptions (request, response, err, logout);621 else err = protocolError;622 */623 519 } 624 520 … … 631 527 corbaFilterRequest corbaRequest; 632 528 corbaFilterResponse corbaResponse; 633 634 char *dummyv[1] = {""};635 int dummyc = 0;636 corbatext_t_var corbaCollectPtr;637 529 corbatext_t corbaCollection; 638 530 corbaComError corbaError; 639 531 640 // CORBA variables 641 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" ); 642 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" ); 643 644 // Get ref from "naming service" 645 ifstream in ("/tmp/account.objid"); 646 char ref[1000]; 647 in >> ref; 648 in.close (); 649 650 // startup corba 651 static CORBA::Object_var obj = orb->string_to_object (ref); 652 653 corbaiface_var lclient = corbaiface::_narrow( obj ); 654 655 corbaconv_text_t::fillUsString(collection,&corbaCollection.text); 656 657 corbaconv_text_t::fillUsString(request.filterName,&corbaRequest.filter.text); 532 // get the corba client reference 533 corbaiface_var lclient = this->getCorbaClient(); 534 535 // convert all the requisite structures into their CORBA form 536 corbaconv_text_t::getCorbatext(collection,corbaCollection); 537 corbaconv_text_t::getCorbatext(request.filterName,corbaRequest.filter); 658 538 corbatext_optionValueArrayToCorba(request.filterOptions, corbaRequest.filterOptions); 659 539 corbatext_arrayToCorbaArray(request.docSet, &corbaRequest.docSet); … … 667 547 corbaresponse_resultDocInfoToCorba(response.docInfo, corbaResponse.docInfo); 668 548 549 // execute the corba transaction 669 550 lclient->filter (corbaCollection, corbaRequest, corbaResponse, corbaError); 670 551 552 // convert the response back to normal form 671 553 response.numDocs = corbaResponse.numDocs; 672 554 response.isApprox = corbaResponse.isApprox; … … 674 556 675 557 err = (comerror_t) corbaError; 676 /*677 collectserver *cserver = cservers.getcollectserver (collection);678 if (cserver != NULL) cserver->filter (request, response, err, logout);679 else err = protocolError;680 */681 558 // cout << "Corbaproto::Filter" << endl; 682 559 … … 689 566 // cout << "Corbaproto::Get Document" << endl; 690 567 691 /* collectserver *cserver = cservers.getcollectserver (collection);692 if (cserver != NULL) cserver->get_document (request, response, err, logout);693 else err = protocolError;694 */695 696 char *dummyv[1] = {""};697 int dummyc = 0;698 699 // CORBA variables700 static CORBA::ORB_var orb = CORBA::ORB_init( dummyc , dummyv, "mico-local-orb" );701 static CORBA::BOA_var boa = orb->BOA_init( dummyc , dummyv, "mico-local-boa" );702 703 // Get ref from "naming service"704 ifstream in ("/tmp/account.objid");705 char ref[1000];706 in >> ref;707 in.close ();708 709 // startup corba710 static CORBA::Object_var obj = orb->string_to_object (ref);711 712 corbaiface_var lclient = corbaiface::_narrow( obj );713 714 568 corbatext_t corbaCollect; 715 569 corbaDocRequest corbaRequest; … … 717 571 corbaComError corbaError; 718 572 573 // get the corba client reference 574 corbaiface_var lclient = this->getCorbaClient(); 575 576 // convert all the requisite structures into their CORBA form 719 577 corbaconv_text_t::getCorbatext(collection,corbaCollect); 720 578 corbaconv_text_t::getCorbatext(request.OID,corbaRequest.OID); … … 722 580 corbaconv_text_t::getCorbatext(request.docFormat,corbaRequest.docFormat); 723 581 582 // execute the corba transaction 724 583 lclient->getDocument(corbaCollect, corbaRequest, corbaResponse, corbaError); 584 585 // convert the response back to normal form 725 586 corbaconv_text_t::setCorbatext(response.doc,corbaResponse.doc); 726 587 727 588 err = (comerror_t) corbaError; 728 589 } 590 -
branches/corba/gsdl/src/recpt/recptconfig.cpp
r1067 r1074 28 28 /* 29 29 $Log$ 30 Revision 1.6.2.2 2000/04/06 11:11:40 cs025 31 Corba improvements; tidied client initialisation in corbaproto and also 32 added a number of changes to the main trunk which somehow had not made 33 it into the corba branch via update before its instantiation. 34 35 Also the dated use of the GSDL_GSDLHOME macro was removed, at the expense 36 of some particularly poor code in corbaserver where log file creation is 37 now nowhere near so elegant. 38 30 39 Revision 1.6.2.1 2000/04/04 15:02:38 cs025 31 40 Corba first commit … … 134 143 } 135 144 confin.close (); 136 137 cout << "GRB: " << maxrequests << endl;138 145 139 146 return true;
Note:
See TracChangeset
for help on using the changeset viewer.