Changeset 28997 for main

Timestamp:

2014-04-28T14:36:29+12:00 (10 years ago)

Author:

ak19

Message:

Added an is_gs3 subroutine to util.pm and this is now used by BasePlugout when generating the rss file appropriate to the GS version

Location:

main/trunk/greenstone2/perllib

Files:

• plugouts/BasePlugout.pm (modified) (1 diff)
• util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -918 +918 @@
         my $rss_entry = "<item>\n";
         $rss_entry   .= "   <title>$dc_title</title>\n";
-    if($ENV{'GSDL3SRCHOME'}) {
+    if(&util::is_gs3()) {
         $rss_entry   .= "   <link>_httpdomain__httpcollection_/document/$oid</link>\n";
     } else {

main/trunk/greenstone2/perllib/util.pm

@@ -1113 +1113 @@
     }
     return $ENV{'GSDLOS'}.$gsdlarch;
+}
+
+# returns 1 if this (GS server) is a GS3 installation, returns 0 if it's GS2.
+sub is_gs3() {
+    if($ENV{'GSDL3SRCHOME'}) {
+    return 1;
+    } else {
+    return 0;
+    }
 }