Changeset 2628
- Timestamp:
- 07/12/08 12:55:12 (3 months ago)
- Files:
-
- Trunk/Scripts/Audio_scripts/UserSubmission.pm (modified) (1 diff)
- Trunk/Scripts/Audio_scripts/UserSubmission/README.pm (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/Scripts/Audio_scripts/UserSubmission.pm
r2627 r2628 128 128 ValidateFilenames($parms,$AudioDirNameWithPath) || confess "UserSubmission error: $?" ; 129 129 print "!!!!!!QuarantineDir:$QuarantineDir/$audio_dir_name/README\n"; 130 my $readme = UserSubmission::README->new($parms, "$QuarantineDir/$audio_dir_name/README"); 130 # !!!!! 131 # my $readme = UserSubmission::README->new($parms, "$QuarantineDir/$audio_dir_name/README"); 132 my $readme = UserSubmission::README->new($parms, "$QuarantineDir/$audio_dir_name/README",$audio_dir_name); 133 # !!!!!! 131 134 print "!!!!$audio_dir_name:UserSubmission-README says:".$readme->getSamplingrate ."-".$readme->getSamplingrateformat."-".$readme->getFiletype.";dialect:".$readme->getDialect."\n\n" if $debug; 132 135 Trunk/Scripts/Audio_scripts/UserSubmission/README.pm
r2623 r2628 35 35 #################################################################### 36 36 sub new { 37 my ($class, $parms, $ReadmeWithPath ) = @_;38 my $self = _ValidateREADME($parms, $ReadmeWithPath );37 my ($class, $parms, $ReadmeWithPath,$audio_dir_name) = @_; 38 my $self = _ValidateREADME($parms, $ReadmeWithPath,$audio_dir_name); 39 39 bless($self,$class); 40 40 return $self; … … 82 82 #################################################################### 83 83 sub _ValidateREADME { 84 my ($parms, $ReadmeWithPath ) = @_;84 my ($parms, $ReadmeWithPath,$audio_dir_name) = @_; 85 85 my $debug = $$parms{"debug"}; 86 86 my (%readmecontents, $title); … … 137 137 } 138 138 close README; 139 if ( (($readmecontents{'language'}) eq "") or (!defined($readmecontents{'language'})) ){ 140 confess "no language defined\n"; 139 if ( (!defined($readmecontents{'language'})) or (($readmecontents{'language'}) eq "") ){ 140 if ($audio_dir_name =~ /voxforgeivr/i) { 141 $readmecontents{'language'} = 'EN'; 142 } else { 143 confess "no language defined\n"; 144 } 141 145 # !!!!!! 142 146 # if you have bulk updates for *one* language, with no Language set in the README (usually older submissions) set it here: