Changeset 10159

Timestamp:

2005-06-23T11:25:53+12:00 (19 years ago)

Author:

davidb

Message:

Package upgraded to support incremental building. Main change it to set
doc_num counters etc to that of previous build (loaded in from build.cfg if
present). 'reset' also returns their values to the pre-loaded value.

File:

• trunk/gsdl/perllib/basebuildproc.pm (modified) (6 diffs)

trunk/gsdl/perllib/basebuildproc.pm

@@ -41 +41 @@
 
 sub new {
-    my ($class, $collection, $source_dir, $build_dir,
+    my ($class, $collection, $source_dir, $build_dir, $keepold,
     $verbosity, $outhandle) = @_; 
     my $self = new docproc ();
@@ -52 +52 @@
     $self->{'collection'} = $collection;
     $self->{'source_dir'} = $source_dir;
-    $self->{'build_dir'} = $build_dir;
-    $self->{'verbosity'} = $verbosity;
-    $self->{'outhandle'} = $outhandle;
+    $self->{'build_dir'}  = $build_dir;
+    $self->{'keepold'}    = $keepold;
+    $self->{'verbosity'}  = $verbosity;
+    $self->{'outhandle'}  = $outhandle;
 
     $self->{'classifiers'} = [];
@@ -64 +65 @@
     $self->{'indexexparr'} = [];
 
+    my $found_num_data = 0;
+    my $buildconfigfile = undef;
+
+    if ($keepold) {
+    # For incremental building need to seed num_docs etc from values
+    # stored in build.cfg (if present)
+
+    $buildconfigfile = &util::filename_cat($build_dir, "build.cfg");
+
+    if (-e $buildconfigfile) {
+        $found_num_data = 1;
+    }
+    else {
+        # try the index dir
+        $buildconfigfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 
+                           "index", "build.cfg");
+        if (-e $buildconfigfile) {
+        $found_num_data = 1;
+        }
+    }
+
+    } 
+
+    if ($found_num_data) {
+    my $buildcfg = &colcfg::read_build_cfg($buildconfigfile);
+    
+    $self->{'starting_num_docs'}     = $buildcfg->{'numdocs'};
+    $self->{'starting_num_sections'} = $buildcfg->{'numsections'};
+    $self->{'starting_num_bytes'}    = $buildcfg->{'numbytes'};
+    }
+    else {
+    $self->{'starting_num_docs'}     = 0;
+    $self->{'starting_num_sections'} = 0;
+    $self->{'starting_num_bytes'}    = 0;
+    }
+
     $self->{'output_handle'} = "STDOUT";
-    $self->{'num_docs'} = 0;
-    $self->{'num_sections'} = 0;
-    $self->{'num_bytes'} = 0;
+    $self->{'num_docs'}      = $self->{'starting_num_docs'};
+    $self->{'num_sections'}  = $self->{'starting_num_sections'};
+    $self->{'num_bytes'}     = $self->{'starting_num_bytes'};
+
     $self->{'num_processed_bytes'} = 0;
     $self->{'store_text'} = 1;
@@ -84 +122 @@
 sub reset {
     my $self = shift (@_);
-    
-    $self->{'num_docs'} = 0;
-    $self->{'num_sections'} = 0;
+
+    $self->{'num_docs'}      = $self->{'starting_num_docs'};
+    $self->{'num_sections'}  = $self->{'starting_num_sections'};
+    $self->{'num_bytes'}     = $self->{'starting_num_bytes'};
+    
     $self->{'num_processed_bytes'} = 0;
-    $self->{'num_bytes'} = 0;
+}
+
+sub zero_reset {
+    my $self = shift (@_);
+
+    $self->{'num_docs'}      = 0;
+    $self->{'num_sections'}  = 0;
+    $self->{'num_bytes'}     = 0;
+    
+    $self->{'num_processed_bytes'} = 0;
 }
 
@@ -132 +181 @@
 
     $self->{'mode'} = $mode;
+}
+
+sub get_mode {
+    my $self = shift (@_);
+
+    return $self->{'mode'};
 }
 
@@ -220 +275 @@
     my ($doc_obj, $filename) = @_;
     my $handle = $self->{'output_handle'};
+
+    print STDERR "***** infodb called with doc_obj = $doc_obj\n";
 
     my $doctype = $doc_obj->get_doc_type();