Changeset 21283 for main/trunk/greenstone2

Timestamp:

2009-12-07T13:15:56+13:00 (14 years ago)

Author:

kjdon

Message:

tidied up index method, added removeold method (not tested yet)

File:

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

main/trunk/greenstone2/perllib/plugins/PharosImageIndexer.pm

@@ -93 +93 @@
 }
 
+sub removeold {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+    
+    if (!$self->{'pharos_available'}) {
+    print STDERR "pharos not available, not doing a removeold\n";
+    }
+    # 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";
+    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 clear database for collection $collection\n";
+    }
+    print $outhandle "$result\n";
+    
+}
+
 sub pharos_index_image {
     my $self = shift(@_);
@@ -104 +125 @@
     my $id = $doc_obj->get_OID();
 
-    #my $result = `pharos-imageis-add.pl $collection $filename_full_path $id 2>&1`;
-    my $result = `imageis-add-jpg-file.sh $collection $filename_full_path 2>&1`;
+    my $cmd = "perl -S pharos-imageis-add.pl $collection $filename_full_path $id 2>&1";
+    print STDERR "Running command $cmd\n";
+    my $result = `$cmd`;
+
     my $return_value = $?;
+    my $outhandle = $self->{'outhandle'};
     if ($return_value != 0) {
-    my $outhandle = $self->{'outhandle'};
     print $outhandle "Pharos Indexing failed for $filename_full_path, $id\n";
-    print $outhandle "$result\n";
     }
+    print $outhandle "$result\n";
+    
 }