Changeset 24959 for main/trunk/greenstone2

Timestamp:

2012-01-20T20:48:26+13:00 (12 years ago)

Author:

ak19

Message:

Second commit to do with Greenstone's support for RSS. Has been tested on Linux, and works if zextra.dm and base.dm are setup properly and if the rss-items.rdf file generated by the update to BasePlugout is moved to the index folder. Modified Dr Bainbridge's code to make the way that rssaction.cpp accesses the rss-items.rdf file independent of where the GS server is located, by adding a new method to get the rss-items.rdf file's contents to the recptproto protocol class and implementing it in nullproto. The method is also mirrored in corba/corbaproto, however compilation with corba fails in a part of the code that I've not modified.

Location:

main/trunk/greenstone2/runtime-src/src

Files:

• corba/corbaServer.mpp (modified) (1 diff)
• corba/corbaproto.h (modified) (1 diff)
• corba/corbaproto.mpp (modified) (1 diff)
• protocol/nullproto.cpp (modified) (2 diffs)
• protocol/nullproto.h (modified) (1 diff)
• protocol/recptproto.cpp (modified) (1 diff)
• protocol/recptproto.h (modified) (1 diff)
• recpt/rssaction.cpp (modified) (2 diffs)
• recpt/rssaction.h (modified) (1 diff)

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

@@ -397 +397 @@
   }
 
+  void getRssItems (const struct corbatext_t &corbaCollect,
+          const struct corbatext_t &corbaGsdlHome,
+          const struct corbatext_t &corbaRssItems,
+          enum corbaComError &corbaError)
+  {   
+    text_t collection;
+    text_t gsdlhome;
+    text_t rss_items;
+    comerror_t error = noError;
+    ofstream logout;
+
+    this->openLogfile("/etc/corbaout.txt", logout);
+
+    corbaconv_text_t::setCorbatext(collection,corbaCollect);
+    corbaconv_text_t::setCorbatext(gsdlhome,corbaGsdlHome);
+
+    // do actual operation
+    protocol->get_rss_items(collection, gsdlhome, rss_items, error, logout);
+    corbaconv_text_t::getCorbatext(rss_items,corbaRssItems);
+
+    // decode response
+    corbaError = (corbaComError) error;
+
+    logout.close();
+  }
+
   void collectionList(corbatext_tarray &corbalist, corbaComError &error)
   {

main/trunk/greenstone2/runtime-src/src/corba/corbaproto.h

@@ -86 +86 @@
               InfoFilterOptionsResponse_t &response, 
               comerror_t &err, ostream &logout);
+
+  // returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+  void get_rss_items (const text_t &collection, 
+              const text_t &gsdlhome, 
+              text_t &rss_items, 
+              comerror_t &err, 
+              ostream &logout);
+
   void filter (const text_t &collection,
            FilterRequest_t &request,

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

@@ -673 +673 @@
 }
 
+// returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+void corbaproto::get_rss_items (const text_t &collection, 
+                const text_t &gsdlhome, 
+                text_t &rss_items, 
+                comerror_t &err, 
+                ostream &logout) {
+
+  corbatext_t     corbaCollection;
+  corbatext_t     corbaGsdlHome;
+  corbatext_t     corbaRssItems;
+  corbaComError   corbaError = corbaNoError;
+
+  // convert all the requisite structures into their CORBA form
+  corbaconv_text_t::getCorbatext(collection,corbaCollection);
+  corbaconv_text_t::getCorbatext(collection,corbaGsdlHome);
+  corbaconv_text_t::getCorbatext(collection,corbaRssItems);
+
+  // get the corba client reference
+  // corbaiface_var lclient = this->getCorbaClient(); // ****
+  corbaiface_var lclient = client;
+
+  // execute the corba transaction
+  lclient->get_rss_items (corbaCollection, corbaGsdlHome, corbaRssItems, corbaError);
+
+  // convert the response back to normal form
+  rss_items = corbaRssItems;
+
+  //  text_t rss_filename = filename_cat(gsdlhome,"collect",collection,"index","rss-items.rdf");
+  //if (!read_file(rss_filename,rss_items)) { // read contents of file rss_filename into the string rss_items
+  //  err = protocolError; // else an error occurred
+  //}
+}
 
 void corbaproto::filter (const text_t &collection,

main/trunk/greenstone2/runtime-src/src/protocol/nullproto.cpp

@@ -30 +30 @@
 #include "browsefilter.h"
 
+#include "fileutil.h"
+// for read_file
 
 nullproto::nullproto() {
@@ -134 +136 @@
 }
 
+// returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+void nullproto::get_rss_items (const text_t &collection, 
+                const text_t &gsdlhome, 
+                text_t &rss_items, 
+                comerror_t &err, 
+                ostream &logout) {
+
+  text_t rss_filename = filename_cat(gsdlhome,"collect",collection,"index","rss-items.rdf");
+  // read contents of file rss_filename into the string rss_items
+  if (read_file(rss_filename,rss_items)) { 
+    err = noError;
+  } else {
+    err = protocolError;
+  }
+}
+
 void nullproto::filter (const text_t &collection,
             FilterRequest_t &request,

main/trunk/greenstone2/runtime-src/src/protocol/nullproto.h

@@ -81 +81 @@
               InfoFilterOptionsResponse_t &response, 
               comerror_t &err, ostream &logout);
