Changeset 32540 for main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

Timestamp:

2018-10-25T19:35:32+13:00 (5 years ago)

Author:

ak19

Message:

Modified BasePlugout so that plugouts now take the site_name parameter, needed by GreenstoneSQLPlugout. Similar changes were made in the previous commit for plugins, where GreenstoneSQLPlugin needed to have access to site_name. In both cases, for GS2, the site_name (and hence SQL database name) is greenstone2.

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (2 diffs)

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

@@ -44 +44 @@
 $SIG{__WARN__} = sub {warn($_[0]) unless ($_[0] =~ /Subroutine\s+\S+\sredefined/)};
 
-my $arguments = [ 
+my $arguments = [
+        { 'name' => "site_name",
+      'desc' => "{BasPlugout.site_name}",
+      'type' => "string",
+      'reqd' => "no",
+      'hiddengli' => "yes" },
        { 'name' => "xslt_file", 
     'desc' => "{BasPlugout.xslt_file}",
@@ -135 +140 @@
     # the args, just return the object.
     #print STDERR "#### " . join(",", @${args}) . "\n\n";
+    my $v=0;
     foreach my $strArg (@{$args})
     {
-    if(defined $strArg && $strArg eq "-gsdlinfo")
-    {
-        $self->{"info_only"} = 1;
-        return bless $self, $class;
+    if(defined $strArg) {
+        if($strArg eq "-gsdlinfo")
+        {
+        $self->{"info_only"} = 1;
+        return bless $self, $class;
+        }       
+        elsif ($strArg eq "-site_name") {
+        $v = $strArg;
+        }
+        elsif($v eq "-site_name") {
+        $self->{'site_name'} = $strArg;
+        }
     }
     }