Changeset 23766 for main/trunk
- Timestamp:
- 2011-03-09T14:59:57+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm
r23761 r23766 118 118 119 119 # Obtain the collect dir 120 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 120 my $site = $self->{'site'}; 121 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 122 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 121 123 122 124 # Make sure the collection isn't locked by someone else … … 183 185 184 186 # Obtain the collect dir 185 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 187 my $site = $self->{'site'}; 188 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 189 ##my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 186 190 187 191 # Make sure the collection isn't locked by someone else … … 240 244 241 245 # Obtain the collect dir 242 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 246 my $site = $self->{'site'}; 247 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 248 ##my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 243 249 244 250 # Make sure the collection isn't locked by someone else … … 301 307 } 302 308 309 my $site = $self->{'site'}; 310 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 311 312 $gsdl_cgi->checked_chdir($collect_dir); 313 303 314 # Obtain the collect dir 304 my $collect_dir = &util::filename_cat($gsdlhome, "collect");315 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 305 316 306 317 # Make sure the collection isn't locked by someone else … … 320 331 my $index_text_directory = &util::filename_cat($collect_dir,$collect,"index","text"); 321 332 my $infodb_file_path = &dbutil::get_infodb_file_path($infodbtype, $collect_tail, $index_text_directory); 333 334 print STDERR "**** infodb file path = $infodb_file_path\n"; 335 print STDERR "***** infodb type = $infodbtype\n"; 322 336 323 337 # Read the docid entry … … 556 570 } 557 571 558 # Obtain the collect and archive dir 559 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 572 # Obtain the collect and archive dir 573 my $site = $self->{'site'}; 574 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 575 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 576 560 577 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 561 578 … … 807 824 808 825 # Obtain the collect and archive dir 809 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 826 my $site = $self->{'site'}; 827 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 828 829 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 810 830 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 811 831 … … 895 915 896 916 # Obtain the collect dir 897 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 917 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 918 my $site = $self->{'site'}; 919 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 898 920 899 921 # Make sure the collection isn't locked by someone else … … 954 976 955 977 # Obtain the collect dir 956 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 978 my $site = $self->{'site'}; 979 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 980 ## my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 957 981 958 982 # Make sure the collection isn't locked by someone else … … 1065 1089 } 1066 1090 1067 # Obtain the collect and archive dir 1068 my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 1091 # Obtain the collect and archive dir 1092 my $site = $self->{'site'}; 1093 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 1094 ##my $collect_dir = &util::filename_cat($gsdlhome, "collect"); 1069 1095 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 1070 1096
Note:
See TracChangeset
for help on using the changeset viewer.