Changeset 28801 for main

Timestamp:

2014-01-30T15:09:31+13:00 (10 years ago)

Author:

ak19

Message:

New mode to buildcol.pl added called 'extra'. This restricts the build to only sending/processing the archives content by the orthogonal indexes

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (1 diff)
• perllib/buildcolutils.pm (modified) (4 diffs)
• perllib/strings.properties (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -102 +102 @@
         'desc' => "{buildcol.mode.build_index}" },
       { 'name' => "infodb",
-        'desc' => "{buildcol.mode.infodb}" } ];
+        'desc' => "{buildcol.mode.infodb}" },
+      { 'name' => "extra",
+        'desc' => "{buildcol.mode.extra}" } ];
 
 my $sec_index_list =

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -27 +27 @@
 
 package buildcolutils;
+
+#use strict; 
+#no strict 'refs';
 
 use File::Basename;
@@ -329 +332 @@
   }
 
-  if ($self->{'mode'} !~ /^(all|compress_text|build_index|infodb)$/)
-  {
-    if (defined $collectcfg->{'mode'} && $collectcfg->{'mode'} =~ /^(all|compress_text|build_index|infodb)$/)
+  if ($self->{'mode'} !~ /^(all|compress_text|build_index|infodb|extra)$/)
+  {
+    if (defined $collectcfg->{'mode'} && $collectcfg->{'mode'} =~ /^(all|compress_text|build_index|infodb|extra)$/)
     {
       $self->{'mode'} = $collectcfg->{'mode'};
@@ -556 +559 @@
   my @buildertype_list = ($buildertype);
 
+  my $mode = $self->{'mode'};
+
+  if ($mode eq "extra") {
+      # knock out the main builder type, by reseting the lists to be empty
+      @builderdir_list = ();
+      @buildertype_list = ();
+  }
+
   if (defined $orthogonalbuildtypes)
   {
@@ -639 +650 @@
 
   # Run the requested passes
-  if ($mode =~ /^all$/i)
+  if ($mode =~ /^(all|extra)$/i)
   {
     # 'map' modifies the elements of the original array, so calling

main/trunk/greenstone2/perllib/strings.properties

@@ -116 +116 @@
 buildcol.mode.compress_text:Just compress the text.
 buildcol.mode.infodb:Just build the metadata database.
+buildcol.mode.extra:Skip the main indexing stages, and just build the extra (orthogonal) passes
 
 buildcol.no_default_images:Default images will not be generated.