Changeset 25477 for gs2-extensions/tdb-edit

Timestamp:

2012-04-26T10:24:32+12:00 (12 years ago)

Author:

jmt12

Message:

Debugged non-harness mode and fixed a few issues (for instance, needing to call TDBKEYS when * is given as the target key)

File:

• gs2-extensions/tdb-edit/trunk/src/bin/script/TDBServer.pl (modified) (5 diffs)

gs2-extensions/tdb-edit/trunk/src/bin/script/TDBServer.pl

@@ -77 +77 @@
 # Globally available - but once set these are read-only - so locking isn't
 # an issue
-my $use_harness = 1;
+my $use_harness = 0;
 my $tdbexe = 'tdbcli';
 my $parent_pid = 0;
@@ -404 +404 @@
   # form  <database>:<key>:<value>
   # where: database is [d]oc, [i]ndex, or [s]rc
-  elsif ($data =~ /^([dis]):\[([^\]]+)\]([+?\-])(.+)$/s)
+  elsif ($data =~ /^([dis]):\[(.+?)\]([\+\?\-]?)(.*)$/s)
   {
     my $database = $1;
     my $key = $2;
-    my $action = $3
+    my $action = $3;
+    # by default we add for backwards compatibility
+    if (!defined $action || $action eq '')
+    {
+      #rint STDERR "Warning! Detected request without action (#" . $the_count . ") - assuming add/update.\n";
+      $action = '+';
+    }
     my $payload = $4;
+    $payload =~ s/^\s+|\s+$//g;
+    &debugPrint($the_count, $tid, 'PARSED', 'database=' . $database . ', key=' . $key . ', action=' . $action . ', payload=' . $payload);
     # Build path to database file
     my $tdb_path = '';
@@ -472 +480 @@
     elsif ($action eq '?')
     {
-      my $command1 = 'tdbget "' . $tdb_path . '" "' . $key . '"';
-      &debugPrint($the_count, $tid, 'TDBGET', 'Command: ' . $command1);
-      my $result = `$command1`;
-      &debugPrint($the_count, $tid, 'TDBGET', 'Result: ' . $result);
+      my $command_name = '';
+      my $command1 = '';
+      # Special case for retrieve all keys (indicated by *)
+      if ($key eq '*')
+      {
+        $command_name = 'TDBKEYS';
+        $command1 = 'tdbkeys "' . $tdb_path . '"';
+      }
+      else
+      {
+        $command_name = 'TDBGET';
+        $command1 = 'tdbget "' . $tdb_path . '" "' . $key . '"';
+      }
+      &debugPrint($the_count, $tid, $command_name, 'Command: ' . $command1);
+      $result = `$command1`;
+      &debugPrint($the_count, $tid, $command_name, 'Result: ' . $result);
       if ($result =~ /-{70}/)
       {
@@ -484 +504 @@
     elsif ($action eq '+' || $action eq '-')
     {
-      my $command2 = 'txt2tdb "' . $tdb_path . '" -append';
+      my $command2 = 'txt2tdb -append "' . $tdb_path . '"';
       &debugPrint($the_count, $tid, 'TXT2TDB', 'Command: ' . $command2);
       open(my $infodb_handle, '| ' . $command2) or die("Error! Failed to open pipe to TXT2TDB\n");
@@ -499 +519 @@
     else
     {
-      die("Error! Unknown action: " . $action . "\n");
+      print STDERR "Warning! Request " . $the_count . " asked for unknown action '" . $action . "' - Ignoring!\n";
     }
   }