Changeset 2578

Timestamp:

05/12/08 17:48:45 (7 months ago)

Author:

kmaclean

Message:

updates to Prompt processing scripts - break EN our from non-EN language processing

Files:

• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook.pm (modified) (3 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/Dictionary.pm (modified) (1 diff)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/Text.pm (modified) (1 diff)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/MissingWords_out (modified) (1 diff)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/aligned.out (modified) (6 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/dict (modified) (6 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/dlog (modified) (3 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/htksegment_log (modified) (4 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/wlist (modified) (6 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/words.mlf (modified) (3 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/output_files/dict (modified) (6 diffs)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/output_files/prompts (modified) (1 diff)
• Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/test/text-original.txt (moved) (moved from Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/test/text-original)
• Trunk/Scripts/Audio_scripts/UserSubmission.pm (modified) (11 diffs)
• Trunk/Scripts/Audio_scripts/UserSubmission/PROMPTS (added)
• Trunk/Scripts/Audio_scripts/UserSubmission/PROMPTS.pm (modified) (4 diffs)
• Trunk/Scripts/Audio_scripts/UserSubmission/PROMPTS/EN.pm (added)

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook.pm

@@ -53 +53 @@
-### Main
-####################################################################
+sub process {
+        my ($self)= @_;
+        my $debug = $self->{'debug'};
+        my $audiofile = $self->{"audiofile"};
+        my $textfile = $self->{"textfile"};
+        my $username = $self->{"username"};
+        my $tarSuffix = $self->{"tarSuffix"};
+        my $voxforgeDict = $self->{"voxforgeDict"};
+        my $htk_files = $self->{'htk_files'};
+        
+        my $textContents = AudioBook::Text->new($textfile);
+        $textContents->createWLISTFile("AudioBook/interim_files/wlist");
+        
+        my $dictionary = AudioBook::Dictionary->new($self);
+        my $missingwordfound = $dictionary->findOutOfVocabularyWords($voxforgeDict,"AudioBook/interim_files/MissingWords");
+        if ($missingwordfound) { 
+                $dictionary->getPronunciations("AudioBook/interim_files/MissingWords_out"); # uses g2p
+                $dictionary->updatePronDict();
+                # need to update dict with missing words
+        
+                $command = ("HDMan -A -D -T 1 -g $htk_files/global.ded -m -w AudioBook/interim_files/wlist -i -l AudioBook/interim_files/dlog AudioBook/interim_files/dict $voxforgeDict"); system($command) == 0 or confess "fullrun $command failed: $?";
+                $command = ("cp AudioBook/interim_files/MissingWords_out AudioBook/output_files/MissingWords"); print "cmd:$command\n" if $debug; system($command);
+        } else {
+                unlink ("AudioBook/interim_files/MissingWords_out");
+                open(MISSINGWORDSOUT,">AudioBook/output_files/MissingWords") or confess ("cannot open AudioBook/output_files/MissingWords file");       
+                print MISSINGWORDSOUT "no missing words\n";
+                close MISSINGWORDSOUT
+        } 
+        $command = ("cp AudioBook/interim_files/dict AudioBook/output_files"); print "cmd:$command\n" if $debug; system($command);      
+        my $audio = AudioBook::Audio->new($self);
+        $audio->segment($audiofile,$textContents);
+        if (defined($tarSuffix)){
+                _createTarFile($self);
+        }
+}
+
+sub _createTarFile {
+        my ($self)= @_;
+        my $debug = $self->{'debug'};
+        my $username = $self->{"username"};
+        my $tarSuffix = $self->{"tarSuffix"};
+        
+        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+        $year += 1900;
+        $mon = sprintf("%02d", $mon); 
+        $mday = sprintf("%02d", $mday);
+        print "creating gzipped tar file:$username\-$year$mon$mday\-$tarSuffix\.tgz \n";
+        if ($debug) {
+                $command = ("tar -zcvf $username\-$year$mon$mday\-$tarSuffix\.tgz AudioBook/output_files --exclude \"\.svn\" "); print "cmd:$command\n" if $debug; system($command);
+        } else {
+                $command = ("tar -zcf $username\-$year$mon$mday\-$tarSuffix\.tgz AudioBook/output_files --exclude \"\.svn\" "); print "cmd:$command\n" if $debug; system($command);
+        }
+        print "please submit your tar file to: www.voxforge.org\n";     
+}
+
+sub _random_characters {
+        my ($length) = @_;      
+        my @chars=('a'..'z');
+        my $randomString;
+        foreach (1..$length){
+                $randomString.=$chars[rand @chars];
+        }
+        return $randomString;
+}
+
-sub getOptions {
-        my ($self)= @_;
@@ -101 +166 @@
-        } elsif ($opt_K) {
-                $self->{"audiofile"}="AudioBook/test/audio.wav";
-
+
+
-                $self->{"voxforgeDict"}="AudioBook/test/VoxForgeDict";
-                $self->{"tarSuffix"}=_random_characters(3);
-                $self->{"username"}="test";
-                print "test using the following files:\n";
-                print "\t" . $self->{"audiofile"} . "\n";
-                print "\t" . $self->{"textfile"} . "\n";
-                print "\t" . $self->{"voxforgeDict"} . "\n";
-        } elsif ($opt_h) {
-                print "\nVoxForge Audio Segmentation Script Parameters\n";      
@@ -137 +199 @@
-}
-
-sub process {
-        my ($self)= @_;
-        my $debug = $self->{'debug'};
-        my $audiofile = $self->{"audiofile"};
-        my $textfile = $self->{"textfile"};
-        my $username = $self->{"username"};
-        my $tarSuffix = $self->{"tarSuffix"};
-        my $voxforgeDict = $self->{"voxforgeDict"};
-        my $tarSuffix = $self->{"tarSuffix"};
-        my $htk_files = $self->{'htk_files'};
-        
-        my $textContents = AudioBook::Text->new($textfile);
-        $textContents->createWLISTFile("AudioBook/interim_files/wlist");
-        
-        my $dictionary = AudioBook::Dictionary->new($self);
-        my $missingwordfound = $dictionary->findOutOfVocabularyWords($voxforgeDict,"AudioBook/interim_files/MissingWords");
-        if ($missingwordfound) { 
-                $dictionary->getPronunciations("AudioBook/interim_files/MissingWords_out"); # uses g2p
-                $dictionary->updatePronDict();
-                # need to update dict with missing words
-        
-                $command = ("HDMan -A -D -T 1 -g $htk_files/global.ded -m -w AudioBook/interim_files/wlist -i -l AudioBook/interim_files/dlog AudioBook/interim_files/dict" . $self->{"voxforgeDict"}); system($command) == 0 or confess "fullrun $command failed: $?";
-                $command = ("cp AudioBook/interim_files/MissingWords_out AudioBook/output_files/MissingWords"); print "cmd:$command\n" if $debug; system($command);
-        } else {
-                open(MISSINGWORDSOUT,">AudioBook/output_files/MissingWords") or confess ("cannot open AudioBook/output_files/MissingWords file");       
-                print MISSINGWORDSOUT "no missing words\n";
-                close MISSINGWORDSOUT
-        } 
-        $command = ("cp AudioBook/interim_files/dict AudioBook/output_files"); print "cmd:$command\n" if $debug; system($command);      
-        my $audio = AudioBook::Audio->new($self);
-        $audio->segment($audiofile,$textContents);
-        if (defined($tarSuffix)){
-                _createTarFile($self);
-        }
-}
-
-sub _createTarFile {
-                my ($self)= @_;
-                my $debug = $self->{'debug'};
-                my $username = $self->{"username"};
-                my $tarSuffix = $self->{"tarSuffix"};
-                my $tarSuffix = $self->{"tarSuffix"};
-                
-                my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-                $year += 1900;
-                $mon = sprintf("%02d", $mon); 
-                $mday = sprintf("%02d", $mday);
-                print "creating gzipped tar file:$username\-$year$mon$mday\-$tarSuffix\.tgz \n";
-                if ($debug) {
-                        $command = ("tar -zcvf $username\-$year$mon$mday\-$tarSuffix\.tgz AudioBook/output_files --exclude \"\.svn\" "); print "cmd:$command\n" if $debug; system($command);
-                } else {
-                        $command = ("tar -zcf $username\-$year$mon$mday\-$tarSuffix\.tgz AudioBook/output_files --exclude \"\.svn\" "); print "cmd:$command\n" if $debug; system($command);
-                }
-                print "please submit your tar file to: www.voxforge.org\n";     
-}
-        
-sub _random_characters {
-        my ($length) = @_;      
-        my @chars=('a'..'z');
-        my $randomString;
-        foreach (1..$length){
-                $randomString.=$chars[rand @chars];
-        }
-        return $randomString;
-}
-1;

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/Dictionary.pm

@@ -26 +26 @@
-use diagnostics;
-use Carp;
+use Lingua::EN::Numbers qw(num2en num2en_ordinal);
+use Lingua::EN::Numbers::Years;
-
-my $command;
-
-####################################################################
-### Constructor

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/Text.pm

@@ -172 +172 @@
-        } else {
-                push (@$words, $number);
-not sure what to do with:$number: please correct in eText
+$number not converted
-        }
-                

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/MissingWords_out

@@ +1 @@
+MOJOMOVE411     [MOJOMOVE411]   m ow jh ow m uw v f n n

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/aligned.out

@@ -38 +38 @@
-68200000 70300000 r -1418.653687
-70300000 70300000 sp -0.235017
-
+411
-72300000 73900000 ow -978.509583
-73900000 74800000 jh -591.590271
@@ -45 +45 @@
-77700000 80600000 uw -1760.078613
-80600000 82600000 v -1403.530029
-
-
-
-
-
-
-
-
+
+
+
-90500000 90500000 sp -0.235017
-w -213.120544 ONE
-3000000 ah -1393.076172
-3000000 94900000 n -1128.905029
+k -240.841125 COM
+2600000 aa -1081.417236
+2600000 94900000 m -1386.785156
-94900000 94900000 sp -0.235017
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-110000000 111200000 aa -703.356628
-111200000 112000000 b -572.268555
@@ -101 +88 @@
-141100000 142300000 ao -810.766357
-142300000 144000000 r -1171.934448
-
-
-
-
-
-
-
+
+
+
-151700000 153700000 r -1328.250610
-153700000 154300000 g -424.893402
@@ -121 +104 @@
-170200000 170700000 k -369.333679
-170700000 171600000 l -659.565674
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-182300000 183300000 k -677.003906 COLLECTION
-183300000 184000000 ax -455.986847
@@ -168 +152 @@
-247000000 249400000 l -1534.862549
-249400000 251000000 z -999.659790
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-268400000 269600000 y -715.677551
-269600000 270000000 uw -266.001984
@@ -383 +382 @@
-507400000 509300000 ow -1212.547852
-509300000 509300000 sp -0.235017
-
-
+
+
+
+
-511100000 511500000 ih -308.505402
-511500000 512900000 l -938.400208

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/dict

@@ -15 +15 @@
-DELLS           [DELLS]         d eh l z sp
-DOMAIN          [DOMAIN]        d ow m ey n sp
-DOT             [DOT]           d aa t sp
-DWELLS          [DWELLS]        d w eh l z sp
-EVENING         [EVENING]       iy v n ix ng sp
-FOR             [FOR]           f ao r sp
-FOUR            [FOUR]          f ao r sp
-GAY             [GAY]           g ey sp
-GONE            [GONE]          g ao n sp
@@ -34 +32 @@
-LAST            [LAST]          l ae s t sp
-MANY            [MANY]          m eh n iy sp
-
+
+
-MOORE           [MOORE]         m uh r sp
-MORE            [MORE]          m ao r sp
@@ -42 +41 @@
-OF              [OF]            ah v sp
-ON              [ON]            aa n sp
-ONE             [ONE]           w ah n sp
-ORG             [ORG]           ao r g sp
-OTHER           [OTHER]         ah dh er sp
@@ -48 +46 @@
-PASSED          [PASSED]        p ae s t sp
-PEAL            [PEAL]          p iy l sp
-POETRY          [POETRY]        p ow ax t r iy sp
-PRAISE          [PRAISE]        p r ey z sp
-PUBLIC          [PUBLIC]        p ah b l ix k sp
@@ -65 +62 @@
-STILL           [STILL]         s t ih l sp
-SWEET           [SWEET]         s w iy t sp
+T               [T]             t iy sp
-TALE            [TALE]          t ey l sp
-TELLS           [TELLS]         t eh l z sp
@@ -78 +76 @@
-TOMB            [TOMB]          t uw m sp
-TUNEFUL         [TUNEFUL]       t uw n f ax l sp
-TWILL           [TWILL]         t w ih l sp
-VOXFORGE        [VOXFORGE]      v aa k s f ao r jh sp
-WALK            [WALK]          w ao k sp

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/dlog

@@ -4 +4 @@
----------------------------
-  Dictionary    TotalWords WordsUsed  TotalProns PronsUsed
-7         90     129778         90
-90         90         90         90
+8         87     129779         87
+87         87         87         87
-
-90
+87
-
-New Phone Usage Counts
----------------------
-  1. ax    :    10
-8
+5
-  3. ae    :     7
-4
-5
-9
+5
+7
+8
-  7. aa    :    13
-2
+0
-  9. z     :    14
-2
+0
- 11. ey    :     5
- 12. b     :     6
@@ -30 +30 @@
- 18. k     :    11
- 19. sh    :     3
-8
-t     :    19
-v     :     4
-ix    :     7
-ng    :     5
-f     :     4
-ao    :    10
-g     :     3
-hh    :     5
-er    :     4
-ih    :     9
+7
+v     :     4
+ix    :     7
+ng    :     5
+f     :     4
+ao    :    10
+g     :     4
+hh    :     5
+er    :     4
+ih    :     8
+t     :    17
- 31. aw    :     3
- 32. jh    :     3
@@ -48 +48 @@
- 36. uh    :     1
- 37. y     :     3
-4
+3
- 39. dh    :    10
-6
+5
- 41. dx    :     1
- 42. sil   :     2

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/htksegment_log

@@ -7 +7 @@
-READ 60200000 64300000 0
-FOR 64300000 70300000 0
-
-
-
-
-
-
-
-
+
+
+
+
-SCOTT 113800000 118900000 8200000
-AS 127100000 129700000 0
@@ -20 +16 @@
-OF 133100000 134500000 0
-THE 134500000 135400000 0
-
-
-
+
+
-SHORTS 158300000 165800000 800000
-30
-POETRY 173000000 181100000 12
+26
+MONOLOGUE 172600000 181000000 13
-COLLECTION 182300000 189700000 29900000
-THOSE 219600000 224100000 0
@@ -32 +27 @@
-THOSE 235100000 240100000 0
-EVENING 240100000 245200000 0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-TELLS 273000000 279000000 4500000
-OF 283500000 285500000 0
@@ -84 +82 @@
-AND 502900000 505500000 0
-SO 505500000 509300000 0
-
+
+
-BE 512900000 517100000 0
-WHEN 517100000 520900000 0

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/wlist

@@ -15 +15 @@
-DELLS
-DOMAIN
-DOT
-DWELLS
-EVENING
-FOR
-FOUR
-GAY
-GONE
@@ -34 +32 @@
-LAST
-MANY
-
+
+
-MOORE
-MORE
@@ -42 +41 @@
-OF
-ON
-ONE
-ORG
-OTHER
@@ -48 +46 @@
-PASSED
-PEAL
-POETRY
-PRAISE
-PUBLIC
@@ -65 +62 @@
-STILL
-SWEET
+T
-TALE
-TELLS
@@ -78 +76 @@
-TOMB
-TUNEFUL
-TWILL
-VOXFORGE
-WALK

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/interim_files/words.mlf

@@ -9 +9 @@
-READ
-FOR
-
-
-
-
-
+
-COM
-BY
@@ -23 +19 @@
-THE
-VOXFORGE
-DOT
-ORG
-SHORTS
-WEEKLY
-
+
-COLLECTION
+THOSE
+EVENING
+BELLS
-THOSE
-EVENING
@@ -86 +84 @@
-AND
-SO
-
+
+
-BE
-WHEN

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/output_files/dict

@@ -15 +15 @@
-DELLS           [DELLS]         d eh l z sp
-DOMAIN          [DOMAIN]        d ow m ey n sp
-DOT             [DOT]           d aa t sp
-DWELLS          [DWELLS]        d w eh l z sp
-EVENING         [EVENING]       iy v n ix ng sp
-FOR             [FOR]           f ao r sp
-FOUR            [FOUR]          f ao r sp
-GAY             [GAY]           g ey sp
-GONE            [GONE]          g ao n sp
@@ -34 +32 @@
-LAST            [LAST]          l ae s t sp
-MANY            [MANY]          m eh n iy sp
-
+
+
-MOORE           [MOORE]         m uh r sp
-MORE            [MORE]          m ao r sp
@@ -42 +41 @@
-OF              [OF]            ah v sp
-ON              [ON]            aa n sp
-ONE             [ONE]           w ah n sp
-ORG             [ORG]           ao r g sp
-OTHER           [OTHER]         ah dh er sp
@@ -48 +46 @@
-PASSED          [PASSED]        p ae s t sp
-PEAL            [PEAL]          p iy l sp
-POETRY          [POETRY]        p ow ax t r iy sp
-PRAISE          [PRAISE]        p r ey z sp
-PUBLIC          [PUBLIC]        p ah b l ix k sp
@@ -65 +62 @@
-STILL           [STILL]         s t ih l sp
-SWEET           [SWEET]         s w iy t sp
+T               [T]             t iy sp
-TALE            [TALE]          t ey l sp
-TELLS           [TELLS]         t eh l z sp
@@ -78 +76 @@
-TOMB            [TOMB]          t uw m sp
-TUNEFUL         [TUNEFUL]       t uw n f ax l sp
-TWILL           [TWILL]         t w ih l sp
-VOXFORGE        [VOXFORGE]      v aa k s f ao r jh sp
-WALK            [WALK]          w ao k sp

Trunk/Scripts/Audio_scripts/AudioSegmentation/AudioBook/output_files/prompts

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Trunk/Scripts/Audio_scripts/UserSubmission.pm

@@ -35 +35 @@
-#use UserSubmission::README;                    # Import @EXPORT symbols
-use UserSubmission::README();                  # Import nothing
-
+
+
-use UserSubmission::LICENSE();
-use UserSubmission::AUDIO();
@@ -56 +57 @@
-        # maybe should just open fles in binmode rather than use dos2unix????
-        my ($parms, $audio_dir_name ) = @_;
-                # !!!!!!
-                #my $debug = $$parms{"debug"};
-                #my $QuarantineDir = $$parms{"QuarantineDir"};
-                my $debug = $parms->getDebug;
-                my $QuarantineDir = $parms->getQuarantineDir;
-                # !!!!!!
-        opendir(DIR, "$QuarantineDir/$audio_dir_name") || confess ("Unable to open directory: $QuarantineDir/$audio_dir_name\n");
-        while (my $filename = readdir(DIR)) {
@@ -84 +81 @@
-
-sub ValidateFilenames {
-        # !!!!!!
-        #my ($parms, $AudioDirName) = @_;
-        my($parms,$AudioDirNameWithPath) = @_; # assumes a 'flat' directory (no sub-directories)
-        #my $debug = $$parms{"debug"};
-        # !!!!!!
-        # check that user used PROMPTS & README for filenames
-        # windows defaults to prompts.txt
-        # look into converting to XML and run through XML schema validation ...
-        # !!!!!! use OO syntax
-        #UserSubmission::README::ValidateFileName($parms, $AudioDirName) || confess "UserSubmission error: $?" ;
-        #UserSubmission::LICENSE::ValidateFileName($parms, $AudioDirName) || confess "UserSubmission error: $?" ;       
-        #UserSubmission::PROMPTS::ValidateFileName($parms, $AudioDirName) || confess "UserSubmission error: $?" ;
-        print "!!!!!!AudioDirNameWithPath1:$AudioDirNameWithPath\n";
-        
-        my $readmeWithPath = UserSubmission::README->getFileWithPath($parms,$AudioDirNameWithPath) or confess "UserSubmission error: $?" ;
@@ -106 +94 @@
-        my $promptsWithPath = UserSubmission::PROMPTS->getFileWithPath($parms,$AudioDirNameWithPath) || confess "UserSubmission error: $?" ;
-        UserSubmission::PROMPTS->ValidateFileName($parms,$AudioDirNameWithPath,$promptsWithPath);
-        # !!!!!!
-}
-
-sub Cleanup {  # Repository class calls this method
-        my ($parms, $audio_dir_name) = @_;
-        # !!!!!!
-        #my $debug = $$parms{"debug"};
-        #my $QuarantineDir = $$parms{"QuarantineDir"};  
-        #my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};
-        my $debug = $parms->getDebug;
-        my $QuarantineDir = $parms->getQuarantineDir;   
@@ -121 +104 @@
-        $command = ("rm -f $QuarantineDir/$audio_dir_name\.zip $QuarantineDir/$audio_dir_name\.tgz $QuarantineDir/$audio_dir_name\.tar.gz "); print "$command\n" if $debug;   system($command) == 0 or confess "system $command failed: $?"; # remove hidden backup files
-        $command = ("rm -rf $ToBeProcessedDir/$audio_dir_name"); print "$command\n" if $debug;   system($command) == 0 or confess "system $command failed: $?"; # remove hidden backup files
-        # !!!!!!
-        return 1;
-}                                                     
@@ -154 +136 @@
-                }
-                my $prompts;
-                $prompts = UserSubmission::PROMPTS->new($parms, $audio_dir_name, $readme);
-                if ($readme->getLanguage() =~ /EN/) { 
+                        $prompts = UserSubmission::PROMPTS::EN->new($parms, $audio_dir_name, $readme);  
-                        # if updating this or other languages, need to set VALIDATION-PROMPTS for the new language in PROMPTS->_clean
-                        #$prompts = UserSubmission::PROMPTS->new($parms, $audio_dir_name, $readme);
@@ -163 +145 @@
-                                confess "UserSubmission error: $audio->getErrorMessage" ;
-                        }
+                } else {
+                        $prompts = UserSubmission::PROMPTS->new($parms, $audio_dir_name, $readme);      
-                }
-                $directorynames{$audio_dir_name} = [$readme->getSamplingrate, $readme->getSamplingrateformat, $readme->getFiletype, $audio ];
@@ -185 +169 @@
-                print "***moved to 'ToBeProcessed' directory: $audio_dir_name:$samplingrate:$samplingrateformat:$filetype\n";
-        }
-        # !!!!!!
-
-        return \%userSubmission;
-        #print "\nPromptsValidation.pl completed!****************************************************\n\n";
-        # !!!!!!
-}
-
@@ -223 +203 @@
-        }       
-        close(DIR); 
-        # !!!!!!
-        #return \@tarlist;
-        my @sorted = sort(@tarlist);
-        return \@sorted;
-        # !!!!!!
-
-}
-
@@ -234 +210 @@
-        #to do look at Archive::Extract Cpan Module to handle tar tgz tar.gz and zip extractions ...
-        my ($parms, $filename, $suffix, $tarfile) = @_;
-        # !!!!!!
-        #my $debug = $$parms{"debug"};  
-        #my $QuarantineDir = $$parms{"QuarantineDir"};
-        my $debug = $parms->getDebug;
-        my $QuarantineDir = $parms->getQuarantineDir;
-        # !!!!!!
-        my (@clamscan_output, $clamscan_results);
-        #$command = ("freshclam"); print "$command\n"; system($command) == 0 or confess "system $command failed: $?"; 
@@ -300 +272 @@
-sub _Copy2ToBeProcessed { # private
-        my ($parms, $audio_dir_name, $filetype, $audio) = @_;
-        # !!!!!!
-        #my $debug = $$parms{"debug"};
-        #my $QuarantineDir = $$parms{"QuarantineDir"};  
-        #       my $ToBeProcessedDir = $$parms{"ToBeProcessedDir"};     
-        my $debug = $parms->getDebug;
-        my $QuarantineDir = $parms->getQuarantineDir;
-        my $ToBeProcessedDir = $parms-> getToBeProcessedDir;
-        # !!!!!!
-        $audio->Finalize($parms, $audio_dir_name, $filetype);
-        if ($audio->getError) {

Trunk/Scripts/Audio_scripts/UserSubmission/PROMPTS.pm

@@ -32 +32 @@
-use lib '../../Audio_scripts';
-use UserSubmission::README; 
-
-my $command;
-####################################################################
@@ -137 +136 @@
-        open (FILEIN, "$QuarantineDir/$audio_dir_name/PROMPTS") ||confess ("Unable to open PROMPTS file for reading");
-        # !!!!!!!
-
-
-
+#
+#
+#
-        # !!!!!!!
-        open (FILEOUT_PROD,">$QuarantineDir/$audio_dir_name/PROD-PROMPTS") || confess ("Unable to open PROD-PROMPTS file for writing");
@@ -156 +155 @@
-                        $linescalar =~ tr/a-z/A-Z/; # change to uppercase
-                        $linescalar =~ s/,//g; # remove commas 
-
+#
-                        # dealing with quotes
-                        #  $linescalar =~ s/\'//g; # remove single quotes; but need words like "don't" - need to research this more ...
-                        # $linescalar =~ s/\'\b(.*)\b\'/$1/g; # remove single quotes from quoted text; single quote must be at start of a word, and at end of a word - does not work if there are two words with single quotesin them in same sentence ...
-                        $linescalar =~ s/\'EM//g; # remove leading single quotes for contraction of them
-                        $linescalar =~ s/\"//g; # remove double quotes
-