- Timestamp:
- 2018-11-08T18:54:56+13:00 (5 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/inexport.pm
r32563 r32586 680 680 push @$plugout,("-gzip_output") if ($gzip); 681 681 push @$plugout,("-output_handle",$out) if (defined $out); 682 push @$plugout,("-site _name",$self->{'site'}) if (defined $self->{'site'});682 push @$plugout,("-site",$self->{'site'}) if (defined $self->{'site'}); 683 683 684 684 push @$plugout,("-xslt_file",$xsltfile) if (defined $xsltfile && $xsltfile ne ""); -
main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm
r32584 r32586 161 161 'type' => "enum", 162 162 'list' => $rollback_on_cancel_list, 163 'deft' => " true", # TODO Q: what's the better default? If "true", any memory concerns?163 'deft' => "false", # TODO Q: what's the better default? If "true", any memory concerns? 164 164 'reqd' => "no", 165 165 'hiddengli' => "no"}, … … 236 236 237 237 #################### 238 # print "@@@ SITE NAME: ". $self->{'site _name'} . "\n" if defined $self->{'site_name'};238 # print "@@@ SITE NAME: ". $self->{'site'} . "\n" if defined $self->{'site'}; 239 239 # print "@@@ COLL NAME: ". $ENV{'GSDLCOLLECTION'} . "\n"; 240 240 … … 270 270 } 271 271 272 my $db_name = $self->{'site _name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2272 my $db_name = $self->{'site'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2 273 273 274 274 # 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'}); 333 333 334 # if we're in here, we'd already have run 'use database <site _name>;' during sub init()334 # if we're in here, we'd already have run 'use database <site>;' during sub init() 335 335 # so we can go ahead and delete the collection's tables 336 336 my $gs_sql = $self->{'gs_sql'}; -
main/trunk/greenstone2/perllib/plugins/PrintInfo.pm
r32539 r32586 53 53 'reqd' => "no", 54 54 'hiddengli' => "yes" }, 55 { 'name' => "site _name",56 'desc' => "{PrintInfo.site _name}",55 { 'name' => "site", 56 'desc' => "{PrintInfo.site}", 57 57 'type' => "string", 58 58 'reqd' => "no", … … 86 86 # the args, just return the object. 87 87 # gsdlinfo must come before gs_version. both are set by plugin.pm 88 # The optional -site _name <site> (present only for GS3 and when not doing gsdlinfo),88 # The optional -site <site-name> (present only for GS3 and when not doing gsdlinfo), 89 89 # if it is there, also appears before gs_version and is also set by plugin.pm 90 90 my $v=0; 91 91 foreach my $strArg (@{$args}) 92 92 { 93 if($v eq "-site _name") {94 $self->{'site _name'} = $strArg;93 if($v eq "-site") { 94 $self->{'site'} = $strArg; 95 95 } 96 96 elsif($v eq "-gs_version") { … … 103 103 #return bless $self, $class; 104 104 } 105 elsif ($strArg eq "-gs_version" || $strArg eq "-site _name") {105 elsif ($strArg eq "-gs_version" || $strArg eq "-site") { 106 106 $v = $strArg; 107 107 } -
main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm
r32564 r32586 45 45 46 46 my $arguments = [ 47 { 'name' => "site _name",48 'desc' => "{BasPlugout.site _name}",47 { 'name' => "site", 48 'desc' => "{BasPlugout.site}", 49 49 'type' => "string", 50 50 'reqd' => "no", … … 149 149 return bless $self, $class; 150 150 } 151 elsif ($strArg eq "-site _name") {151 elsif ($strArg eq "-site") { 152 152 $v = $strArg; 153 153 } 154 elsif($v eq "-site _name") {155 $self->{'site _name'} = $strArg;154 elsif($v eq "-site") { 155 $self->{'site'} = $strArg; 156 156 } 157 157 } -
main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm
r32584 r32586 41 41 # + TODO: SIGTERM rollback and disconnect? 42 42 # + TODO Q: what about verbosity for debugging, instead of current situation of printing out upon debug set at the expense of writing to db 43 # TODO Q: introduced site_name param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes"43 #X TODO Q: introduced site param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes". No longer a param 44 44 # Did I do the pass by ref in docprint's escape and unescape textref functions correctly, and how they're called here? 45 45 # Any more optimisation I can do around this? … … 88 88 'type' => "enum", 89 89 'list' => $rollback_on_cancel_list, 90 'deft' => " true", # TODO Q: what's the better default? If "true", any memory concerns?90 'deft' => "false", # TODO Q: what's the better default? If "true", any memory concerns? 91 91 'reqd' => "no", 92 92 'hiddengli' => "no"}, … … 155 155 156 156 ############ LOAD NECESSARY OPTIONS ########### 157 #print "@@@ plugout SITE NAME: ". $self->{'site _name'} . "\n" if defined $self->{'site_name'};157 #print "@@@ plugout SITE NAME: ". $self->{'site'} . "\n" if defined $self->{'site'}; 158 158 #print STDERR "########## COLLECTION: ". $ENV{'GSDLCOLLECTION'}."\n"; 159 159 … … 189 189 #die("@@@@ TEST. Connected successfully. Testing gssql::destructor.\n"); # WORKS 190 190 191 my $db_name = $self->{'site _name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2191 my $db_name = $self->{'site'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2 192 192 my $proc_mode = $self->{'process_mode'}; 193 193 -
main/trunk/greenstone2/perllib/strings.properties
r32582 r32586 1234 1234 PrintInfo.desc:Most base plugin, handles printing info (using pluginfo.pl) and parsing of the arguments. 1235 1235 1236 PrintInfo.site _name:The name of the Greenstone 3 site. The default site for a GS3 installation is localsite.1236 PrintInfo.site:The name of the Greenstone 3 site. The default site for a GS3 installation is localsite. 1237 1237 1238 1238 ProCitePlugin.desc:A plugin for (exported) ProCite databases … … 1418 1418 BasPlugout.no_auxiliary_databases:Don't generate archivesinf databases - useful when exporting. 1419 1419 # ' 1420 BasPlugout.site _name:The name of the Greenstone 3 site. The default site for a GS3 installation is localsite.1420 BasPlugout.site:The name of the Greenstone 3 site. The default site for a GS3 installation is localsite. 1421 1421 BasPlugout.output_handle: the file descriptor used to receive output data 1422 1422 BasPlugout.output_info:The reference to an arcinfo object used to store information about the archives.
Note:
See TracChangeset
for help on using the changeset viewer.