Changeset 24959 for main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp

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.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp (modified) (2 diffs)

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;
 };