Changeset 32586 for main/trunk/greenstone2/perllib/plugins

Timestamp:

2018-11-08T18:54:56+13:00 (5 years ago)

Author:

ak19

Message:

Renaming 'site_name' parameter used by GS SQL Plugout and Plugin to 'site' for consistency with existing uses of site.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• GreenstoneSQLPlugin.pm (modified) (4 diffs)
• PrintInfo.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -161 +161 @@
     'type' => "enum",
     'list' => $rollback_on_cancel_list,
-    'deft' => "true", # TODO Q: what's the better default? If "true", any memory concerns?
+    'deft' => "false", # TODO Q: what's the better default? If "true", any memory concerns?
     'reqd' => "no",
     'hiddengli' => "no"},
@@ -236 +236 @@
 
     ####################
-#    print "@@@ SITE NAME: ". $self->{'site_name'} . "\n" if defined $self->{'site_name'};
+#    print "@@@ SITE NAME: ". $self->{'site'} . "\n" if defined $self->{'site'};
 #    print "@@@ COLL NAME: ". $ENV{'GSDLCOLLECTION'} . "\n";
 
@@ -270 +270 @@
     }
     
-    my $db_name = $self->{'site_name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
+    my $db_name = $self->{'site'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
 
     # Attempt to use the db, create it if it doesn't exist (but don't create the tables yet)
@@ -332 +332 @@
     print STDERR "   Building with removeold option set, so deleting current collection's tables if they exist\n" if($self->{'verbosity'});
     
-    # if we're in here, we'd already have run 'use database <site_name>;' during sub init()
+    # if we're in here, we'd already have run 'use database <site>;' during sub init()
     # so we can go ahead and delete the collection's tables
     my $gs_sql = $self->{'gs_sql'};

main/trunk/greenstone2/perllib/plugins/PrintInfo.pm

@@ -53 +53 @@
       'reqd' => "no",
       'hiddengli' => "yes" },
-    { 'name' => "site_name",
-      'desc' => "{PrintInfo.site_name}",
+    { 'name' => "site",
+      'desc' => "{PrintInfo.site}",
       'type' => "string",
       'reqd' => "no",
@@ -86 +86 @@
     # the args, just return the object. 
     # gsdlinfo must come before gs_version. both are set by plugin.pm
-    # The optional -site_name <site> (present only for GS3 and when not doing gsdlinfo),
+    # The optional -site <site-name> (present only for GS3 and when not doing gsdlinfo),
     # if it is there, also appears before gs_version and is also set by plugin.pm
     my $v=0;
     foreach my $strArg (@{$args})
     {
-    if($v eq "-site_name") {
-        $self->{'site_name'} = $strArg;
+    if($v eq "-site") {
+        $self->{'site'} = $strArg;
     }
     elsif($v eq "-gs_version") {
@@ -103 +103 @@
         #return bless $self, $class;
     }
-    elsif ($strArg eq "-gs_version" || $strArg eq "-site_name") {       
+    elsif ($strArg eq "-gs_version" || $strArg eq "-site") {        
         $v = $strArg;
     }