Changeset 32555 for main/trunk/greenstone2/perllib/plugouts

Timestamp:

2018-10-30T19:29:56+13:00 (5 years ago)

Author:

ak19

Message:

1. In GreenstoneSQLPlugout, removeold is now paramterised (as are keepold, incremental, incremental_mode). 2. Deletion on incremental_build works. But there are more questions. Why are there 4 passes? What to do on reindexing and when to do it (should it happen during GS SQL plugout or plugin)?

Location:

main/trunk/greenstone2/perllib/plugouts

Files:

• BasePlugout.pm (modified) (1 diff)
• GreenstoneSQLPlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -347 +347 @@
 }
 
+# GreenstoneSQLPlugout needs to know whether we're doing removeold or not
+sub set_incremental_options {
+    my $self= shift (@_);
+    my ($removeold, $keepold, $incremental, $incremental_mode) = @_;
+    
+    $self->{'removeold'}        = $removeold;
+    $self->{'keepold'}          = $keepold;
+    $self->{'incremental'}      = $incremental;
+    $self->{'incremental_mode'} = $incremental_mode;
+}
+
 # OIDtype may be "hash" or "hash_on_full_filename" or "incremental" or "filename" or "dirname" or "full_filename" or "assigned"
 sub set_OIDtype {

main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

@@ -139 +139 @@
     #print STDERR "@@@@ db_driver: " . $self->{'db_driver'} . "\n";
     #print STDERR "@@@@ proc_mode: " . $self->{'process_mode'} . "\n";
-    
-    ########### TODO: deal with build mode #########
-
-    $self->{'build_mode'} = "removeold";
 
     ############ LOAD NECESSARY OPTIONS ###########
@@ -173 +169 @@
     
     my $db_name = $self->{'site_name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
-    my $build_mode = $self->{'build_mode'} || "removeold";
+    my $build_mode = ($self->{'removeold'}) ? "removeold" : "incremental";
+    print STDERR "@@@@@@@@@@@@ remove_old: $build_mode\n";
+    
     if(!$gs_sql->load_db_and_tables($db_name, $build_mode)) {