Changeset 27504 for main/trunk
- Timestamp:
- 2013-05-29T09:49:08+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm
r27501 r27504 610 610 } 611 611 612 # we now create the directory as part of this call, to try and avoid race 613 # conditions caused by parallel processing [jmt12] 612 614 sub get_new_doc_dir{ 613 615 my $self = shift (@_); … … 625 627 626 628 my $doc_dir_num = 0; 627 629 my $created_directory = 0; 628 630 do { 629 631 $doc_dir .= "/" if $doc_dir_num > 0; … … 639 641 $doc_dir_num++; 640 642 } 641 } while ($doc_dir_rest ne "" && 642 ((-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) || 643 ($working_info->size() >= 1024 && $doc_dir_num < 2))); 643 my $new_dir = &FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir'); 644 $created_directory = &FileUtils::makeAllDirectories($new_dir); 645 #rint STDERR "[DEBUG] create directory: $new_dir => $created_directory\n"; 646 #rint STDERR "[DEBUG] rest: $doc_dir_rest\n"; 647 #rint STDERR "[DEBUG] working_info->size(): " . $working_info->size() . " [ < 1024 ?]\n"; 648 #rint STDERR "[DEBUG] doc_dir_num: " . $doc_dir_num . "\n"; 649 } while ($doc_dir_rest ne "" && $created_directory == 0 && $doc_dir_num < 2); 650 # what is working_info, because it's values seems to start at 1? 651 # ($working_info->size() >= 1024) 644 652 my $i = 1; 645 653 my $doc_dir_base = $doc_dir; 646 while ( -d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) {654 while ($created_directory == 0 && $i < 256) { 647 655 $doc_dir = "$doc_dir_base-$i"; 656 $created_directory = &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir')); 648 657 $i++; 649 658 } 650 659 660 if (!$created_directory) 661 { 662 die("Error! Failed to create directory for document: " . $doc_dir_base . "\n"); 663 } 664 651 665 return "$doc_dir.dir"; 652 666 } … … 843 857 print $rss_fh " <link>_httpdomain__httpcollection_/document/$oid</link>\n"; 844 858 print $rss_fh "</item>\n"; 845 &FileUtils::closeFileHandle($rss_f h);859 &FileUtils::closeFileHandle($rss_filename, $rss_fh); 846 860 } 847 861 else {
Note:
See TracChangeset
for help on using the changeset viewer.