Changeset 26450 for main/trunk
- Timestamp:
- 2012-11-07T20:42:12+13:00 (11 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/collConfigxml.pm
r26342 r26450 75 75 my $currentAttrRef = undef; 76 76 77 # for storing plugin options if of type importOptions or buildOptions 78 my $currentPluginOptionsType = undef; # can be import or build 79 77 80 my $currentLevel = ""; 78 81 … … 277 280 } 278 281 282 # need to process the options of any build- and importOptions lists inside a plugin 283 # <pluginList><plugin><option.../><option.../><importOptions><option .../></importOptions></plugin></pluginList> 284 elsif ($currentLevel eq "plugin" and $element =~ m/^(importOptions|buildOptions)$/) { 285 if($element eq "importOptions") { 286 $currentPluginOptionsType="import"; 287 } 288 else { 289 $currentPluginOptionsType="build"; 290 } 291 } 292 279 293 #@ Handling the option elements in each classifier/plugin element (as the following strings) 280 294 elsif ($currentLevel =~ /$arrayarrayexp/ and $element eq "option") { … … 288 302 push (@{$data->{$key}->[$currentIndex]}, $value); 289 303 } 304 # besides regular options, plugins can have buildOptions and importOptions 305 #if (defined $currentPluginOptionsType and $currentPluginOptionsType =~ /\w/) { 306 #push (@{$data->{$key}->[$currentIndex]}, $currentPluginOptionsType); 307 ##print "@@@@ Found $currentPluginOptionsType option with name: $name and value: $value\n"; 308 #} 290 309 291 310 } … … 300 319 $currentLevel = ""; 301 320 } 321 elsif ($element =~ m/^(importOptions|buildOptions)$/) { # can be nested inside a plugin of pluginList 322 $currentPluginOptionsType = undef; 323 } 324 302 325 # $arrayarrayexp contains classifier|plugin 303 326 elsif($element =~ /$arrayarrayexp/ ){ -
main/trunk/greenstone2/perllib/inexport.pm
r25957 r26450 227 227 $collectcfg->{'infodbtype'} = "gdbm"; 228 228 } 229 230 # if OIDtype and/or OIDmetadata args are specified on the commandline, they override what's 231 # in collectcfg but may not overwrite it (by writing it into the collectcfg file) 232 if (defined $self->{'OIDtype'} && $self->{'OIDtype'} =~ /\w/) 233 { 234 $collectcfg->{'OIDtype'} = $self->{'OIDtype'}; # store in the in-memory collectcfg hash 235 } 236 if (defined $self->{'OIDmetadata'} && $self->{'OIDmetadata'} =~ /\w/) 237 { 238 $collectcfg->{'OIDmetadata'} = $self->{'OIDmetadata'}; # store in the in-memory collectcfg hash 239 } 240 229 241 if (defined $collectcfg->{'importdir'} && $importdir eq "") { 230 242 $importdir = $collectcfg->{'importdir'};
Note:
See TracChangeset
for help on using the changeset viewer.