Changeset 30370

Timestamp:

2016-01-12T11:00:53+13:00 (8 years ago)

Author:

jmt12

Message:

Reverting these back to the older but better supported ISA approach to declaring inheritance. Not even sure why I used the new parent mechanism (aside from possibly copying from tutorial)... can I still blame baby brain after 10 months?

Location:

main/trunk/greenstone2/perllib/DBDrivers

Files:

• 70HyphenFormat.pm (modified) (1 diff)
• BaseDBDriver.pm (modified) (1 diff)
• GDBM.pm (modified) (3 diffs)
• GDBMTXTGZ.pm (modified) (2 diffs)
• JDBM.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/DBDrivers/70HyphenFormat.pm

@@ -46 +46 @@
 use util;
 use FileUtils;
-use parent 'DBDrivers::BaseDBDriver';
+
+use DBDrivers::BaseDBDriver;
+
+BEGIN {
+    @DBDrivers::70HyphenFormat::ISA = ('DBDrivers::BaseDBDriver');
+}
 
 use constant {

main/trunk/greenstone2/perllib/DBDrivers/BaseDBDriver.pm

@@ -528 +528 @@
 
 
-## @function
-#
-sub mergeDatabases
-{
-    my $self = shift(@_);
-    gsprintf(STDERR, (caller(0))[3] . " {common.must_be_implemented}\n");
-    die("\n");
-}
-## mergeDatabase(string, string) => integer ##
-
 1;

main/trunk/greenstone2/perllib/DBDrivers/GDBM.pm

@@ -29 +29 @@
 use strict;
 
+# Libraries
+use util;
+use FileUtils;
+use DBDrivers::70HyphenFormat;
+
+
 BEGIN
 {
@@ -34 +40 @@
         die("Error! Environment not prepared. Have you sourced setup.bash?\n");
     }
+    @DBDrivers::GDBM::ISA = ('DBDrivers::70HyphenFormat');
 }
-
-# Libraries
-use util;
-use FileUtils;
-use parent 'DBDrivers::70HyphenFormat';
 
 
@@ -50 +52 @@
     $self->{'default_file_extension'} = 'gdb';
     # note: file separator agnostic
-    $self->{'executable_path'} = $ENV{'GSDLHOME'} . '/bin/' . $ENV{'GSDLOS'};
+    $self->{'executable_path'} = FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, 'bin', $ENV{'GSDLOS'});
     $self->{'read_executable'} = 'db2txt';
     $self->{'keyread_executable'} = 'gdbmkeys';

main/trunk/greenstone2/perllib/DBDrivers/GDBMTXTGZ.pm

@@ -32 +32 @@
 use util;
 use FileUtils;
-# - OO inheritence
-use parent 'DBDrivers::70HyphenFormat';
+use DBDrivers::70HyphenFormat;
+
+BEGIN
+{
+    @DBDrivers::GDBMTXTGZ::ISA = ('DBDrivers::70HyphenFormat');
+}
 
 
+## Constructor
 sub new
 {
@@ -43 +48 @@
     $self->{'default_file_extension'} = 'txt.gz';
     # note: file separator agnostic
-    $self->{'executable_path'} = $ENV{'GSDLHOME'} . '/bin/' . $ENV{'GSDLOS'};
+    $self->{'executable_path'} = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, 'bin', $ENV{'GSDLOS'});
     $self->{'read_executable'} = 'gzip --decompress --to-stdout';
     $self->{'keyread_executable'} = $self->{'read_executable'};

main/trunk/greenstone2/perllib/DBDrivers/JDBM.pm

@@ -32 +32 @@
 use util;
 use FileUtils;
-# - OO inheritence
-use parent 'DBDrivers::70HyphenFormat';
+use DBDrivers::70HyphenFormat;
 
 sub BEGIN
@@ -40 +39 @@
         die("Error! Environment must be prepared by sourcing setup.bash\n");
     }
+    @DBDrivers::JDBM::ISA = ('DBDrivers::70HyphenFormat');
 }
 
@@ -58 +58 @@
     # Massage paths for Cygwin. Away to run a java program, using a binary that
     # is native to Windows, so need Windows directory and path separators
+    # Note: this is done after the util::pathname_cat as that fuction can also
+    # (incorrectly) change file separators.
     if ($^O eq "cygwin") {
     $classpath = `cygpath -wp "$classpath"`;