Changeset 17574

Timestamp:

2008-10-23T10:00:34+13:00 (16 years ago)

Author:

kjdon

Message:

now calls read_build_cfg() instead of having the code here

File:

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

gsdl/trunk/perllib/mgppbuilder.pm

@@ -719 +719 @@
     
     #add all fields bit 
+    my $ifm = $self->{'buildproc'}->{'indexfieldmap'};
+    
     foreach $field (@specifiedfieldorder) {
     if ($field eq "metadata") {
@@ -735 +737 @@
         push (@indexfields, "allfields");
     } else {
-
-        my $ifm = $self->{'buildproc'}->{'indexfieldmap'};
-
+        # we only add in the ones that have been processed
         if (defined $ifm->{$field}) {
         push (@indexfieldmap, "$field\-\>$ifm->{$field}");
@@ -763 +763 @@
     my @indexmap = ();
 
-    #if (scalar(keys %{$self->{'buildproc'}->{'indexfieldmap'}}) == 0) {
-    # set the default mapping
-    #$self->{'buildproc'}->set_indexfieldmap ($self->{'indexfieldmap'});
-    #}
     # we read the stuff in from the build.cfg file - if its there
-    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;
-    }
-    } 
-
-    my $buildcfg = &colcfg::read_build_cfg( $buildconfigfile);
+    my $buildcfg = $self->read_build_cfg();
+    return unless defined $buildcfg;
+
     my $field;
     if (defined $buildcfg->{'indexfields'}) {