+
+  // returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+  void get_rss_items (const text_t &collection, 
+              const text_t &gsdlhome, 
+              text_t &rss_items, 
+              comerror_t &err, 
+              ostream &logout);
+
   void filter (const text_t &collection,
            FilterRequest_t &request,

main/trunk/greenstone2/runtime-src/src/protocol/recptproto.cpp

@@ -113 +113 @@
 }
 
+// returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+void recptproto::get_rss_items (const text_t &/*collection*/,
+                const text_t &/*gsdlhome*/,
+                text_t &/*rss_items*/,
+                comerror_t &err,
+                ostream &/*logout*/) {
+  err = protocolError;
+}
+
 // filters (search or browse) a result set
 void recptproto::filter (const text_t &/*collection*/,

main/trunk/greenstone2/runtime-src/src/protocol/recptproto.h

@@ -116 +116 @@
                   InfoFilterOptionsResponse_t &response, 
                   comerror_t &err, ostream &logout);
+
+  // returns the contents of a collection's rss-items.rdf file (generated by BasePlugout)
+  virtual void get_rss_items (const text_t &collection,
+                  const text_t &gsdlhome,
+                  text_t &rss_items,
+                  comerror_t &err,
+                  ostream &logout);
 
   // filters (search or browse) a result set and returns information

main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp

@@ -84 +84 @@
 }
 
-void rssaction::generate_rss_content(text_t& rss_filename, displayclass &disp, 
+void rssaction::generate_rss_content(text_t& rss_items, displayclass &disp, 
                      outconvertclass &outconvert, ostream &textout, 
                      ostream &logout)
 {
-  text_t rss_items;
-
-  if (read_file(rss_filename,rss_items)) {
-    textout << outconvert << disp << rss_items;
-  }
-
-
+  textout << outconvert << disp << rss_items;
 }
 
@@ -108 +102 @@
 
 
-
-
 bool rssaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
                 browsermapclass * /*browsers*/, displayclass& disp, 
                 outconvertclass &outconvert, ostream &textout, 
                 ostream &logout) {
-  //bool wassuccess = false;
-  //comerror_t err;
- 
+  text_t rss_items;
+  bool success = false;
+  comerror_t err; 
 
-  /*
-  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
-  if (!args["c"].empty() && (collectproto != NULL)) {
-    collectproto->ping (args["c"], wassuccess, err, logout);
-    if (err != noError) wassuccess = false; // a communication error
+  text_t &arg_c = args["c"];
+
+
+  if (!args["c"].empty()) {
+    recptproto* collectproto = protos->getrecptproto (arg_c, logout);    
+    if (collectproto != NULL) {
+      collectproto->get_rss_items (arg_c, gsdlhome, rss_items, err, logout);
+      if (err == noError) success = true; 
+      // else a communication error    
+    }
   }
-  */
-
-  text_t rss_filename = filename_cat(gsdlhome,"collect",args["c"],"index","rss-items.rdf");
 
   generate_rss_header(disp,outconvert,textout,logout);
-  generate_rss_content(rss_filename,disp,outconvert,textout,logout);
+  if(success) {
+    generate_rss_content(rss_items,disp,outconvert,textout,logout);
+  }
   generate_rss_footer(disp,outconvert,textout,logout);
 
-  return true;
+  return success;
 };
 

main/trunk/greenstone2/runtime-src/src/recpt/rssaction.h

@@ -54 +54 @@
                outconvertclass &outconvert, ostream &textout, 
                ostream &logout);
-  void generate_rss_content(text_t& rss_filename, displayclass &disp, 
+  void generate_rss_content(text_t& rss_items, displayclass &disp, 
           outconvertclass &outconvert, ostream &textout, 
           ostream &logout);