- Timestamp:
- 2000-09-07T10:00:15+12:00 (24 years ago)
- Location:
- branches/corba/gsdl/lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/corba/gsdl/lib/corbaiface.h
r1074 r1513 138 138 corbatext_tmap format; 139 139 corbatext_tmap building; 140 corbatext_t httpdomain; 141 corbatext_t httpprefix; 140 142 corbatext_t receptionist; 141 143 }; … … 476 478 static bool _narrow_helper2( CORBA::Object_ptr obj ); 477 479 478 virtual CORBA::Boolean init () = 0;480 virtual CORBA::Boolean initialise() = 0; 479 481 virtual void configure( const corbatext_t& key, const corbatext_tarray& cfgline ) = 0; 480 482 virtual void collectionList( corbatext_tarray& collist ) = 0; … … 500 502 public: 501 503 virtual ~corbaiface_stub(); 502 CORBA::Boolean init ();504 CORBA::Boolean initialise(); 503 505 void configure( const corbatext_t& key, const corbatext_tarray& cfgline ); 504 506 void collectionList( corbatext_tarray& collist ); -
branches/corba/gsdl/lib/corbaiface.idl
r1074 r1513 57 57 corbatext_tmap format; 58 58 corbatext_tmap building; 59 corbatext_t httpdomain ; // Added 27/07/2000 60 corbatext_t httpprefix; // Added 27/07/2000 59 61 corbatext_t receptionist; 60 62 }; … … 197 199 interface corbaiface 198 200 { 199 boolean _init();201 boolean initialise(); 200 202 void configure(in corbatext_t key, in corbatext_tarray cfgline); 201 203 void collectionList(inout corbatext_tarray collist); -
branches/corba/gsdl/lib/corbaiface.mpp
r1074 r1513 292 292 format = ((corbaColInfoResponse&)_s).format; 293 293 building = ((corbaColInfoResponse&)_s).building; 294 httpdomain = ((corbaColInfoResponse&)_s).httpdomain; 295 httpprefix = ((corbaColInfoResponse&)_s).httpprefix; 294 296 receptionist = ((corbaColInfoResponse&)_s).receptionist; 295 297 } … … 314 316 format = ((corbaColInfoResponse&)_s).format; 315 317 building = ((corbaColInfoResponse&)_s).building; 318 httpdomain = ((corbaColInfoResponse&)_s).httpdomain; 319 httpprefix = ((corbaColInfoResponse&)_s).httpprefix; 316 320 receptionist = ((corbaColInfoResponse&)_s).receptionist; 317 321 return *this; … … 361 365 _marshaller_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->format ) && 362 366 _marshaller_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->building ) && 367 _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpdomain ) && 368 _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpprefix ) && 363 369 _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->receptionist ) && 364 370 dc.struct_end(); … … 380 386 _marshaller_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->format ); 381 387 _marshaller_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->building ); 388 _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpdomain ); 389 _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpprefix ); 382 390 _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->receptionist ); 383 391 ec.struct_end(); … … 1426 1434 } 1427 1435 1428 CORBA::Boolean corbaiface_stub::init ()1436 CORBA::Boolean corbaiface_stub::initialise() 1429 1437 { 1430 1438 CORBA::Boolean _res; 1431 1439 CORBA::StaticAny __res( CORBA::_stc_boolean, &_res ); 1432 1440 1433 CORBA::StaticRequest __req( this, "init " );1441 CORBA::StaticRequest __req( this, "initialise" ); 1434 1442 __req.set_result( &__res ); 1435 1443 … … 2125 2133 break; 2126 2134 case 11: 2135 if( strcmp( _req->op_name(), "initialise" ) == 0 ) { 2136 CORBA::Boolean _res; 2137 CORBA::StaticAny __res( CORBA::_stc_boolean, &_res ); 2138 _req->set_result( &__res ); 2139 2140 if( !_req->read_args() ) 2141 return true; 2142 2143 _res = initialise(); 2144 _req->write_results(); 2145 return true; 2146 } 2127 2147 if( strcmp( _req->op_name(), "getFilterInfo" ) == 0 ) { 2128 2148 corbatext_t collection; … … 2202 2222 2203 2223 getDocument( collection, request, response, error ); 2204 _req->write_results();2205 return true;2206 }2207 break;2208 case 16:2209 if( strcmp( _req->op_name(), "init" ) == 0 ) {2210 CORBA::Boolean _res;2211 CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );2212 _req->set_result( &__res );2213 2214 if( !_req->read_args() )2215 return true;2216 2217 _res = init();2218 2224 _req->write_results(); 2219 2225 return true; -
branches/corba/gsdl/lib/text_t.cpp
r1073 r1513 28 28 /* 29 29 $Log$ 30 Revision 1.15.2.3 2000/09/06 22:00:14 davidb 31 32 To correctly handle images using Corba the interface had to be changed 33 to additionaly store httpdomain and httpprefix. Extra code was also 34 added to text_t. 35 30 36 Revision 1.15.2.2 2000/04/05 10:19:38 syeates 31 37 added automatic conversion to allow text_t's to be <<'ed to ostreams … … 337 343 338 344 339 // general functions which work on text_t s345 // general functions which work on text_t's 340 346 341 347 // find a character within a range … … 360 366 } 361 367 return first; 368 } 369 370 text_t::iterator findword (text_t::iterator first, text_t::iterator last, 371 const text_t& word) 372 { 373 text_t::const_iterator word_begin = word.begin(); 374 text_t::const_iterator word_end = word.end(); 375 376 while (first != last) 377 { 378 text_t::iterator char_match = first; 379 text_t::const_iterator word_here = word_begin; 380 while (word_here!=word_end) 381 { 382 if (*char_match != *word_here) 383 { 384 break; 385 } 386 char_match++; 387 word_here++; 388 } 389 if (word_here==word_end) 390 { 391 return first; 392 } 393 first++; 394 } 395 return last; // get to here only if there is no match 362 396 } 363 397 -
branches/corba/gsdl/lib/text_t.h
r1073 r1513 217 217 218 218 219 // general functions which work on text_t s219 // general functions which work on text_t's 220 220 221 221 // find a character within a range … … 224 224 text_t::iterator findchar (text_t::iterator first, text_t::iterator last, 225 225 unsigned short c); 226 227 text_t::iterator findword (text_t::iterator first, text_t::iterator last, 228 const text_t& word); 226 229 227 230 // get a string up to the next delimiter (which is skipped)
Note:
See TracChangeset
for help on using the changeset viewer.