Changeset 21305 for gs3-extensions

Timestamp:

2009-12-09T13:15:20+13:00 (14 years ago)

Author:

kjdon

Message:

added back in proper chacking for pharos, removeold renamed to remove_all, added remove_one

File:

• gs3-extensions/pharos-imageis/trunk/perllib/plugins/PharosImageIndexer.pm (modified) (3 diffs)

gs3-extensions/pharos-imageis/trunk/perllib/plugins/PharosImageIndexer.pm

@@ -74 +74 @@
     # Check that Pharos is installed and available on the path 
     my $pharos_available = 1;
-    ## change for windows!
-    #my $result = `phraros-imageis-identify 2>&1`;
-    #my $return_value = $?;
-    #if ( ($ENV{'GSDLOS'} eq "windows" && $return_value == 256) || $return_value == -1) {  # Linux and Windows return different values for "program not found"
-    #    $pharos_available = 0;
-    #}
+    my $result = `pharos-imageis-identify.pl 2>&1`;
+    my $return_value = $?;
+    if ( ($ENV{'GSDLOS'} eq "windows" && $return_value == 256) || $return_value == -1) {  # Linux and Windows return different values for "program not found"
+        $pharos_available = 0;
+    }
     
-    $self->{'pharos_available'} = 1; #$pharos_available;
+    $self->{'pharos_available'} = $pharos_available;
     
     if ($self->{'pharos_available'} == 0) {
@@ -94 +93 @@
 }
 
-sub removeold {
+sub remove_one {
+    my $self = shift (@_);
+    
+    my ($file, $oids) = @_;
+    print STDERR "in pharos remove_one, $file, $oids\n";
+    return if ($self->{'disable_pharos_imageis'});
+
+    if (!$self->{'pharos_available'}) {
+    print STDERR "pharos not available, can't remove\n";
+    return;
+    }
+
+    my $doc_id = @$oids[0];
+    return unless defined $doc_id;
+    my $collection = &util::get_current_collection_name();
+    my $cmd = "perl -S pharos-imageis-delete.pl $collection $doc_id.jpg 2>&1";
+    print STDERR "Running command $cmd\n";
+    my $result = `$cmd`;
+    my $return_value = $?;
+    my $outhandle = $self->{'outhandle'};
+    if ($return_value != 0) {
+    print $outhandle "Pharos Indexing failed to delete $doc_id from database for collection $collection\n";
+    }
+    print $outhandle "$result\n";
+
+ }
+sub remove_all {
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
@@ -101 +126 @@
 
     if (!$self->{'pharos_available'}) {
-    print STDERR "pharos not available, not doing a removeold\n";
+    print STDERR "pharos not available, not doing a remove_all\n";
     return;
     }
     # need to delete everything from the derby database.
     my $collection = &util::get_current_collection_name();
-    my $cmd = "perl -S pharos-imageis-delete.pl $collection *.jpg 2>&1";
+    my $cmd = "perl -S pharos-imageis-delete.pl $collection '*.jpg' 2>&1";
     print STDERR "Running command $cmd\n";
     my $result = `$cmd`;