Changeset 1513

Timestamp:

2000-09-07T10:00:15+12:00 (24 years ago)

Author:

davidb

Message:

To correctly handle images using Corba the interface had to be changed
to additionaly store httpdomain and httpprefix. Extra code was also
added to text_t.

Location:

branches/corba/gsdl/lib

Files:

• corbaiface.h (modified) (3 diffs)
• corbaiface.idl (modified) (2 diffs)
• corbaiface.mpp (modified) (7 diffs)
• text_t.cpp (modified) (3 diffs)
• text_t.h (modified) (2 diffs)

branches/corba/gsdl/lib/corbaiface.h

@@ -138 +138 @@
   corbatext_tmap format;
   corbatext_tmap building;
+  corbatext_t httpdomain;
+  corbatext_t httpprefix;
   corbatext_t receptionist;
 };
@@ -476 +478 @@
     static bool _narrow_helper2( CORBA::Object_ptr obj );
 
-    virtual CORBA::Boolean init() = 0;
+    virtual CORBA::Boolean initialise() = 0;
     virtual void configure( const corbatext_t& key, const corbatext_tarray& cfgline ) = 0;
     virtual void collectionList( corbatext_tarray& collist ) = 0;
@@ -500 +502 @@
   public:
     virtual ~corbaiface_stub();
-    CORBA::Boolean init();
+    CORBA::Boolean initialise();
     void configure( const corbatext_t& key, const corbatext_tarray& cfgline );
     void collectionList( corbatext_tarray& collist );

branches/corba/gsdl/lib/corbaiface.idl

@@ -57 +57 @@
   corbatext_tmap    format;
   corbatext_tmap    building;
+  corbatext_t       httpdomain ;    // Added 27/07/2000 
+  corbatext_t       httpprefix;     // Added 27/07/2000 
   corbatext_t       receptionist;
 };
@@ -197 +199 @@
 interface corbaiface
 {
-  boolean   _init();
+  boolean   initialise();
   void      configure(in corbatext_t key, in corbatext_tarray cfgline);
   void      collectionList(inout corbatext_tarray collist);

branches/corba/gsdl/lib/corbaiface.mpp

@@ -292 +292 @@
   format = ((corbaColInfoResponse&)_s).format;
   building = ((corbaColInfoResponse&)_s).building;
+  httpdomain = ((corbaColInfoResponse&)_s).httpdomain;
+  httpprefix = ((corbaColInfoResponse&)_s).httpprefix;
   receptionist = ((corbaColInfoResponse&)_s).receptionist;
 }
@@ -314 +316 @@
   format = ((corbaColInfoResponse&)_s).format;
   building = ((corbaColInfoResponse&)_s).building;
+  httpdomain = ((corbaColInfoResponse&)_s).httpdomain;
+  httpprefix = ((corbaColInfoResponse&)_s).httpprefix;
   receptionist = ((corbaColInfoResponse&)_s).receptionist;
   return *this;
@@ -361 +365 @@
     _marshaller_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->format ) &&
     _marshaller_corbatext_tmap->demarshal( dc, &((_MICO_T*)v)->building ) &&
+    _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpdomain ) &&
+    _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->httpprefix ) &&
     _marshaller_corbatext_t->demarshal( dc, &((_MICO_T*)v)->receptionist ) &&
     dc.struct_end();
@@ -380 +386 @@
   _marshaller_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->format );
   _marshaller_corbatext_tmap->marshal( ec, &((_MICO_T*)v)->building );
+  _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpdomain );
+  _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->httpprefix );
   _marshaller_corbatext_t->marshal( ec, &((_MICO_T*)v)->receptionist );
   ec.struct_end();
@@ -1426 +1434 @@
 }
 
-CORBA::Boolean corbaiface_stub::init()
+CORBA::Boolean corbaiface_stub::initialise()
 {
   CORBA::Boolean _res;
   CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
 
-  CORBA::StaticRequest __req( this, "init" );
+  CORBA::StaticRequest __req( this, "initialise" );
   __req.set_result( &__res );
 
@@ -2125 +2133 @@
       break;
     case 11:
+      if( strcmp( _req->op_name(), "initialise" ) == 0 ) {
+        CORBA::Boolean _res;
+        CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
+        _req->set_result( &__res );
+
+        if( !_req->read_args() )
+          return true;
+
+        _res = initialise();
+        _req->write_results();
+        return true;
+      }
       if( strcmp( _req->op_name(), "getFilterInfo" ) == 0 ) {
         corbatext_t collection;
@@ -2202 +2222 @@
 
         getDocument( collection, request, response, error );
-        _req->write_results();
-        return true;
-      }
-      break;
-    case 16:
-      if( strcmp( _req->op_name(), "init" ) == 0 ) {
-        CORBA::Boolean _res;
-        CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-        _req->set_result( &__res );
-
-        if( !_req->read_args() )
-          return true;
-
-        _res = init();
         _req->write_results();
         return true;

branches/corba/gsdl/lib/text_t.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.15.2.3  2000/09/06 22:00:14  davidb
+
+   To correctly handle images using Corba the interface had to be changed
+   to additionaly store httpdomain and httpprefix.  Extra code was also
+   added to text_t.
+
    Revision 1.15.2.2  2000/04/05 10:19:38  syeates
    added automatic conversion to allow text_t's to be <<'ed to ostreams
@@ -337 +343 @@
 
 
-// general functions which work on text_ts
+// general functions which work on text_t's
 
 // find a character within a range
@@ -360 +366 @@
     }
   return first;
+}
+
+text_t::iterator findword (text_t::iterator first, text_t::iterator last, 
+               const text_t& word)
+{
+  text_t::const_iterator word_begin = word.begin();
+  text_t::const_iterator word_end = word.end();
+
+  while (first != last)
+    {
+      text_t::iterator char_match = first;
+      text_t::const_iterator word_here = word_begin;
+      while (word_here!=word_end)
+    {
+      if (*char_match != *word_here)
+        {
+          break;
+        }
+      char_match++;
+      word_here++;
+    }
+      if (word_here==word_end)
+    {
+      return first;
+    }
+      first++;
+    }
+  return last; // get to here only if there is no match
 }
 

branches/corba/gsdl/lib/text_t.h

@@ -217 +217 @@
 
 
-// general functions which work on text_ts
+// general functions which work on text_t's
 
 // find a character within a range
@@ -224 +224 @@
 text_t::iterator findchar (text_t::iterator first, text_t::iterator last, 
                unsigned short c);
+
+text_t::iterator findword (text_t::iterator first, text_t::iterator last, 
+               const text_t& word);
 
 // get a string up to the next delimiter (which is skipped)