Changeset 5617

Timestamp:

2003-10-14T10:39:54+13:00 (21 years ago)

Author:

kjdon

Message:

fixed a bug in the subcollection building stuff - it was getting the field list wrong

File:

• trunk/gsdl/perllib/mgppbuilder.pm (modified) (3 diffs)

trunk/gsdl/perllib/mgppbuilder.pm

@@ -429 +429 @@
     }
     }
+
+    #define the final field lists
+    $self->make_final_field_list();
+
 }
 
@@ -724 +728 @@
     system ("mgpp_stem_idx$exe -b 4096 -s2 -f \"$fullindexprefix\" $osextra");
     system ("mgpp_stem_idx$exe -b 4096 -s3 -f \"$fullindexprefix\" $osextra");
-
-    #define the final field lists
-    $self->make_final_field_list();
     
     # remove unwanted files
@@ -935 +936 @@
     # go through the index definition and add each thing to a map, so we can easily check if it is already specified - when doing the metadata, we print out all the individual fields, but some may already be specified in the index definition, so we dont want to add those again.
     foreach $field (@{$self->{'collect_cfg'}->{'indexes'}}) {
-    my @fs = split(',', $field);
+    # remove subcoll stuff
+    my $parts = $field;
+    $parts =~ s/:.*$//;
+    my @fs = split(',', $parts);
     foreach $f(@fs) {
-        $specifiedfields->{$f}=1;
-        push (@specifiedfieldorder, "$f");
+        if (!defined $specifiedfields->{$f}) {
+        $specifiedfields->{$f}=1;
+        push (@specifiedfieldorder, "$f");
+        }
     }
     }