Changeset 27093 for main/trunk/greenstone2/runtime-src/src/recpt

Timestamp:

2013-03-18T21:06:22+13:00 (11 years ago)

Author:

ak19

Message:

httpdomain macro in rss items resolved in receptionist with primary preference given to what's in zextra.dm. At present, forced to use package Global in the code that sets the macro, since a new macro file, rss.dm, registered in etc/main.cfg and containing the package name rss(feed) wasn't getting through with the setmacro call.

File:

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

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

@@ -68 +68 @@
       << "<channel>\n"
       << "  <title>_collectionname_</title>\n"
-      << "  <link>_httppageabout_</link>\n"
+      << "  <link>_httpdomain__httppageabout_</link>\n"
       << "  <description>_collectionextra_</description>\n"
       << "  <language>_cgiargl_</language>\n"
@@ -79 +79 @@
       << "  <title>_collectionname_</title>\n"
       << "  <url>_iconcollection_</url>\n"
-      << "  <link>_httppageabout_</link>\n"
+      << "  <link>_httpdomain__httppageabout_</link>\n"
       << "  <description>_collectionextra_</description>\n"
       << "</image>\n";
@@ -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
+  // 1. Check if _httpdomain_ was defined by user in macros (packages rssfeed of rss.dm and Global). 
+  // 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
+    
+    if(!args["hostname"].empty()) {
+      disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]); //disp.setmacro("httpdomain", "Global", args["hostname"]);
+    } 
+    else { // we shouldn't have to get here
+      disp.setmacro("httpdomain", "Global", "http://localhost:8282"); // the default used in zextra.dm. (Could perhaps default this to localhost too)
+    }
+  }
+
 
   if (!args["c"].empty()) {