Changeset 30349 for gs2-extensions/tdb

Timestamp:

2015-12-16T10:41:52+13:00 (8 years ago)

Author:

jmt12

Message:

Minor fixes to get this running in new OO system, no refactoring applied

File:

• gs2-extensions/tdb/trunk/perllib/DBDrivers/SQLITE.pm (modified) (13 diffs)

gs2-extensions/tdb/trunk/perllib/DBDrivers/SQLITE.pm

@@ -45 +45 @@
 {
     my $class = shift(@_);
-    my $self = DBDrivers::BaseDBDriver->new();
+    my $self = DBDrivers::BaseDBDriver->new(@_);
     $self->{'default_file_extension'} = 'db';
     # Please set db_fast to 1 if you wish to enable faster I/O to the database
@@ -68 +68 @@
     # The SQLite path we are using
     $self->{'sqlite_executable'} = '';
+
+    # Support
+    $self->{'supports_set'} = 1;
+
     bless($self, $class);
     return $self;
@@ -107 +111 @@
     my $sqlcmd = shift(@_);
     my $result = "";
-    $self->_debugPrint('("' . $infodb_file_path . '", "' . $sqlcmd . '")');
+    $self->debugPrint('("' . $infodb_file_path . '", "' . $sqlcmd . '")');
     my $sqlite3_exe = $self->_getExecutable();
     my $infodb_handle = undef;
@@ -160 +164 @@
     }
 
-    $self->_debugPrint('("' . $infodb_file_path . '","' . $opt_append . '")');
+    $self->debugPrint('("' . $infodb_file_path . '","' . $opt_append . '")');
 
     my $sqlite3_exe = $self->_getExecutable();
@@ -224 +228 @@
     my $self = shift(@_);
     my $infodb_handle = shift(@_);
-    $self->_debugPrint('(<handle>)');
+    $self->debugPrint('(<handle>)');
     # Close the transaction we began when opening the file
     print $infodb_handle "END TRANSACTION;\n";
@@ -239 +243 @@
     my $infodb_file_path = shift(@_);
     my $infodb_map = shift(@_);
-    $self->_debugPrint('("' . $infodb_file_path . '", <hashmap>)');
+    $self->debugPrint('("' . $infodb_file_path . '", <hashmap>)');
     my $keys_str = $self->_readInfoDBCmd($infodb_file_path,"SELECT key FROM data ORDER BY key;");
     my @keys = split(/\n/,$keys_str);
@@ -259 +263 @@
     my $infodb_file_path = shift(@_);
     my $infodb_map = shift(@_);
-    $self->_debugPrint('("' . $infodb_file_path . '", <hashmap>)');
+    $self->debugPrint('("' . $infodb_file_path . '", <hashmap>)');
     my $keys_str = $self->_readInfoDBCmd($infodb_file_path,"SELECT key FROM data;");
     my @keys = split(/\n/,$keys_str);
@@ -277 +281 @@
     my $infodb_file_path = shift(@_);
     my $infodb_key = shift(@_);
-    $self->_debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '")');
+    $self->debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '")');
     my $key_safe = $self->_sqliteSafe($infodb_key);
     my $select_val_cmd = "SELECT value FROM data WHERE key='$key_safe';";
@@ -293 +297 @@
     my $infodb_file_path = shift(@_);
     my $infodb_key = shift(@_);
-    $self->_debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '")');
+    $self->debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '")');
     my $val_str = $self->read_infodb_rawentry($infodb_file_path,$infodb_key);
-    my $rec_hash = &dbutil::convert_infodb_string_to_hash($val_str);
+    my $rec_hash = $self->convert_infodb_string_to_hash($val_str);
     return $rec_hash;
 }
@@ -309 +313 @@
     my $infodb_key = shift(@_);
     my $infodb_map = shift(@_);
-    $self->_debugPrint('(<handle>, "' . $infodb_key . '", <hashmap>)');
+    $self->debugPrint('(<handle>, "' . $infodb_key . '", <hashmap>)');
     # Add the key -> value mapping into the "data" table
     my $infodb_entry_value = "";
@@ -368 +372 @@
     my $infodb_key = shift(@_);
     my $infodb_val = shift(@_);
-    $self->_debugPrint('(<handle>, "' . $infodb_key . '", "' . $infodb_val . '")');
+    $self->debugPrint('(<handle>, "' . $infodb_key . '", "' . $infodb_val . '")');
     my $safe_infodb_key = $self->_sqliteSafe($infodb_key);
     print $infodb_handle "INSERT OR REPLACE INTO data (key, value) VALUES ('" . $safe_infodb_key . "', '" . $self->_sqliteSafe($infodb_val) . "');\n";
@@ -383 +387 @@
     my $infodb_key = shift(@_);
     my $infodb_map = shift(@_);
-    $self->_debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '", <hashmap>)');
+    $self->debugPrint('("' . $infodb_file_path . '", "' . $infodb_key . '", <hashmap>)');
     my $infodb_handle = $self->open_infodb_write_handle($infodb_file_path, "append");
     if (!defined $infodb_handle) {
@@ -406 +410 @@
     my $infodb_handle = shift(@_);
     my $infodb_key = shift(@_);
-    $self->_debugPrint('(<handle>, "' . $infodb_key . '")');
+    $self->debugPrint('(<handle>, "' . $infodb_key . '")');
     # Delete the key from the "data" table
     my $safe_infodb_key = $self->_sqliteSafe($infodb_key);