Changeset 25231 for main/trunk/greenstone2/runtime-src/src/corba/corbatext_t.mpp

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/corbatext_t.mpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/corba/corbatext_t.mpp

@@ -85 +85 @@
   ct->encoding = 0;
   cout << "C" << endl;
+
+  return 0;
 }
 
@@ -178 +180 @@
 }
 
+
+// map of metanames to array(lang, value). So each metaname[i] maps to array (lang, value).
+// Note that corbacollectionmeta_map is an array of pairs
+// each pair consists of (string, map)
+void corbatext_colmetamapToCorbaColmetamap(collectionmeta_map cm, corbatext_tcollectionmeta_map *ccm)
+{
+  collectionmeta_map::iterator here = cm.begin();
+  collectionmeta_map::iterator end  = cm.end();
+  unsigned int i = 0;
+
+  while (here != end)
+    {
+      ccm->length(i+1); // increase size of array of (name, tuples) pairs by 1 each time
+
+      // fill in the metaname field
+      // metaname is of type text_t, get the corbatext value for the text_t key
+      (*ccm)[i].name = *corbatext_corbatext((*here).first); // metaname is of type text_t
+
+      // fill in the tuples field
+      corbatext_mapToCorbaMap((*here).second, &((*ccm)[i].tuples));
+
+      here ++;
+      i ++;
+    }
+
+}
+
+void corbatext_corbaColmetamapToColmetamap(corbatext_tcollectionmeta_map ccm, collectionmeta_map &cm)
+{
+  unsigned int i;
+
+  for (i = 0; i < ccm.length(); i ++) 
+    {
+    // ccm is an array
+    // where each element is a pair of (name, tuples)
+
+    // 1. get the (corba_text_t) name and convert it to text_t
+    text_t* meta_name = new corbaconv_text_t(ccm[i].name);
+
+    corbatext_tmap corbameta_tuples = ccm[i].tuples;
+
+    text_tmap *tuples_map = new text_tmap();
+    corbatext_corbaMapToMap(ccm[i].tuples, *tuples_map);
+
+
+    cm.insert(make_pair(*meta_name,
+                *tuples_map));          
+    }
+}
+