Changeset 28395 for main/trunk

Timestamp:

2013-10-14T09:59:05+13:00 (11 years ago)

Author:

davidb

Message:

Support for running under Cygwin added

Location:

main/trunk/greenstone2/perllib/dbutil

Files:

• gdbm.pm (modified) (2 diffs)
• gdbmtxtgz.pm (modified) (2 diffs)
• jdbm.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/dbutil/gdbm.pm

@@ -105 +105 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
+    $infodb_line =~ s/(\r\n)+$//; # more general than chomp
+
     if ($infodb_line =~ /^\[([^\]]+)\]$/)
     {
@@ -139 +141 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
-      chomp $infodb_line; # remove end of line 
+      # chomp $infodb_line; # remove end of line 
+      $infodb_line =~ s/(\r\n)+$//; # more general than chomp
 
       $infodb_map->{$infodb_line} = 1;

main/trunk/greenstone2/perllib/dbutil/gdbmtxtgz.pm

@@ -96 +96 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
+    $infodb_line =~ s/(\r\n)+$//; # more general than chomp
+
     if ($infodb_line =~ /^\[([^\]]+)\]$/)
     {
@@ -131 +133 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
+    $infodb_line =~ s/(\r\n)+$//; # more general than chomp
+
     if ($infodb_line =~ /^\[([^\]]+)\]$/)
     {

main/trunk/greenstone2/perllib/dbutil/jdbm.pm

@@ -50 +50 @@
   my $classpath = &util::pathname_cat($jdbmwrap_jar,$jdbm_jar);
 
+  if ($^O eq "cygwin") {
+      # Away to run a java program, using a binary that is native to Windows, so need
+      # Windows directory and path separators
+
+      $classpath = `cygpath -wp "$classpath"`;
+      chomp($classpath);
+      $classpath =~ s%\\%\\\\%g;
+  }
+
   my $infodb_file_handle = undef;
   my $txt2jdb_cmd = "java -cp \"$classpath\" Txt2Jdb";
@@ -64 +73 @@
   $infodb_file_path =~ s/\.jdb$//;
 
+  if ($^O eq "cygwin") {
+      $infodb_file_path = `cygpath -w "$infodb_file_path"`;
+      chomp($infodb_file_path);
+      $infodb_file_path =~ s%\\%\\\\%g;
+  }
+
   $txt2jdb_cmd .= " \"$infodb_file_path\"";
-
-##  print STDERR "**** txt2jdbm cmd = $txt2jdb_cmd\n\n";
 
   if (!open($infodb_file_handle, "| $txt2jdb_cmd"))
@@ -109 +122 @@
 
   my $classpath = &util::pathname_cat($jdbmwrap_jar,$jdbm_jar);
+
+  if ($^O eq "cygwin") {
+      # Away to run a java program, using a binary that is native to Windows, so need
+      # Windows directory and path separators
+      
+      $classpath = `cygpath -wp "$classpath"`;
+      chomp($classpath);
+      $classpath =~ s%\\%\\\\%g;
+
+      $infodb_file_path = `cygpath -w "$infodb_file_path"`;
+      chomp($infodb_file_path);
+      $infodb_file_path =~ s%\\%\\\\%g;
+  }
 
   my $jdb2txt_cmd = "java -cp \"$classpath\" Jdb2Txt";
@@ -119 +145 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
+    $infodb_line =~ s/(\r\n)+$//; # more general than chomp
+
     if ($infodb_line =~ /^\[([^\]]+)\]$/)
     {
@@ -157 +185 @@
   while (defined ($infodb_line = <PIPEIN>))
   {
-      chomp $infodb_line; # remove end of line 
+      # chomp $infodb_line; # remove end of line 
+      $infodb_line =~ s/(\r\n)+$//; # more general than chomp
 
       $infodb_map->{$infodb_line} = 1;
@@ -173 +202 @@
   my $infodb_key = shift(@_);
   my $infodb_map = shift(@_);
-  
+
   print $infodb_handle "[$infodb_key]\n";
   foreach my $infodb_value_key (keys(%$infodb_map))
@@ -240 +269 @@
     $infodb_file_path =~ s/\.jdb$//;
 
+    if ($^O eq "cygwin") {
+    # Away to run a java program, using a binary that is native to Windows, so need
+    # Windows directory and path separators
+    
+      $classpath = `cygpath -wp "$classpath"`;
+      chomp($classpath);
+      $classpath =~ s%\\%\\\\%g;
+
+      $infodb_file_path = `cygpath -w "$infodb_file_path"`;
+      chomp($infodb_file_path);
+      $infodb_file_path =~ s%\\%\\\\%g;
+    }
+
     my $cmd = "java -cp \"$classpath\" Txt2Jdb -append \"$infodb_file_path\"";