Changeset 27095

Timestamp:

2013-03-19T12:58:28+13:00 (11 years ago)

Author:

ak19

Message:

Tidied up previous commit

File:

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

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

@@ -112 +112 @@
   text_t &arg_c = args["c"];
 
-  // For some reason, setting the _httpdomain_ macro only works when its package name is specified as Global
-  // Doesn't work if package name is set as rssfeed, even though etc/main.cfg refers to new rss.dm containing a package by that name
   
   // Before resolving the _httpdomain_ macro
@@ -119 +117 @@
   // E.g. user could have defined it in package Global of zextra.dm
   // If none found, try to get it from the cgiargs hostname= (set using javascript), 
-  // and set as macro for package Rss.
-  
-  if(disp.havemacro("Global", "httpdomain") == 0) { // checks rss(feed) and Global packages and if not found
+  // and set as macro for the desired package (e.g. package rss). Setting httpdomain in package Global.
+  // If the httpdomain macro needs to be in package rss, then need to mention this macro as 
+  // "_rss:httpdomain_" not "_httpdomain_" throughout rss-items.
+  // If ever adding a custom macro file like rss.dm that mentions the package, need to list rss.dm in etc/main.cfg
+
+  if(disp.havemacro("Global", "httpdomain") == 0) { // if using rss package, willcheck rss and Global packages in order. And if not found:
     
     if(!args["hostname"].empty()) {
-      disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]); //disp.setmacro("httpdomain", "Global", args["hostname"]);
+      disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]);
     } 
     else { // we shouldn't have to get here