Changeset 17573

Timestamp:

2008-10-23T09:59:13+13:00 (16 years ago)

Author:

kjdon

Message:

moved a couple of things around, added read_build_cfg which finds and reads in build.cfg file, added init_for_incremental_build

File:

• gsdl/trunk/perllib/basebuilder.pm (modified) (5 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -227 +227 @@
     &util::mk_all_dir($textdir);
     }
-    
+
+    if ($self->{'incremental'}) {
+    # some classes may need to do some additional initialisation
+    $self->init_for_incremental_build();
+    }
+    
+}
+
+# implement this in subclass if want to do additional initialisation for an
+# incremental build
+sub init_for_incremental_build {
+    my $self = shift (@_);
 }
 
@@ -316 +327 @@
 }
 
+# implement this in subclass if want to do extra stuff at the end of building
+# all the indexes
 sub build_indexes_extra {
     my $self = shift(@_);
@@ -504 +517 @@
     print STDERR "</Stage>\n" if $self->{'gli'};
 }
+
+# implement this in subclass if want to add extra stuff to build.cfg
+sub build_cfg_extra {
+   my $self = shift(@_);
+   my ($build_cfg) = @_;
+   
+}
+
 
 sub collect_specific {
@@ -580 +601 @@
 }
 
-# implement this in subclass if want to add extra stuff to build.cfg
-sub build_cfg_extra {
-   my $self = shift(@_);
-   my ($build_cfg) = @_;
-   
-}
 
 
@@ -620 +635 @@
 }
 
+# sometimes we need to read in an existing build.cfg - for example, 
+# if doing each stage of building separately, or when doing incremental 
+# building
+sub read_build_cfg {
+    my $self = shift(@_);
+
+    my $buildconfigfile = &util::filename_cat($self->{'build_dir'}, "build.cfg");
+    
+    if (!-e $buildconfigfile) {
+    # try the index dir - but do we know where it is?? try here
+    $buildconfigfile  = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "index", "build.cfg");
+    if (!-e $buildconfigfile) {
+        #we cant find a config file - just ignore the field list
+        return undef;
+    }
+    } 
+
+    my $buildcfg = &colcfg::read_build_cfg( $buildconfigfile);
+    return $buildcfg;
+
+}
 
 sub print_stats {