Changeset 12844 for trunk/gsdl/perllib/basebuildproc.pm

Timestamp:

2006-09-25T14:17:10+12:00 (18 years ago)

Author:

mdewsnip

Message:

Incremental building and dynamic GDBM updating code, many thanks to John Rowe and John Thompson at DL Consulting Ltd.

File:

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

trunk/gsdl/perllib/basebuildproc.pm

@@ -40 +40 @@
 }
 
-sub new {
-    my ($class, $collection, $source_dir, $build_dir, $keepold,
-    $verbosity, $outhandle) = @_; 
+sub new()
+  {
+    my ($class, $collection, $source_dir, $build_dir, $keepold, $verbosity, $outhandle) = @_;
     my $self = new docproc ();
 
@@ -71 +71 @@
     # For incremental building need to seed num_docs etc from values
     # stored in build.cfg (if present)
-
+      print STDERR "Keepold!\n";
     $buildconfigfile = &util::filename_cat($build_dir, "build.cfg");
-
+      print STDERR "Build cfg: $buildconfigfile\n";
     if (-e $buildconfigfile) {
         $found_num_data = 1;
@@ -81 +81 @@
         $buildconfigfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 
                            "index", "build.cfg");
+            print STDERR "Index cfg: $buildconfigfile\n";
         if (-e $buildconfigfile) {
         $found_num_data = 1;
@@ -86 +87 @@
     }
 
-    } 
-
-    if ($found_num_data) {
+    }
+    #else
+    #  {
+    #    print STDERR "Removeold!\n";
+    #  }
+
+    if ($found_num_data)
+      {
+        #print STDERR "Found_Num_Data!\n";
     my $buildcfg = &colcfg::read_build_cfg($buildconfigfile);
-    
     $self->{'starting_num_docs'}     = $buildcfg->{'numdocs'};
+        #print STDERR "- num_docs:     $self->{'starting_num_docs'}\n";
     $self->{'starting_num_sections'} = $buildcfg->{'numsections'};
+        #print STDERR "- num_sections: $self->{'starting_num_sections'}\n";
     $self->{'starting_num_bytes'}    = $buildcfg->{'numbytes'};
-    }
-    else {
-    $self->{'starting_num_docs'}     = 0;
+        #print STDERR "- num_bytes:    $self->{'starting_num_bytes'}\n";
+    }
+    else
+      {
+        #print STDERR "NOT Found_Num_Data!\n";
+        $self->{'starting_num_docs'}     = 0;
     $self->{'starting_num_sections'} = 0;
     $self->{'starting_num_bytes'}    = 0;
-    }
+      }
 
     $self->{'output_handle'} = "STDOUT";
@@ -428 +439 @@
         # output the matching document number
         print $handle "<docnum>$self->{'num_docs'}\n";
+            
     } else {
         # output a list of children
@@ -612 +624 @@
 }
 
-sub assoc_files {
+sub assoc_files() {
     my $self = shift (@_);
     my ($doc_obj, $archivedir) = @_;
@@ -618 +630 @@
     
     foreach my $assoc_file (@{$doc_obj->get_assoc_files()}) {
+      #rint STDERR "Processing associated file - copy " . $assoc_file->[0] . " to " . $assoc_file->[1] . "\n";
     # if assoc file starts with a slash, we put it relative to the assoc
     # dir, otherwise it is relative to the HASH... directory
     if ($assoc_file->[1] =~ m@^[/\\]@) {
-        $afile = &util::filename_cat($self->{'assocdir'},$assoc_file->[1]);
+        $afile = &util::filename_cat($self->{'assocdir'}, $assoc_file->[1]);
     } else {
         $afile = &util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);