Changeset 21569
- Timestamp:
- 2010-01-21T16:38:50+13:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm
r21566 r21569 120 120 121 121 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 122 my $ gdbm_db = &util::filename_cat($index_text_directory,"live-$collect_tail.gdb");123 124 my $cmd = "gdbmget $ gdbm_db$dbkey";122 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", "live-$collect_tail", $index_text_directory); 123 124 my $cmd = "gdbmget $infodb_file_path $dbkey"; 125 125 126 126 if (open(GIN,"$cmd |") == 0) { … … 180 180 181 181 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 182 my $gdbm_db = &util::filename_cat($index_text_directory,"$collect_tail.gdb"); 183 184 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid); 182 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collect_tail, $index_text_directory); 183 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $docid); 185 184 my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string); 186 185 foreach my $k (keys %$doc_rec) { … … 240 239 241 240 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 242 my $ gdbm_db = &util::filename_cat($index_text_directory,"live-$collect_tail.gdb");243 244 my $cmd = "gdbmset \"$ gdbm_db\" \"$dbkey\" \"$metavalue\"";241 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", "live-$collect_tail", $index_text_directory); 242 243 my $cmd = "gdbmset \"$infodb_file_path\" \"$dbkey\" \"$metavalue\""; 245 244 246 245 my $status = system($cmd); … … 297 296 298 297 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 299 my $gdbm_db = &util::filename_cat($index_text_directory,"$collect_tail.gdb"); 300 301 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid); 298 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collect_tail, $index_text_directory); 299 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $docid); 302 300 my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string); 303 301 foreach my $k (keys %$doc_rec) { … … 336 334 ## print STDERR "**** ser dr\n$serialized_doc_rec\n\n\n"; 337 335 338 my $cmd = "gdbmset \"$ gdbm_db\" \"$docid\" \"$serialized_doc_rec\"";336 my $cmd = "gdbmset \"$infodb_file_path\" \"$docid\" \"$serialized_doc_rec\""; 339 337 340 338 my $status = system($cmd); … … 752 750 753 751 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 754 my $ gdbm_db = &util::filename_cat($index_text_directory,"live-$collect_tail.gdb");755 756 my $cmd = "gdbmdel \"$ gdbm_db\" \"$dbkey\"";752 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", "live-$collect_tail", $index_text_directory); 753 754 my $cmd = "gdbmdel \"$infodb_file_path\" \"$dbkey\""; 757 755 758 756 my $status = system($cmd); … … 808 806 809 807 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 810 my $gdbm_db = &util::filename_cat($index_text_directory,"$collect_tail.gdb"); 811 812 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid); 808 my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collect_tail, $index_text_directory); 809 my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $docid); 813 810 my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string); 814 811 foreach my $k (keys %$doc_rec) { … … 849 846 my $serialized_doc_rec = &dbutil::convert_infodb_hash_to_string($doc_rec); 850 847 851 my $cmd = "gdbmset \"$ gdbm_db\" \"$docid\" \"$serialized_doc_rec\"";848 my $cmd = "gdbmset \"$infodb_file_path\" \"$docid\" \"$serialized_doc_rec\""; 852 849 853 850 my $status = system($cmd);
Note:
See TracChangeset
for help on using the changeset viewer.