Changeset 21567

Timestamp:

2010-01-21T16:25:53+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed all places explicitly using "archiveinf-doc.gdb" or "archiveinf-src.gdb" to use the dbutil::get_infodb_file_path() function... you know, the one that should have been used originally? In preparation for making it possible to use something other than GDBM, and part of making the code less GDBM-specific.

File:

• main/trunk/greenstone2/bin/script/build (modified) (3 diffs)

main/trunk/greenstone2/bin/script/build

@@ -337 +337 @@
     `echo $importdir ; ls $importdir `;
 
-    if (-e &util::filename_cat ($archivedir, "archiveinf-doc.gdb")) {
+    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+    if (-e $archiveinf_doc_file_path) {
     if (&has_content ($importdir)) {
         if ($buildtype eq "build") {
@@ -360 +361 @@
         }
         &gsdl_import();
-        if (&has_content ($archivedir, "^archiveinf-doc.gdb\$")) {
+        if (&has_content ($archivedir, "^archiveinf-doc\..*\$")) {
         &gsdl_build();
         } else {
@@ -462 +463 @@
     &append_file ($out, "$outfile.import");
 
-    if (-e &util::filename_cat ($archivedir, "archiveinf-doc.gdb")) {
+    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+    if (-e $archiveinf_doc_file_path) {
     print $out "$collection collection imported successfully\n\n";
     if ($remove_import) {