Changeset 25231 for main/trunk/greenstone2/runtime-src/src/corba/corbaiface.idl

Timestamp:

2012-03-16T21:38:01+13:00 (12 years ago)

Author:

ak19

Message:

Many changes to get corba working again ever since the addition of RSS support meant that the method get_rss_items needed to be mirrored in the corba code. The corba code was not compiling then and it turned out we needed a later version of Mico's corba implementation (2.3.13 up from 2.3.5). Therefore the current commit not only corrects some errors in the recently added getRssItems() method but includes further changes: 1. namespaced use of iostream functions were required in some mpp files. 2. New types and member variables added to the corbaiface.idl interface file, to mirror the presence of equivalent variables in comtools.h which hadn't been ported over yet. (Such as the complex corba data type equivalent of collectionmetamap used in comtools.h.) This required (de)serialisation methods to be declared and implemented in corbatext_t.h and corbatext_t.mpp. The additional member variables for the corbaColInfoResponse in corbaiface.idl are now also unpacked in corbaproto.mpp along with the rest of the data structure. 3. Having changed from mico version 2.3.5 to 2.3.13 required code to changed to use POA instead of BOA. This also meant that skeleton files were no longer to be generated when running idl over corbaiface.idl. corbaserver inherits from a POA related object now instead of from the skeleton. 4. Makefile.in was updated to reflect these changes (absence of skeleton), includes a target to run IDL over the corbaiface.idl file to generate the necessary helper files, and corrects earlier oversights in updating the corba makefile with the rest of the changes made over time to runtime-src.

File:

• main/trunk/greenstone2/runtime-src/src/corba/corbaiface.idl (modified) (5 diffs)

main/trunk/greenstone2/runtime-src/src/corba/corbaiface.idl

@@ -23 +23 @@
   corbatext_tarray values;
 };
+
+// colserver/comtypes.h defines collectionmeta_map of collectionmeta 
+// as (sorted) tuples of: metadata name -> lang -> value
+// However, the C++ definition is: 
+// typedef map<text_t, text_tmap, lttext_t> collectionmeta_map;
+// Where lttext_t is defined to be a sorting function in text_t.h
+// Each collectionmeta name maps to one or more (lang,value) pairs. 
+// The struct below defines the entry for one collectionmeta name.
+struct corbatext_tcollectionmeta {
+  corbatext_t name;
+  corbatext_tmap tuples;
+  //corbatext_tarray languages;
+  //corbatext_tarray values;
+};
+
+typedef sequence<corbatext_tcollectionmeta> corbatext_tcollectionmeta_map;
+
 
 // standard error values
@@ -47 +64 @@
 struct corbaColInfoResponse
 {
-  boolean       useBook;
-  corbaShortColInfo shoftInfo;
+  corbaShortColInfo shortInfo;
+  boolean           useBook;
   boolean           isPublic;
   boolean           isBeta;
+
   unsigned long     buildDate;
   corbatext_tarray  ccsCols;        // Added 05/04/2000
@@ -57 +75 @@
   unsigned long     numWords;
   unsigned long     numBytes;
-  corbatext_tmap    collectionMeta;
+  corbatext_tcollectionmeta_map    collectionMeta; //corbatext_tmap    collectionMeta;
   corbatext_tmap    format;
   corbatext_tmap    building;
@@ -63 +81 @@
   corbatext_t       httpprefix;     // Added 27/07/2000
   corbatext_t       receptionist;
+
+  // The following member fields were added 14/03/2011 to 
+  // match up with ColInfoResponse_t definition in comtypes.h
+
+  boolean isSegmented;
+  boolean isCollectGroup; // used to group a set of collections as one item on the home page
+  unsigned long ccsOptions; // uses CCS #defines from above
+  unsigned long stemIndexes; // uses SI #defines from above
+  unsigned long numSections; // 0 if not known
+  corbatext_tcollectionmeta_map  collection_macros; // for collectionmacro config directive (> gsdl 2.53)
+  corbatext_t         buildType;           // 'mg' or 'mgpp' or 'lucene'
+  corbatext_t         infodbType;          // 'gdbm', 'sqlite', etc.
+  corbatext_t         authenticate;        // 'document' or 'collection'
+  corbatext_t         auth_group;          // 'mygroup' 'yourgroup'
+  corbatext_tmap      public_documents;    // the acl to allow access to listed documents
+  corbatext_tmap      private_documents;   // the acl to disallow access to listed documents
+  corbatext_tmap      dynamic_classifiers;
+  corbatext_t         earliestDatestamp;   // For OAIserver validation. Time since linux Epoch, expressed as (long) integer value in string form
+
 };
 
@@ -227 +264 @@
                    inout corbaFilterResponse response,
                    inout corbaComError error);
-  void      get_rss_items (const text_t &collection, 
-               const text_t &gsdlhome, 
-               text_t &rss_items, 
-               comerror_t &err, 
-               ostream &logout);
-};
-
-};
+
+  void      getRssItems (in corbatext_t collection, 
+             in corbatext_t gsdlhome, 
+             inout corbatext_t rss_items, 
+             inout corbaComError error);
+
+};
+
+};