Changeset 30520 for main/trunk/greenstone2/perllib

Timestamp:

2016-05-09T22:38:09+12:00 (8 years ago)

Author:

ak19

Message:

Refactoring activate.pl into activate.pm (class, OOP) and activate.pl. Now buildcolutils.pm uses do_deactivate() from activate.pm.

Location:

main/trunk/greenstone2/perllib

Files:

• activate.pm (added)
• buildcolutils.pm (modified) (6 diffs)
• downloaders/WgetDownload.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -33 +33 @@
 use File::Basename;
 
+use activate;
 use colcfg;
 use dbutil;
@@ -685 +686 @@
     
         if(!$dbSupportsConcurrentRW) {
-        #$self->{'justdeactivate'} = 1;
-        #$self->activate_collection();
-        #$self->{'justdeactivate'} = 0;
-        $self->activate_collection("just_deactivate");      
+        # all except the collection (1st parameter) can be empty. For GS3, also set the site parameter
+        my $gsserver = new activate( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'});
+        $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
+        #$self->{'library_url'} = $gsserver->get_library_URL();
+        $gsserver->do_deactivate();     
         }
         $_->make_infodatabase();        
@@ -718 +720 @@
     
         if(!$dbSupportsConcurrentRW) {
-        $self->activate_collection("just_deactivate");      
+        # all except the collection (1st parameter) can be empty. For GS3, also set the site parameter
+        my $gsserver = new activate( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'});
+        $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
+        #$self->{'library_url'} = $gsserver->get_library_URL();
+        $gsserver->do_deactivate();
         }
         $_->make_infodatabase(); 
@@ -794 +800 @@
 sub activate_collection
 {
-  my $self = shift(@_);  
-  my $activation_cmd = shift(@_);
-  my($just_activate, $just_deactivate);
-  if(defined $activation_cmd) {
-      $just_deactivate = 1 if($activation_cmd eq "just_deactivate");
-      $just_activate = 1 if($activation_cmd eq "just_activate");
-      if($activation_cmd eq "just_deactivate_and_activate") {
-      $just_deactivate = 1;
-      $just_activate = 1;
-      }
-  }
+  my $self = shift(@_);
 
   # if buildcol.pl was run with -activate, need to run activate.pl
@@ -812 +808 @@
     #my $quoted_argv = join(" ", map { "\"$_\"" } @ARGV);
     my @activate_argv = ();
+    push(@activate_argv, '-library_url', $self->{'library_url'}) if ($self->{'library_url'});
+    push(@activate_argv, '-library_name', $self->{'library_name'}) if ($self->{'library_name'});
     push(@activate_argv, '-collectdir', $self->{'collectdir'}) if ($self->{'collectdir'});
     push(@activate_argv, '-builddir', $self->{'builddir'}) if ($self->{'builddir'});
+    push(@activate_argv, '-indexdir', $self->{'indexdir'}) if ($self->{'indexdir'});
     push(@activate_argv, '-site', $self->{'site'}) if ($self->{'site'});
     push(@activate_argv, '-verbosity', $self->{'verbosity'}) if ($self->{'verbosity'});
@@ -819 +818 @@
     push(@activate_argv, '-keepold') if ($self->{'keepold'});
     push(@activate_argv, '-incremental') if ($self->{'incremental'});
-    push(@activate_argv, '-justactivate') if ($just_activate || $self->{'justactivate'});
-    push(@activate_argv, '-justdeactivate') if ($just_deactivate || $self->{'justdeactivate'});
+    push(@activate_argv, '-skipactivation', $self->{'skipactivation'}) if ($self->{'skipactivation'});
+
     my $quoted_argv = join(' ', map { "\"$_\"" } @activate_argv);
     my $activatecol_cmd = '"' . &util::get_perl_exec(). '" -S activate.pl ' . $quoted_argv . ' "' . $self->get_collection() . '"';

main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

@@ -246 +246 @@
     #print STDOUT "Command is: $command\n";
 
-    # Wget's output needs to be monitored to find out when it has naturally termianted.
+    # Wget's output needs to be monitored to find out when it has naturally terminated.
     # Wget's output is sent to its STDERR so we can't use open2 without doing 2>&1.
     # On linux, 2>&1 launches a subshell which then launches wget, meaning that killing