Changeset 30341 for gs2-extensions

Timestamp:

2015-12-03T16:31:21+13:00 (8 years ago)

Author:

jmt12

Message:

Ability to notice delete entries in 70 hyphen format when retrieving keys - added for GDBMTXTGZ

File:

• gs2-extensions/tdb/trunk/perllib/DBDrivers/70HyphenFormat.pm (modified) (2 diffs)

gs2-extensions/tdb/trunk/perllib/DBDrivers/70HyphenFormat.pm

@@ -172 +172 @@
     my $self = shift(@_);
     my $mode = shift(@_);
-    my $executable = shift(@_);
+    my $executable_and_default_args = shift(@_);
     my $infodb_file_path = shift(@_);
+    my ($executable, $default_args) = $executable_and_default_args =~ /^([a-z0-9]+)\s*(.*)$/;
     my $exe = &FileUtils::filenameConcatenate($self->{'executable_path'}, $executable . &util::get_os_exe());
     if (!-e $exe) {
-    # See if it's on path
+    # Hope it's on path
     $exe = $executable . &util::get_os_exe();
-    if (!-e $exe) {
-        print STDERR "Error: Unable to find " . $exe . "\n";
-        return undef;
-    }
     }
     my $infodb_file_handle = undef;
-    my $cmd = '"' . $exe . '"';
+    my $cmd = '"' . $exe . '" ' . $default_args;
     foreach my $open_arg (@_) {
     $cmd .= ' ' . $open_arg;
@@ -282 +279 @@
     else {
     while (defined ($infodb_line = <$infodb_file_handle>)) {
-        if ($infodb_line =~ /^\[([^\]]+)\][\r\n]*$/) {
-        $infodb_map->{$1} = 1;
+        if ($infodb_line =~ /^\[([^\]]+)\](-)?[\r\n]*$/) {
+        my $key = $1;
+        my $delete_flag = $2;
+        if (defined $delete_flag) {
+            delete $infodb_map->{$key}
+        }
+        else {
+            $infodb_map->{$key} = 1;
+        }
         }
     }