Changeset 22485

Timestamp:

2010-07-22T18:55:18+12:00 (14 years ago)

Author:

ak19

Message:

1. Dr Bainbridge fixed the database perl modules to all have the method read_info_keys (which reads the keys from the database into a map), so that dbutil.pm can have the same as a generic method. 2. buildConfigxml.pm only writes out the defaultIndex if it is set (to prevent an Uninitialised Variable warning message from Perl).

Location:

main/trunk/greenstone2/perllib

Files:

• buildConfigxml.pm (modified) (1 diff)
• collConfigxml.pm (modified) (1 diff)
• dbutil.pm (modified) (2 diffs)
• dbutil/gdbmtxtgz.pm (modified) (1 diff)
• dbutil/mssql.pm (modified) (1 diff)
• dbutil/sqlite.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -331 +331 @@
 
     
-    &write_line('COLCFG', ["<defaultIndex shortname=\"", $defaultindex, "\" />"]);
+    #$defaultindex = "ZZ" if (!$defaultindex); # index allfields by default
+    if($defaultindex) {
+    &write_line('COLCFG', ["<defaultIndex shortname=\"", $defaultindex, "\" />"]);
+    }
 
 

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -152 +152 @@
     }
 
-    &Display; 
+    #&Display; 
     return $data;
 }

main/trunk/greenstone2/perllib/dbutil.pm

@@ -144 +144 @@
 }
 
+# This function, conceptually, would be better structured if it didn't
+# use return statements, as the database methods it calls do not
+# themselves return anything.
+# Note: if doing this, then the GDBM lines of code should be moved into
+# an 'else' clause
 
 sub read_infodb_file
@@ -177 +182 @@
 }
 
+sub read_infodb_keys
+{
+    my $infodb_type = shift(@_);
+    my $infodb_file_path = shift(@_);
+    my $infodb_map = shift(@_);
+    
+    if ($infodb_type eq "sqlite")
+    {
+    require dbutil::sqlite;
+    &dbutil::sqlite::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "gdbm-txtgz")
+    {
+    require dbutil::gdbmtxtgz;
+    &dbutil::gdbmtxtgz::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "jdbm")
+    {
+    require dbutil::jdbm;
+    &dbutil::jdbm::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "mssql")
+    {
+    require dbutil::mssql;
+    &dbutil::mssql::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    else {
+    # Use GDBM if the infodb type is empty or not one of the values above
+    require dbutil::gdbm;
+    &dbutil::gdbm::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+}
 
 sub read_infodb_entry

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

@@ -114 +114 @@
 }
 
+
+sub read_infodb_keys
+{
+  my $infodb_file_path = shift(@_);
+  my $infodb_map = shift(@_);
+
+  my $cmd = "gzip --decompress \"$infodb_file_path\"";
+
+  open (PIPEIN, "$cmd |") 
+  || die "Error: Couldn't open pipe from gzip: $!\n  $cmd\n";
+
+  my $infodb_line = "";
+  my $infodb_key = "";
+  while (defined ($infodb_line = <PIPEIN>))
+  {
+    if ($infodb_line =~ /^\[([^\]]+)\]$/)
+    {
+      $infodb_key = $1;
+    }
+    elsif ($infodb_line =~ /^-{70}$/)
+    {
+      $infodb_map->{$infodb_key} = 1;
+      $infodb_key = "";
+    }
+  }
+
+  close (PIPEIN);
+}
+
     
 sub write_infodb_entry

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

@@ -141 +141 @@
 
   print STDERR "******* mssql::read_infodb_file() TO BE IMPLEMENTED!\n";
+  print STDERR "******* See sqlite.pm for comparable implementation that has been coded up!\n";
+}
+
+sub read_infodb_keys
+{
+  my $infodb_file_path = shift(@_);
+  my $infodb_map = shift(@_);
+
+  print STDERR "******* mssql::read_infodb_keys() TO BE IMPLEMENTED!\n";
   print STDERR "******* See sqlite.pm for comparable implementation that has been coded up!\n";
 }

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

@@ -141 +141 @@
   }
 
+}
+
+
+sub read_infodb_keys
+{
+  my $infodb_file_path = shift(@_);
+  my $infodb_map = shift(@_);
+
+
+  my $keys_str = read_infodb_cmd($infodb_file_path,"SELECT key FROM data;");
+
+  my @keys = split(/\n/,$keys_str);
+
+  foreach my $key (@keys)
+  {
+      $infodb_map->{$key} = 1;
+  }
 }