Changeset 22589
- Timestamp:
- 2010-08-09T15:14:58+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/build
r21567 r22589 58 58 use util; 59 59 use cfgread; 60 use colcfg; 61 use dbutil; 60 62 61 63 # set up path - this allows for paths not to be supplied to system calls … … 69 71 70 72 # all the input option variables 71 my ($optionfile, $indextype, $append, $manifest, $remove_archives, $remove_import, $buildtype, $ maxdocs, @download, $collectdir, $site, $dontinstall, $save_archives, $out, $make_writable, $log_events, $event_log_file, $email_events, $mail_server, $statsfile, $event_header);73 my ($optionfile, $indextype, $append, $manifest, $remove_archives, $remove_import, $buildtype, $infodbtype, $maxdocs, @download, $collectdir, $site, $dontinstall, $save_archives, $out, $make_writable, $log_events, $event_log_file, $email_events, $mail_server, $statsfile, $event_header); 72 74 73 75 &parse_args (\@ARGV); … … 99 101 100 102 my $cdir = $collectdir; 103 my $gs_mode; 101 104 if (defined $site && $site =~ /\w/) 102 105 { 103 106 die "GSDL3HOME not set." unless $ENV{'GSDL3HOME'}; 104 107 $cdir = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect") unless $collectdir =~ /\w/; 108 $gs_mode = "gs3"; 105 109 } 106 110 else 107 111 { 108 112 $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/; 113 $gs_mode = "gs2"; 109 114 } 110 115 … … 113 118 my $buildingdir = &util::filename_cat ($cdir, $collection, "building"); 114 119 my $indexdir = &util::filename_cat ($cdir, $collection, "index"); 120 my $etcdir = &util::filename_cat ($cdir, $collection, "etc"); 115 121 my $bindir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin"); 116 122 … … 152 158 # if we've created a build log we'll copy it to the collection's etc 153 159 # directory 154 my ($ etcdir);160 my ($final_etcdir); 155 161 if ($dontinstall) { 156 $ etcdir = &util::filename_cat($collectdir, "etc", "build.log");162 $final_etcdir = &util::filename_cat($collectdir, "etc", "build.log"); 157 163 } else { 158 $ etcdir = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log");164 $final_etcdir = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log"); 159 165 } 160 166 161 &util::cp($outfile, $ etcdir);167 &util::cp($outfile, $final_etcdir); 162 168 } 163 169 … … 337 343 `echo $importdir ; ls $importdir `; 338 344 339 my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir); 345 my $col_cfg_file; 346 if ($gs_mode eq "gs3") { 347 $col_cfg_file = &util::filename_cat($etcdir, "collectionConfig.xml"); 348 } else { 349 $col_cfg_file = &util::filename_cat($etcdir, "collect.cfg"); 350 } 351 352 my $collect_cfg = &colcfg::read_collection_cfg ($col_cfg_file, $gs_mode); 353 # get the database type for this collection from its configuration file (may be undefined) 354 $infodbtype = $collect_cfg->{'infodbtype'} || &dbutil::get_default_infodb_type(); 355 356 my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir); 340 357 if (-e $archiveinf_doc_file_path) { 341 358 if (&has_content ($importdir)) { … … 463 480 &append_file ($out, "$outfile.import"); 464 481 465 my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir); 482 my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir); 483 466 484 if (-e $archiveinf_doc_file_path) { 467 485 print $out "$collection collection imported successfully\n\n"; … … 471 489 } 472 490 } else { 491 print $out "$archiveinf_doc_file_path not found. archives contents:\n"; 473 492 print $out `ls $archivedir`; 474 493
Note:
See TracChangeset
for help on using the changeset viewer.