voxforge.org
VoxForge Dev
Home · Read · Listen · Forums · Dev · Downloads · About

Changeset 2158

Show
Ignore:
Timestamp:
04/30/07 22:23:11 (2 years ago)
Author:
kmaclean
Message:

Scripts - cleanup parameter passing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Trunk/Scripts/AcousticModel_scripts/AcousticModel.pm

    r2115 r2158  
    3333#################################################################### 
    3434sub Create { 
    35         my ($parameters) = @_; 
    36         my %parms = %$parameters; 
    37         my $debug = $parms{"debug"}; 
    38         my $Nightly_dirname = $parms{"Nightly_dirname"}; 
    39         my $Nightly_dir = ("/data/svn-mirror/Nightly_Builds"); 
    40         my $promptsfile = $parms{"PromptsFile"}; 
    41         my $HTKdir = $parms{"HTK_dir"}; 
    42         my $HTKbin = $parms{"HTKBin"}; 
    43         my $LexiconDirectory = $parms{"LexiconDirectory"};               
     35        my ($parms) = @_; 
     36                my $debug = $$parms{"debug"}; 
     37                my $HTKdir = $$parms{"HTK_dir"}; 
     38                my $HTKbin = $$parms{"HTKBin"}; 
     39                my $LexiconDirectory = $$parms{"LexiconDirectory"};              
    4440                 
    4541        # run Acoustic Model Creation Script for 16kHz-16bit 
    4642        my $rate = "16kHz_16bit"; # !!!!!! need to change all directories with underscore (i.e. 16kHz_16bit) to use a dash (i.e. 16kHz-16bit) - too confusing 
    4743                print "\n\n***creating $rate Acoustic Model\n\n"; 
    48                 MasterPrompts::Fix($parameters,$rate); 
     44                MasterPrompts::Fix($parms,$rate); 
    4945                $command = ("cd $HTKdir && \./Compile_AcousticModel.sh $HTKbin $LexiconDirectory $debug"); print "$command\n" if $debug;        system($command) == 0 or die "system $command failed: $?";       
    5046                my $Nightly_subdir =("HTK/$rate/MFCC_O_D"); 
    51                 Nightly::CreateDir($parameters, $Nightly_subdir); 
    52                 QuickStart::Process($parameters, $Nightly_subdir); # creating only one QuickStart using 16kHz_16bit Acoustic Models 
    53                 Nightly::Process($parameters, $Nightly_subdir); 
     47                Nightly::CreateDir($parms, $Nightly_subdir); 
     48                QuickStart::Process($parms, $Nightly_subdir); # creating only one QuickStart using 16kHz_16bit Acoustic Models 
     49                Nightly::Process($parms, $Nightly_subdir); 
    5450                 
    5551        # run Acoustic Model Creation Script for 8kHz-16bit 
    5652        $rate = "8kHz_16bit"; # !!!!!! need to change all directories with underscore (i.e. 8kHz_16bit) to use a dash (i.e. 8kHz-16bit) - too confusing 
    5753                print "\n\n***creating $rate Acoustic Model\n\n"; 
    58                 MasterPrompts::Fix($parameters,$rate); 
     54                MasterPrompts::Fix($parms,$rate); 
    5955                $command = ("cd $HTKdir && \./Compile_AcousticModel.sh $HTKbin $LexiconDirectory $debug"); print "$command\n" if $debug;        system($command) == 0 or die "system $command failed: $?";       
    6056                $Nightly_subdir =("HTK/$rate/MFCC_O_D"); 
    61                 Nightly::Process($parameters, $Nightly_subdir); 
     57                Nightly::Process($parms, $Nightly_subdir); 
    6258} 
    63591; 

  • Trunk/Scripts/AcousticModel_scripts/AcousticModel/Nightly.pm

    r2115 r2158  
    3030#################################################################### 
    3131sub CreateDir { 
    32         my ($parameters, $Nightly_subdir) = @_; 
    33         my %parms = %$parameters; 
    34         my $debug = $parms{"debug"}; 
    35         my $Nightly_dirname = $parms{"Nightly_dirname"}; 
     32        my ($parms, $Nightly_subdir) = @_; 
     33                my $debug = $$parms{"debug"}; 
     34                my $Nightly_dirname = $$parms{"Nightly_dirname"}; 
    3635 
    3736        # cleanup previous run - usually there was some sort of error in previous run 
    …… 
    4746         
    4847sub Process { 
    49         my ($parameters, $Nightly_subdir) = @_; 
    50         my %parms = %$parameters; 
    51         my $debug = $parms{"debug"};     
    52         my $Nightly_dirname = $parms{"Nightly_dirname"}; 
    53          
    54         my $MirroringScripts_dir = $parms{"MirroringScripts_dir"};       
    55         my $HTKdir = $parms{"HTK_dir"};          
     48        my ($parms, $Nightly_subdir) = @_; 
     49                my $debug = $$parms{"debug"};    
     50                my $Nightly_dirname = $$parms{"Nightly_dirname"}; 
     51                my $MirroringScripts_dir = $$parms{"MirroringScripts_dir"};      
     52                my $HTKdir = $$parms{"HTK_dir"};                 
    5653        print "creating: $Nightly_dirname\n"; 
    5754        $command = ("mkdir -p $Nightly_dirname/$Nightly_subdir $Nightly_dirname/$Nightly_subdir/etc"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";   

  • Trunk/Scripts/AcousticModel_scripts/AcousticModel/QuickStart.pm

    r2115 r2158  
    3131#################################################################### 
    3232sub Process { 
    33         my ($parameters, $Nightly_subdir) = @_; 
    34         my %parms = %$parameters; 
    35         my $debug = $parms{"debug"}; 
    36         my $QSdir = $parms{"QSdir"}; 
    37         my $Nightly_dirname = $parms{"Nightly_dirname"}; 
    38         my $HTKdir = $parms{"HTK_dir"};                  
     33        my ($parms, $Nightly_subdir) = @_; 
     34                my $debug = $$parms{"debug"}; 
     35                my $QSdir = $$parms{"QSdir"}; 
     36                my $Nightly_dirname = $$parms{"Nightly_dirname"}; 
     37                my $HTKdir = $$parms{"HTK_dir"};                         
    3938        $command = ("cp -r $QSdir $Nightly_dirname");  print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";   
    4039        # Linux 

  • Trunk/Scripts/AcousticModel_scripts/Prompts/MasterPrompts.pm

    r2132 r2158  
    2929sub Fix { 
    3030        my ($parms,$targetrate) = @_; 
    31         my $debug = $$parms{"debug"}; 
    32         my $prompts_file = $$parms{"PromptsFile"}; 
    33         my $HTKdir = $$parms{"HTK_dir"};       
    34         my $AudioDirectory = $$parms{"AudioDirectory"};                
     31               my $debug = $$parms{"debug"}; 
     32               my $prompts_file = $$parms{"PromptsFile"}; 
     33               my $HTKdir = $$parms{"HTK_dir"};        
     34               my $AudioDirectory = $$parms{"AudioDirectory"};                 
    3535        my $line; 
    3636        open(INPUT, "$prompts_file") or die ("cannot open $prompts_file for reading"); # open for input 

  • Trunk/Scripts/Audio_scripts/Repository.pm

    r2136 r2158  
    4141sub Main { 
    4242        my ($parms ) = @_; 
    43         my $debug = $$parms{"debug"};    
    44         my $QuarantineDir = $$parms{"QuarantineDir"};    
    45         my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};      
    46         my $ScriptsDirectory = $$parms{"ScriptsDirectory"};      
    47         my $AudioDirectory = $$parms{"AudioDirectory"};                  
     43                my $debug = $$parms{"debug"};    
     44                my $QuarantineDir = $$parms{"QuarantineDir"};    
     45                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};      
     46                my $ScriptsDirectory = $$parms{"ScriptsDirectory"};      
     47                my $AudioDirectory = $$parms{"AudioDirectory"};          
     48                         
    4849        my($dirlist) = ReadDir($ToBeProcessedDir); # $dirlist is a pointer to array created in ReadDir 
    4950        foreach my $AudioDirName (@$dirlist) {   

  • Trunk/Scripts/Audio_scripts/Repository/MFCC.pm

    r1920 r2158  
    2929 
    3030sub Create { 
    31         my ($parameters, $AudioDirectoryParms ) = @_; 
    32         my %parms = %$parameters; 
    33                 my $debug = $parms{"debug"};     
    34                 my $path_main = $parms{"path_main"}; 
    35                 my $path_mfcc = $parms{"path_mfcc"}; 
    36                 my $audio_subdirectory = $parms{"AudioSubdirectory"};    
    37                 my $HTK_ParameterKindWithQualifiers = $parms{"HTK_ParameterKind"}; 
    38                 my $AudioScripts_dir = $parms{"AudioScripts_dir"}; 
    39         my %AudioDirParms = %$AudioDirectoryParms; 
    40                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"};  
     31        my ($parms, $AudioDirParms ) = @_; 
     32                my $debug = $$parms{"debug"};    
     33                my $path_main = $$parms{"path_main"}; 
     34                my $path_mfcc = $$parms{"path_mfcc"}; 
     35                my $audio_subdirectory = $$parms{"AudioSubdirectory"};   
     36                my $HTK_ParameterKindWithQualifiers = $$parms{"HTK_ParameterKind"}; 
     37                my $AudioScripts_dir = $$parms{"AudioScripts_dir"}; 
     38 
     39                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"};         
    4140         
    4241        #cleanup required before copy (cleanup .svn files???) 
    …… 
    5655# !!!!!! 
    5756#       $command = ("cd $AudioScripts_dir/Repository && ./ConvertWav2mfc.pl $path_mfcc/$audio_dir_name/mfc $debug"); print "$command\n" if $debug;  system($command) == 0 or die "system $command failed: $?";       
    58         ConvertWav2mfc(\%parms, \%AudioDirParms)|| die "MFCC\.pm error: $?"; 
     57        ConvertWav2mfc($parms, $AudioDirParms)|| die "MFCC\.pm error: $?"; 
    5958# !!!!!!         
    6059        #update properties 
    …… 
    6665 
    6766sub ConvertWav2mfc { 
    68         my ($parameters, $AudioDirectoryParms ) = @_;    
    69         my %parms = %$parameters; 
    70                 my $debug = $parms{"debug"};     
    71                 my $path_mfcc = $parms{"path_mfcc"};     
    72                 my $HTKbin = $parms{"HTKBin"}; 
    73                 my $Repository_dir = $parms{"Repository_dir"}; 
    74         my %AudioDirParms = %$AudioDirectoryParms; 
    75                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"};                  
     67        my ($parms, $AudioDirParms ) = @_;       
     68                my $debug = $$parms{"debug"};    
     69                my $path_mfcc = $$parms{"path_mfcc"};    
     70                my $HTKbin = $$parms{"HTKBin"}; 
     71                my $Repository_dir = $$parms{"Repository_dir"}; 
     72 
     73                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"};                         
    7674        # read in command line arguments 
    7775        my $directory = "$path_mfcc/$audio_dir_name/mfc"; 

  • Trunk/Scripts/Audio_scripts/Repository/Main.pm

    r1518 r2158  
    2626 
    2727sub Process {    
    28         my ($parameters, $AudioDirectoryParms ) = @_; 
    29         my %parms = %$parameters; 
    30                 my $debug = $parms{"debug"};     
    31                 my $path_original = $parms{"path_original"};     
    32                 my $path_main = $parms{"path_main"}; 
    33                 my $audio_subdirectory = $parms{"AudioSubdirectory"}; 
    34                 my $downsample_rate = $parms{"DownsampleRate"}; 
    35                 my $downsample_bits_per_sample =  $parms{"DownsampleBitsPerSample"}; 
    36                 my $AudioScripts_dir = $parms{"AudioScripts_dir"}; 
    37         my %AudioDirParms = %$AudioDirectoryParms; 
    38                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"}; 
    39                 my $OriginalSamplingRate = $AudioDirParms{"samplingrate"}; 
     28        my ($parms, $AudioDirParms ) = @_; 
     29                my $debug = $$parms{"debug"};    
     30                my $path_original = $$parms{"path_original"};    
     31                my $path_main = $$parms{"path_main"}; 
     32                my $audio_subdirectory = $$parms{"AudioSubdirectory"}; 
     33                my $downsample_rate = $$parms{"DownsampleRate"}; 
     34                my $downsample_bits_per_sample =  $$parms{"DownsampleBitsPerSample"}; 
     35                my $AudioScripts_dir = $$parms{"AudioScripts_dir"}; 
     36 
     37                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     38                my $OriginalSamplingRate = $$AudioDirParms{"samplingrate"}; 
    4039 
    4140        # copy audio files from Original directory to Main directory 

  • Trunk/Scripts/Audio_scripts/Repository/Original.pm

    r1518 r2158  
    2626 
    2727sub Process { 
    28         my ($parameters, $AudioDirectoryParms ) = @_; 
    29         my %parms = %$parameters; 
    30                 my $debug = $parms{"debug"};             
    31                 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"};  
    32                 my $path_original = $parms{"path_original"}; 
    33         my %AudioDirParms = %$AudioDirectoryParms; 
    34                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"}; 
    35                 my $OriginalSamplingRate = $AudioDirParms{"samplingrate"}; 
    36                 my $OriginalBitsPerSample = $AudioDirParms{"samplingrateformat"}; 
    37                 my $dialect = $AudioDirParms{"dialect"}; 
     28        my ($parms, $AudioDirParms ) = @_; 
     29                my $debug = $$parms{"debug"};            
     30                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};  
     31                my $path_original = $$parms{"path_original"}; 
     32 
     33                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     34                my $OriginalSamplingRate = $$AudioDirParms{"samplingrate"}; 
     35                my $OriginalBitsPerSample = $$AudioDirParms{"samplingrateformat"}; 
     36                my $dialect = $$AudioDirParms{"dialect"}; 
    3837         
    3938        # copy ToBeProcessed directory to Working Copy 

  • Trunk/Scripts/Audio_scripts/UserSubmission.pm

    r1868 r2158  
    5050#################################################################### 
    5151sub Main { 
    52         my ($parameters ) = @_; 
    53         my %parms = %$parameters; 
    54         my $debug = $parms{"debug"}; 
    55         my $QuarantineDir = $parms{"QuarantineDir"}; 
     52        my ($parms ) = @_; 
     53                my $debug = $$parms{"debug"}; 
     54                my $QuarantineDir = $$parms{"QuarantineDir"}; 
    5655        my($tarlist) = ReadTarDir($QuarantineDir); # $tarlist is a pointer to array created in ReadTarDir 
    5756        my %directorynames; 
    …… 
    6261                $AudioDirParms {"audio_dir_name"} = $audio_dir_name; 
    6362                $command = ("rm -rf $QuarantineDir/$audio_dir_name");  print "$command\n" if $debug; system($command); # remove ToBeProcessed directory - if it exists 
    64                 runClamAV(\%parms, $tarfile) || die "UserSubmission error: $?" ; # runs ClamAV and extracts gzipped tar or Zip file 
    65                 Convert2Unix(\%parms, \%AudioDirParms);  
    66                 ValidateFilenames(\%parms, \%AudioDirParms) || die "UserSubmission error: $?" ;  
    67                 ($AudioDirParms{"samplingrate"}, $AudioDirParms{"samplingrateformat"},  $AudioDirParms{"filetype"}, $AudioDirParms{"dialect"}) = UserSubmission::README::Process(\%parms, \%AudioDirParms); # can't put "|| die "UserSubmission error: $?"" becuase changes this to scalar context, and only last item in list is transferred! 
     63                runClamAV($parms, $tarfile) || die "UserSubmission error: $?" ; # runs ClamAV and extracts gzipped tar or Zip file 
     64                Convert2Unix($parms, \%AudioDirParms);  
     65                ValidateFilenames($parms, \%AudioDirParms) || die "UserSubmission error: $?" ;  
     66                ($AudioDirParms{"samplingrate"}, $AudioDirParms{"samplingrateformat"},  $AudioDirParms{"filetype"}, $AudioDirParms{"dialect"}) = UserSubmission::README::Process($parms, \%AudioDirParms); # can't put "|| die "UserSubmission error: $?"" becuase changes this to scalar context, and only last item in list is transferred! 
    6867                print "UserSubmission-README says:".$AudioDirParms{"samplingrate"}."-".$AudioDirParms{"samplingrateformat"}."-".$AudioDirParms{"filetype"}.";dialect:".$AudioDirParms{"dialect"}."\n\n" if $debug; 
    69                 UserSubmission::AUDIO::WavValidation(\%parms, \%AudioDirParms) || die "UserSubmission error: $?" ;    #checks that audio rates in README match actual files    
    70                 UserSubmission::PROMPTS::Clean(\%parms, \%AudioDirParms)   || die "UserSubmission error: $?"; # creates reformatted prompts file for processing with HVite and later merging into Master_Prompts 
    71                 UserSubmission::PROMPTS::Validation(\%parms, \%AudioDirParms)  || die "UserSubmission error: $?"; # use HDMan to run prompts against VoxForge Dictionnary 
    72                 UserSubmission::AUDIO::Audio2PromptsValidation(\%parms, \%AudioDirParms)  || die "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
     68                UserSubmission::AUDIO::WavValidation($parms, \%AudioDirParms) || die "UserSubmission error: $?" ;     #checks that audio rates in README match actual files    
     69                UserSubmission::PROMPTS::Clean($parms, \%AudioDirParms)   || die "UserSubmission error: $?"; # creates reformatted prompts file for processing with HVite and later merging into Master_Prompts 
     70                UserSubmission::PROMPTS::Validation($parms, \%AudioDirParms)  || die "UserSubmission error: $?"; # use HDMan to run prompts against VoxForge Dictionnary 
     71                UserSubmission::AUDIO::Audio2PromptsValidation($parms, \%AudioDirParms)  || die "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
    7372                $directorynames{$audio_dir_name} = [$AudioDirParms{"samplingrate"}, $AudioDirParms{"samplingrateformat"}, $AudioDirParms{"filetype"}]; 
    7473        } 
    …… 
    7776                my $pointer = $directorynames{$audio_dir_name}; 
    7877                my($samplingrate, $samplingrateformat, $filetype) = @$pointer; 
    79                 Copy2ToBeProcessed(\%parms, $audio_dir_name)  || die "UserSubmission error: $?" ; #commit audio to Trunk/Original 
     78                Copy2ToBeProcessed($parms, $audio_dir_name)  || die "UserSubmission error: $?" ; #commit audio to Trunk/Original 
    8079        } 
    8180        # Print Summary 
    …… 
    8988 
    9089sub Convert2Unix { 
    91         my ($parameters, $AudioDirectoryParms ) = @_; 
    92                 my %parms = %$parameters; 
    93                 my $debug = $parms{"debug"}; 
    94                 my $QuarantineDir = $parms{"QuarantineDir"}; 
     90        my ($parms, $AudioDirectoryParms ) = @_; 
     91                my $debug = $$parms{"debug"}; 
     92                my $QuarantineDir = $$parms{"QuarantineDir"}; 
    9593        my %AudioDirParms = %$AudioDirectoryParms; 
    9694                my $audio_dir_name =  $AudioDirParms{"audio_dir_name"};  
    …… 
    141139sub runClamAV { 
    142140        # !!!!!! to do look at Archive::Extract Cpan Module to handle tar tgz tar.gz and zip extractions ... 
    143         my ($parameters, $tarfile) = @_; 
    144                 my %parms = %$parameters; 
    145                 my $debug = $parms{"debug"};     
    146                 my $QuarantineDir = $parms{"QuarantineDir"}; 
     141        my ($parms, $tarfile) = @_; 
     142                my $debug = $$parms{"debug"};    
     143                my $QuarantineDir = $$parms{"QuarantineDir"}; 
    147144        my (@clamscan_output, $clamscan_results); 
    148145        #$command = ("freshclam"); print "$command\n"; system($command) == 0 or die "system $command failed: $?";  
    …… 
    207204 
    208205sub ValidateFilenames { 
    209         my ($parameters, $AudioDirectoryParms) = @_; 
    210         my %parms = %$parameters; 
    211                 my $debug = $parms{"debug"}; 
     206        my ($parms, $AudioDirectoryParms) = @_; 
     207                my $debug = $$parms{"debug"}; 
    212208        # check that user used PROMPTS & README for filenames 
    213209        # windows defaults to prompts.txt 
    214210        # look into converting to XML and run through XML schema validation ... 
    215         UserSubmission::README::ValidateFileName($parameters, $AudioDirectoryParms) || die "UserSubmission error: $?" ; 
    216         UserSubmission::LICENSE::ValidateFileName($parameters, $AudioDirectoryParms) || die "UserSubmission error: $?" ;       
    217         UserSubmission::PROMPTS::ValidateFileName($parameters, $AudioDirectoryParms) || die "UserSubmission error: $?" ;       
     211        UserSubmission::README::ValidateFileName($parms, $AudioDirectoryParms) || die "UserSubmission error: $?" ; 
     212        UserSubmission::LICENSE::ValidateFileName($parms, $AudioDirectoryParms) || die "UserSubmission error: $?" ;    
     213        UserSubmission::PROMPTS::ValidateFileName($parms, $AudioDirectoryParms) || die "UserSubmission error: $?" ;    
    218214} 
    219215 
    220216sub Copy2ToBeProcessed { 
    221         my ($parameters, $audio_dir_name) = @_; 
    222         my %parms = %$parameters; 
    223                 my $debug = $parms{"debug"}; 
    224                 my $QuarantineDir = $parms{"QuarantineDir"};     
    225                 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"};               
     217        my ($parms, $audio_dir_name) = @_; 
     218                my $debug = $$parms{"debug"}; 
     219                my $QuarantineDir = $$parms{"QuarantineDir"};    
     220                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};              
    226221        $command = ("mkdir $QuarantineDir/$audio_dir_name/wav");  print "$command\n" if $debug; system($command);   
    227222        $command = ("mv -f $QuarantineDir/$audio_dir_name/*.wav $QuarantineDir/$audio_dir_name/wav"); print "$command\n" if $debug;   system($command) == 0 or die "system $command failed: $?"; 
    …… 
    236231                $command = ("cp -f $QuarantineDir/$audio_dir_name/* $ToBeProcessedDir/$audio_dir_name/etc 1>/dev/null 2>/dev/null");  system($command) ; # return value usually says "cp: omitting directory `/data/quarantine/granthulbert-ar-01032007/wav'" 
    237232        } 
    238         UserSubmission::LICENSE::AddGPLLicense(\%parms, $audio_dir_name) || die "UserSubmission error: $?" ; 
     233        UserSubmission::LICENSE::AddGPLLicense($parms, $audio_dir_name) || die "UserSubmission error: $?" ; 
    239234        if ($debug) {    
    240235                $command = ("mv -f $ToBeProcessedDir/$audio_dir_name/etc/LICENSE $ToBeProcessedDir/$audio_dir_name");   print "$command\n" ;system($command) ;   
    …… 
    248243 
    249244sub Cleanup { 
    250         my ($parameters, $AudioDirectoryParms) = @_; 
    251                 my %parms = %$parameters; 
    252                 my $debug = $parms{"debug"}; 
    253                 my $QuarantineDir = $parms{"QuarantineDir"};     
    254                 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"}; 
     245        my ($parms, $AudioDirectoryParms) = @_; 
     246                my $debug = $$parms{"debug"}; 
     247                my $QuarantineDir = $$parms{"QuarantineDir"};    
     248                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"}; 
    255249        my %AudioDirParms = %$AudioDirectoryParms; 
    256250                my $audio_dir_name =  $AudioDirParms{"audio_dir_name"};          

  • Trunk/Scripts/Audio_scripts/UserSubmission/AUDIO.pm

    r2110 r2158  
    2727 
    2828sub WavValidation { 
    29         my ($parameters,  $AudioDirectoryParms) = @_; 
    30         my %parms = %$parameters; 
    31                 my $debug = $parms{"debug"}; 
    32                 my $QuarantineDir = $parms{"QuarantineDir"};     
    33         my %AudioDirParms = %$AudioDirectoryParms; 
    34                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"}; 
    35                 my $samplingrate = $AudioDirParms{"samplingrate"}; 
    36                 my $samplingrateformat = $AudioDirParms{"samplingrateformat"};                  
     29        my ($parms,  $AudioDirParms) = @_; 
     30               my $debug = $$parms{"debug"}; 
     31                my $QuarantineDir = $$parms{"QuarantineDir"};   
     32 
     33               my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     34                my $samplingrate = $$AudioDirParms{"samplingrate"}; 
     35                my $samplingrateformat = $$AudioDirParms{"samplingrateformat"};         
     36                                
    3737        print "#######AUDIO:$audio_dir_name, $samplingrate, $samplingrateformat\n" if $debug; 
    3838        $samplingrate =~ s/kHz//; 
    …… 
    7979 
    8080sub Audio2PromptsValidation { 
    81         my ($parameters, $AudioDirectoryParms ) = @_; 
    82         my %parms = %$parameters; 
    83                 my $debug = $parms{"debug"}; 
    84                 my $QuarantineDir = $parms{"QuarantineDir"}; 
    85                 my $LexiconDirectory = $parms{"LexiconDirectory"};     
    86                 my $HTKBin = $parms{"HTKBin"};         
    87                 my $AudioScripts_dir = $parms{"AudioScripts_dir"};     
    88                 my $AMCreate_scripts_dir = $parms{"HTK_dir"};            
    89         my %AudioDirParms = %$AudioDirectoryParms; 
    90                 my $audio_dir_name =  $AudioDirParms{"audio_dir_name"};         
     81        my ($parms, $AudioDirParms ) = @_; 
     82               my $debug = $$parms{"debug"}; 
     83                my $QuarantineDir = $$parms{"QuarantineDir"}; 
     84                my $LexiconDirectory = $$parms{"LexiconDirectory"};     
     85                my $HTKBin = $$parms{"HTKBin"};        
     86                my $AudioScripts_dir = $$parms{"AudioScripts_dir"};    
     87                my $AMCreate_scripts_dir = $$parms{"HTK_dir"};         
     88 
     89               my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"};         
     90                 
    9191        print "Audio2PromptsValidation:$audio_dir_name\n" if $debug;     
    9292        $command = ("cd $AudioScripts_dir/UserSubmission && rm -rf ./interim_files ./logs"); print "$command\n" if $debug; system($command);  

  • Trunk/Scripts/Audio_scripts/UserSubmission/LICENSE.pm

    r1587 r2158  
    2626 
    2727sub AddGPLLicense { 
    28         my ($parameters, $audio_dir_name ) = @_; 
    29         my %parms = %$parameters; 
    30                 my $debug = $parms{"debug"}; 
    31                 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"};       
    32                 my $UserSubmission_dir = $parms{"UserSubmission_dir"}; 
     28        my ($parms, $audio_dir_name ) = @_; 
     29                my $debug = $$parms{"debug"}; 
     30                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};      
     31                my $UserSubmission_dir = $$parms{"UserSubmission_dir"}; 
    3332        if ($debug) { 
    3433                $command = ("cp -f $UserSubmission_dir/GPL_License $ToBeProcessedDir/$audio_dir_name/etc "); print "$command\n" if $debug;system($command) ;    
    …… 
    4039 
    4140sub ValidateFileName { 
    42         my ($parameters, $AudioDirectoryParms) = @_;     
    43         my %parms = %$parameters; 
    44                 my $debug = $parms{"debug"}; 
    45                 my $QuarantineDir = $parms{"QuarantineDir"};             
     41        my ($parms, $AudioDirectoryParms) = @_;  
     42                my $debug = $$parms{"debug"}; 
     43                my $QuarantineDir = $$parms{"QuarantineDir"};            
    4644        my %AudioDirParms = %$AudioDirectoryParms; 
    4745                my $AudioDirName =  $AudioDirParms{"audio_dir_name"}; 

  • Trunk/Scripts/Audio_scripts/UserSubmission/PROMPTS.pm

    r2135 r2158  
    3131                my $ScriptsDirectory = $$parms{"ScriptsDirectory"} ; 
    3232                my $PromptsFile = $$parms{"PromptsFile"}; 
    33         my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     33                 
     34                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     35         
    3436        open (PROMPTS, "$ToBeProcessedDir/$audio_dir_name/etc/PROMPTS") || die ("Unable to open $ToBeProcessedDir/$audio_dir_name/etc/PROMPTS file for writing"); 
    3537        open (MASTER_PROMPTS, ">>$PromptsFile") || die ("Unable to open $PromptsFile file for writing"); 
    …… 
    5153                my $HTKBin = $$parms{"HTKBin"};  
    5254                my $LexiconDirectory = $$parms{"LexiconDirectory"}; 
    53         my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     55                 
     56                my $audio_dir_name =  $$AudioDirParms{"audio_dir_name"}; 
     57                 
    5458        print "Prompts::Validation:$audio_dir_name\n" if $debug;         
    5559        $command = ("perl $HTKBin/prompts2wlist $QuarantineDir/$audio_dir_name/VALIDATION-PROMPTS $QuarantineDir/$audio_dir_name/wlist"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";  
    …… 
    8387                my $samplingrate = $$AudioDirParms{"samplingrate"}; 
    8488                my $samplingrateformat = $$AudioDirParms{"samplingrateformat"};  
     89                 
    8590        my $path_mfcc = "$QuarantineDir/$audio_dir_name/mfc";            
    8691        my $prod_path_mfcc = "$audio_dir_name/mfc";                      
    …… 
    134139        my ($parms, $AudioDirParms) = @_;        
    135140                my $debug = $$parms{"debug"}; 
    136                 my $QuarantineDir = $$parms{"QuarantineDir"};            
     141                my $QuarantineDir = $$parms{"QuarantineDir"};    
     142                         
    137143                my $AudioDirName =  $$AudioDirParms{"audio_dir_name"}; 
     144                 
    138145        my $promptsPath = "$QuarantineDir/$AudioDirName"; 
    139146        opendir(DIR, "$promptsPath") || die ("Unable to open file: $promptsPath"); 

  • Trunk/Scripts/Audio_scripts/UserSubmission/README.pm

    r1587 r2158  
    2626 
    2727sub Process { 
    28         my ($parameters, $AudioDirectoryParms, $SubDirectory ) = @_; 
    29         my %parms = %$parameters; 
    30                 my $debug = $parms{"debug"}; 
    31                 my $QuarantineDir = $parms{"QuarantineDir"};   
    32                 my $ToBeProcessedDir = $parms{"ToBeProcessedDir"};      
    33         my %AudioDirParms = %$AudioDirectoryParms; 
    34                 my $AudioDirName =  $AudioDirParms{"audio_dir_name"};           
     28        my ($parms, $AudioDirParms, $SubDirectory ) = @_; 
     29               my $debug = $$parms{"debug"}; 
     30                my $QuarantineDir = $$parms{"QuarantineDir"};   
     31                my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};    
     32                 
     33               my $AudioDirName =  $$AudioDirParms{"audio_dir_name"};           
     34                 
    3535        my ($samplingrate, $samplingrateformat, $filetype, $dialect); 
    3636                 
    …… 
    3939        if ($SubDirectory) { # call from Repository.pm 
    4040                print  "processing $ToBeProcessedDir/$AudioDirName/$SubDirectory/README\n" if $debug;    
    41                 ($samplingrate, $samplingrateformat, $filetype, $dialect) = _ValidateREADME(\%parms, "$ToBeProcessedDir/$AudioDirName/$SubDirectory/README"); 
     41                ($samplingrate, $samplingrateformat, $filetype, $dialect) = _ValidateREADME($parms, "$ToBeProcessedDir/$AudioDirName/$SubDirectory/README"); 
    4242        } else { # call from UserSubmission.pm 
    4343                print  "processing $QuarantineDir/$AudioDirName/README\n" if $debug;     
    44                 ($samplingrate, $samplingrateformat, $filetype, $dialect) = _ValidateREADME(\%parms,"$QuarantineDir/$AudioDirName/README" ); 
     44                ($samplingrate, $samplingrateformat, $filetype, $dialect) = _ValidateREADME($parms,"$QuarantineDir/$AudioDirName/README" ); 
    4545                print "Process:samplingrate:$samplingrate;samplingrateformat:$samplingrateformat;filetype:$filetype;dialect:$dialect:\n" if $debug;                      
    4646        } 
    …… 
    5252 
    5353sub ValidateFileName { 
    54         my ($parameters, $AudioDirectoryParms) = @_;     
    55         my %parms = %$parameters; 
    56                 my $debug = $parms{"debug"}; 
    57                 my $QuarantineDir = $parms{"QuarantineDir"};             
     54        my ($parms, $AudioDirectoryParms) = @_;  
     55                my $debug = $$parms{"debug"}; 
     56                my $QuarantineDir = $$parms{"QuarantineDir"};            
    5857        my %AudioDirParms = %$AudioDirectoryParms; 
    5958                my $AudioDirName =  $AudioDirParms{"audio_dir_name"};            
    …… 
    8281 
    8382sub _ValidateREADME { 
    84         my ($parameters, $ReadmeWithPath) = @_;        
    85         my %parms = %$parameters; 
    86                 my $debug = $parms{"debug"}; 
     83        my ($parms, $ReadmeWithPath) = @_;     
     84               my $debug = $$parms{"debug"}; 
     85                 
    8786        my ($title, $samplingrate, $samplingrateformat,$dialect,$filetype); 
    8887        open(README, "$ReadmeWithPath") || die ("Unable to open file: $ReadmeWithPath");                 

  • Trunk/Scripts/Mirroring_scripts/TarFiles/Audio.pm

    r2121 r2158  
    3333sub Create { 
    3434        my ($parms) = @_; 
    35         my $debug = $$parms{"debug"}; 
     35               my $debug = $$parms{"debug"}; 
    3636        my $directories2mirror= $$parms{"directories2mirror"}; 
    3737        my ($source, $target, $line, @line, @dirlist,@tarlist, $sourcevolume,$sourcepath,$sourcedirname); 
    …… 
    5555sub _processAudioDir { 
    5656        my ($parms,$AudioDirParms ) = @_; 
    57         my $debug = $$parms{"debug"};  
    58         my $source = $$AudioDirParms{'source'}; 
     57               my $debug = $$parms{"debug"};   
     58               my $source = $$AudioDirParms{'source'}; 
    5959        opendir(DIR, $source) || die ("Unable to open file: $source"); 
    6060        my @dirlist; 
    …… 
    7575sub _createAudioMakeFile { 
    7676        my ($parms,$AudioDirParms,$dirlist,$tarlist) = @_;       
    77         my $debug = $$parms{"debug"};    
    78         my $source = $$AudioDirParms{'source'};  
    79         my $target = $$AudioDirParms{'target'};  
    80         my $audiodir = $$AudioDirParms{'audiodir'}; 
    81         my $sourcedirname =     $$AudioDirParms{'sourcedirname'}; 
     77                my $debug = $$parms{"debug"};    
     78                 
     79                my $source = $$AudioDirParms{'source'};  
     80                my $target = $$AudioDirParms{'target'};  
     81                my $audiodir = $$AudioDirParms{'audiodir'}; 
     82                my $sourcedirname =     $$AudioDirParms{'sourcedirname'}; 
    8283         
    8384        my $filename = $audiodir . "_" . $sourcedirname . "_dyn_makefile"; 
    …… 
    102103sub Make {  # part of make_all 
    103104        my ($parms) = @_; 
    104         my $debug = $$parms{"debug"}; 
    105         my $directories2mirror= $$parms{"directories2mirror"};   
     105                my $debug = $$parms{"debug"}; 
     106                my $directories2mirror= $$parms{"directories2mirror"};   
     107                 
    106108        # Audio Makefiles (e.g. Original_16kHz_16bit_makefile, ...) are created dynamically by the Create SUB. 
    107109        open(DIRLIST, $directories2mirror) || die ("Unable to open file: $directories2mirror"); 
    …… 
    123125sub _processMakeFile {   
    124126        my ($parms,$audiodir,$sourcedirname) = @_; 
    125         my $debug = $$parms{"debug"};  
     127               my $debug = $$parms{"debug"};   
    126128        my $filename = $audiodir . "_" . $sourcedirname . "_dyn_makefile"; 
    127129        my @command = ("make", "-f", $filename); system(@command) == 0 or die "system @command failed: $?";    

  • Trunk/Scripts/Mirroring_scripts/TarFiles/NightlyBuild.pm

    r2121 r2158  
    3232sub CopySubdirectoryMakeFile { 
    3333        my ($parms) = @_; 
    34         my $debug = $$parms{"debug"};  
    35         my $TarFiles_dir = $$parms{"TarFiles_dir"}; 
    36         my $Nightly_dirname = $$parms{"Nightly_dirname"};              
     34               my $debug = $$parms{"debug"};   
     35               my $TarFiles_dir = $$parms{"TarFiles_dir"}; 
     36               my $Nightly_dirname = $$parms{"Nightly_dirname"};               
    3737        my $command = ("cp TarFiles/NightlyBuilds/NightlyBuilds_sub_makefile $Nightly_dirname"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";   
    3838} 
    …… 
    4040sub Create { 
    4141        my ($parms) = @_; 
    42         my $debug = $$parms{"debug"}; 
     42               my $debug = $$parms{"debug"}; 
    4343        my @dirlist; 
    4444         
    …… 
    6060sub _createBuildMakeFile { 
    6161        my ($parms,$source, $dirlist) = @_; 
    62         my $debug = $$parms{"debug"};  
     62               my $debug = $$parms{"debug"};   
    6363        my $filename = "TarFiles/MakeFiles/NightlyBuilds_makefile"; 
    6464        open(FILEOUT, ">$filename");  
©2005-2009 VoxForge