Changeset 23052
- Timestamp:
- 2010-10-06T15:32:01+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/incremental-import.pl
r21733 r23052 95 95 print STDERR "Unable to use collection \"$collection\" within \"$collect_dir\"\n"; 96 96 exit -1; 97 } 98 97 } 98 my $gs_mode = "gs2"; 99 if ((defined $site) && ($site ne "")) { 100 $gs_mode = "gs3"; 101 } 102 99 103 if (!defined $archive_dir) { 100 $archive_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") 104 $archive_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives"); 101 105 } 102 106 my $etcdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc"); 103 107 # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes) 104 108 &util::rename_ldb_or_bdb_file(&util::filename_cat($archive_dir, "archiveinf-doc")); 105 109 106 my $archiveinf_doc = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archive_dir); 110 my $col_cfg_file; 111 if ($gs_mode eq "gs3") { 112 $col_cfg_file = &util::filename_cat($etcdir, "collectionConfig.xml"); 113 } else { 114 $col_cfg_file = &util::filename_cat($etcdir, "collect.cfg"); 115 } 116 117 my $collect_cfg = &colcfg::read_collection_cfg ($col_cfg_file, $gs_mode); 118 # get the database type for this collection from its configuration file (may be undefined) 119 my $infodbtype = $collect_cfg->{'infodbtype'} || &dbutil::get_default_infodb_type(); 120 121 my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir); 107 122 108 123 my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv); … … 121 136 } 122 137 123 if (-e $archiveinf_doc ) {138 if (-e $archiveinf_doc_file_path) { 124 139 $import_cmd .= " -incremental"; 125 140
Note:
See TracChangeset
for help on using the changeset viewer.