Changeset 30338 for gs2-extensions/tdb/trunk/perllib/DBDrivers/JDBM.pm

Timestamp:

2015-12-03T15:44:18+13:00 (8 years ago)

Author:

jmt12

Message:

First versions of these drivers, that should be further refined to move repeated code to a parent class

File:

• gs2-extensions/tdb/trunk/perllib/DBDrivers/JDBM.pm (modified) (4 diffs)

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

@@ -32 +32 @@
 use util;
 use FileUtils;
-use DBDrivers::BaseDBDriver;
+# - OO inheritence
+use parent 'DBDrivers::BaseDBDriver';
 
 sub BEGIN
 {
-    @DBDrivers::JDBM::ISA = ( 'DBDrivers::BaseDBDriver' );
-}
-
+    if (!defined $ENV{'GSDLHOME'} || !defined $ENV{'GSDLOS'}) {
+        die("Error! Environment must be prepared by sourcing setup.bash\n");
+    }
+}
+
+
+## @function constructor
+#
 sub new
 {
     my $class = shift(@_);
-    return bless ($self, $class);
-}
+    my $self = DBDrivers::BaseDBDriver->new();
+    $self->{'default_file_extension'} = 'jdb';
+    bless($self, $class);
+    return $self;
+}
+## constructor() ##
+
 
 # -----------------------------------------------------------------------------
@@ -54 +65 @@
 # be constructed that changes between much of the code that is used
 
+# Handled by BaseDBDriver
+# sub get_infodb_file_path {}
+
+
+
 sub open_infodb_write_handle
 {
-  my $infodb_file_path = shift(@_);
-  my $opt_append = shift(@_);
-
-  my $jdbmwrap_jar = &util::filename_cat($ENV{'GSDLHOME'},"bin","java", "JDBMWrapper.jar");
-  my $jdbm_jar = &util::filename_cat($ENV{'GSDLHOME'},"lib","java", "jdbm.jar");
+    my $self = shift(@_);
+    my $infodb_file_path = shift(@_);
+    my $opt_append = shift(@_);
+    if (!defined $opt_append) {
+    $opt_append = '';
+    }
+    $self->_debugPrint('("' . $infodb_file_path . '","' . $opt_append . '")');
+
+    my $jdbmwrap_jar = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java", "JDBMWrapper.jar");
+    my $jdbm_jar = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"lib","java", "jdbm.jar");
 
   my $classpath = &util::pathname_cat($jdbmwrap_jar,$jdbm_jar);
@@ -76 +97 @@
   my $txt2jdb_cmd = "java -cp \"$classpath\" Txt2Jdb";
 
-  if ((defined $opt_append) && ($opt_append eq "append")) {
+  if ($opt_append eq "append") {
       $txt2jdb_cmd .= " -append";
       print STDERR "Append operation to $infodb_file_path\n";
@@ -113 +134 @@
 
   close($infodb_handle);
-}
-
-
-sub get_infodb_file_path
-{
-  my $collection_name = shift(@_);
-  my $infodb_directory_path = shift(@_);
-
-  my $infodb_file_extension = ".jdb";
-  my $infodb_file_name = &util::get_dirsep_tail($collection_name) . $infodb_file_extension;
-  return &util::filename_cat($infodb_directory_path, $infodb_file_name);
 }