Changeset 28215

Timestamp:

2013-09-05T11:18:17+12:00 (11 years ago)

Author:

kjdon

Message:

assume that no indexoptions line in config file actually means no index options. otherwise we unset them all in GLI, and magically they are all still there.

Location:

main/trunk/greenstone2/perllib

Files:

• mgbuilder.pm (modified) (1 diff)
• mgppbuilder.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/mgbuilder.pm

@@ -99 +99 @@
     $self->{'accentfold'} = 0; #not yet implemented for mg
     
-    if (!defined($self->{'collect_cfg'}->{'indexoptions'})) {
-    # just use default options
-    $self->{'casefold'} = 1;
-    $self->{'stem'} = 1;
-    
-    } else {
+    if (defined($self->{'collect_cfg'}->{'indexoptions'})) {
     foreach my $option (@{$self->{'collect_cfg'}->{'indexoptions'}}) {
         if ($option =~ /stem/) {

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -124 +124 @@
     $self->{'accentfold'} = 0; 
     
-    if (!defined($self->{'collect_cfg'}->{'indexoptions'})) {
-    # just use default options
-    $self->{'casefold'} = 1;
-    $self->{'stem'} = 1;
-    $self->{'accentfold'} = 1;
-    } else {
+    if (defined($self->{'collect_cfg'}->{'indexoptions'})) {
     foreach my $option (@{$self->{'collect_cfg'}->{'indexoptions'}}) {
         if ($option =~ /stem/) {