Changeset 26324 for main/trunk/greenstone2/perllib/g2futil.pm

Timestamp:

2012-10-16T21:12:31+13:00 (12 years ago)

Author:

ak19

Message:

1. When purging documents from the fedora repository during import and buildcol, these documents are also removed from the Fedora GSearch index. Likewise, when documents are ingested into the Fedora repository during buildcol, these documents are also indexed by Fedora GSearch. 2. Added methods in g2futil.pm to be able to do this

File:

• main/trunk/greenstone2/perllib/g2futil.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/g2futil.pm

@@ -59 +59 @@
     my $script_ext = ($ENV{'GSDLOS'} =~ m/^windows/) ? ".bat" : ".sh";
 
-    if ($prog =~ m/^fedora-/) {
+    if ($prog =~ m/^fedora-/ || $prog =~ m/^run[A-Z]*Client/) { # fedora or fedoragsearch script
     $prog .= $script_ext;
     }
@@ -168 +168 @@
     return $status;
 }
+
+# runs fedora gsearch's runRESTClient.sh: updateIndex deletePID <PID>
+sub run_delete_from_index
+{
+    my ($fedoragsearch_webapp,$pid,$options) = @_;
+
+    my $verbosity = $options->{'verbosity'};
+
+    my $hostname = $options->{'hostname'};
+    my $port     = $options->{'port'};
+    my $username = $options->{'username'};
+    my $password = $options->{'password'};
+    my $protocol = $options->{'protocol'};
+
+    my $server = "$hostname:$port";
+    #$ENV{'fgsUserName'} = $options->{'username'};
+    #$ENV{'fgsPassword'} = $options->{'password'};    
+
+    #my $prog = &util::filename_cat($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
+    my $prog = &util::filename_cat($fedoragsearch_webapp, "client", "runRESTClient.sh");
+
+    my $gsearch_commands = "updateIndex deletePID";
+    my $arguments = "$server $gsearch_commands $pid";    
+
+    my $status = run_cmd($prog,$arguments,$verbosity);
+
+    return $status;
+}
+
+# runs fedora gsearch's runRESTClient.sh: updateIndex fromPID <PID>
+sub run_update_index
+{
+    my ($fedoragsearch_webapp,$pid,$options) = @_;
+
+    my $verbosity = $options->{'verbosity'};
+
+    my $hostname = $options->{'hostname'};
+    my $port     = $options->{'port'};
+    my $username = $options->{'username'};
+    my $password = $options->{'password'};
+    my $protocol = $options->{'protocol'};
+
+    my $server = "$hostname:$port";
+    #$ENV{'fgsUserName'} = $options->{'username'};
+    #$ENV{'fgsPassword'} = $options->{'password'};    
+
+    #my $prog = &util::filename_cat($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
+    my $prog = &util::filename_cat($fedoragsearch_webapp, "client", "runRESTClient.sh");
+    
+    my $gsearch_commands = "updateIndex fromPID";
+    my $arguments = "$server $gsearch_commands $pid";    
+
+    my $status = run_cmd($prog,$arguments,$verbosity);
+
+    return $status;
+}
+
+sub gsearch_webapp_folder
+{   
+    my $fedoragsearch_webapp = undef;
+    
+    # if GS3, first look for a fedoragsearch webapp installed in Greenstone's tomcat
+    if(defined $ENV{'GSDL3SRCHOME'}) {
+    $fedoragsearch_webapp = &util::filename_cat($ENV{'GSDL3SRCHOME'},"packages","tomcat","webapps","fedoragsearch");    
+    return $fedoragsearch_webapp if (&util::dir_exists($fedoragsearch_webapp));
+    }
+
+    # next look for a fedoragsearch webapp installed in Fedora's tomcat
+    if(defined $ENV{'FEDORA_HOME'}) {
+    $fedoragsearch_webapp =  &util::filename_cat($ENV{'FEDORA_HOME'},"tomcat","webapps","fedoragsearch");
+    return $fedoragsearch_webapp if (&util::dir_exists($fedoragsearch_webapp));
+    }
+
+    ## check for a user-defined $ENV{'FEDORA_GSEARCH'} variable first, which points to a gsearch webapp folder??
+
+    # assume no fedoragsearch
+    return $fedoragsearch_webapp; # undef
+}
+
 
 sub run_ingest