Changeset 5768

Timestamp:

2003-10-30T11:48:52+13:00 (20 years ago)

Author:

kjdon

Message:

added a check for failed indexing - just test to see if the .id file exists. if not, don't continue with building that index. Indexes that haven't been built are no longer included in the indexmap entry in teh build config file - and therefore wont appear in the list of indexes

Location:

trunk/gsdl/perllib

Files:

• mgbuilder.pm (modified) (5 diffs)
• mgppbuilder.pm (modified) (5 diffs)

trunk/gsdl/perllib/mgbuilder.pm

@@ -80 +80 @@
               'no_text'=>$no_text,
               'failhandle'=>$failhandle,
-              'notbuilt'=>[]    # indexes not built
+              'notbuilt'=>{}    # indexes not built
               }, $class;
 
@@ -305 +305 @@
     foreach $checkstr (@{$self->{'collect_cfg'}->{'dontbuild'}}) {
         if ($index =~ /^$checkstr$/) {
-        push (@{$self->{'notbuilt'}}, $self->{'index_mapping'}->{$index});
+        #push (@{$self->{'notbuilt'}}, $self->{'index_mapping'}->{$index});
+        $self->{'notbuilt'}->{$index} = 1;
         return 0;
         }
@@ -583 +584 @@
     $self->print_stats();
 
+    # now we check to see if the required files have been produced - if not we quit building this index so the whole process doesn't crap out.
+    # we check on the .id file - index dictionary
+    my $dict_file = "$fullindexprefix.id";
+    if (!-e $dict_file) {
+    print $outhandle "mgbuilder::build_index - Couldn't create index $index\n";
+    $self->{'notbuilt'}->{$index}=1;
+    return;
+    }
     if (!$self->{'debug'}) {
     # create the perfect hash function
@@ -825 +834 @@
 
     # store the mapping between the index names and the directory names
+    # the index map is used to determine what indexes there are, so any that are not built should not be put into the map.
     my @indexmap = ();
     foreach $index (@{$self->{'index_mapping'}->{'indexmaporder'}}) {
-    push (@indexmap, "$index\-\>$self->{'index_mapping'}->{'indexmap'}->{$index}");
+    if (not defined ($self->{'notbuilt'}->{$index})) {
+        push (@indexmap, "$index\-\>$self->{'index_mapping'}->{'indexmap'}->{$index}");
+    }
     }
     $build_cfg->{'indexmap'} = \@indexmap;
@@ -845 +857 @@
     $build_cfg->{'languagemap'} = \@languagemap if scalar (@languagemap);
 
-    $build_cfg->{'notbuilt'} = $self->{'notbuilt'} if scalar @{$self->{'notbuilt'}};
-
+    #$build_cfg->{'notbuilt'} = $self->{'notbuilt'} if scalar @{$self->{'notbuilt'}};
+    my @notbuilt = ();
+    foreach $nb (keys %{$self->{'notbuilt'}}) {
+    push (@notbuilt, $nb);
+    }
+    $build_cfg->{'notbuilt'} = \@notbuilt if scalar (@notbuilt);
     $build_cfg->{'maxnumeric'} = 4;
     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&

trunk/gsdl/perllib/mgppbuilder.pm

@@ -126 +126 @@
               'outhandle'=>$outhandle,
               'no_text'=>$no_text,
-              'notbuilt'=>[],    # indexes not built
+              'notbuilt'=>{},    # indexes not built
               'indexfieldmap'=>\%static_indexfield_map
           }, $class;
@@ -396 +396 @@
     foreach $checkstr (@{$self->{'collect_cfg'}->{'dontbuild'}}) {
         if ($index =~ /^$checkstr$/) {
-        push (@{$self->{'notbuilt'}}, $self->{'index_mapping'}->{$index});
+        #push (@{$self->{'notbuilt'}}, $self->{'index_mapping'}->{$index});
+        $self->{'notbuilt'}->{$index} = 1;
         return 0;
         }
@@ -680 +681 @@
 
     $self->print_stats();
+
+    # now we check to see if the required files have been produced - if not we quit building this index so the whole process doesn't crap out.
+    # we check on the .id file - index dictionary
+    my $dict_file = "$fullindexprefix.id";
+    if (!-e $dict_file) {
+    print $outhandle "mgppbuilder::build_index - Couldn't create index $index\n";
+    $self->{'notbuilt'}->{$index}=1;
+    return;
+    }
 
     if (!$self->{'debug'}) {
@@ -1059 +1069 @@
     my @indexmap = ();
     foreach $index (@{$self->{'index_mapping'}->{'indexmaporder'}}) {
-    push (@indexmap, "$index\-\>$self->{'index_mapping'}->{'indexmap'}->{$index}");
+    if (not defined ($self->{'notbuilt'}->{$index})) {
+        push (@indexmap, "$index\-\>$self->{'index_mapping'}->{'indexmap'}->{$index}");
+    }
     }
     $build_cfg->{'indexmap'} = \@indexmap;
@@ -1077 +1089 @@
     $build_cfg->{'languagemap'} = \@languagemap if scalar (@languagemap);
 
-    $build_cfg->{'notbuilt'} = $self->{'notbuilt'};
+    #$build_cfg->{'notbuilt'} = $self->{'notbuilt'};
+    my @notbuilt = ();
+    foreach $nb (keys %{$self->{'notbuilt'}}) {
+    push (@notbuilt, $nb);
+    }
+    $build_cfg->{'notbuilt'} = \@notbuilt if scalar (@notbuilt);
 
     # write out the build information