Changeset 2630

Timestamp:

07/13/08 22:20:56 (3 months ago)

Author:

kmaclean

Message:

moved location of condition to determine when to submit a submission to the webgui forum to the README class; set submission from voxforgeIVR to always update the English forum.

Files:

• Trunk/Scripts/Audio_scripts/UserSubmission/README.pm (modified) (1 diff)
• Trunk/Scripts/Mirroring_scripts/WebGUIForum.pm (modified) (7 diffs)

Trunk/Scripts/Audio_scripts/UserSubmission/README.pm

@@ -140 +140 @@
-                if ($audio_dir_name =~ /voxforgeivr/i) {
-                        $readmecontents{'language'} = 'EN';
+        # !!!!!!                        
+                        $readmecontents{'updatewebguiforum'} = 'yes';           
-                } else {
-                        confess "no language defined\n";
-                }
-
-
-
-
-
+
+
+
+
+
+
-        # !!!!!! need unit tests to figure this out ....
-        # trying to rewrite README file without the "Update WebGUI Forum:" line 

Trunk/Scripts/Mirroring_scripts/WebGUIForum.pm

@@ -32 +32 @@
-use URI::Escape;
-use Encode;
-# !!!!!!
-use lib '../Audio_scripts';
-use UserSubmission::README();                  # Import nothing
-use UserSubmission::PROMPTS();
-use UserSubmission::LICENSE();
-# !!!!!!
-####################################################################
-###  Declarations                                                          
-####################################################################
-my $command;
-# !!!!!!
-#my $LoginURL ='http://www.voxforge.org';
-#my $englishURL = 'http://www.voxforge.org/home/downloads/speech/english'; 
-#my $dutchURL = 'http://www.voxforge.org/home/downloads/speech/dutch';
-#my $germanURL = 'http://www.voxforge.org/home/downloads/speech/german-speech-files';
-#my $russianURL = 'http://www.voxforge.org/home/downloads/speech/russian';
-# !!!!!!
-my $tarfile = undef; # not uploading a tarfile to WebGUI forum
-####################################################################
@@ -67 +58 @@
-                my $readme = $$ProcessedUserSubmissions{$AudioDirName}{"readme"};
-                print "!!!!!!WeguiForumUpdate?:$readme->getUpdatewebguiforum()\n";
-
+
+
+
+
-                        print STDERR "Update Forum with AudioDirName:$path_original/$AudioDirName\n" if $debug;
-                        # !!!!!!
-                        #my $readmepath = "$path_original/$AudioDirName/etc/README";
-                        #my $promptspath = "$path_original/$AudioDirName/etc/prompts-original";
-                        #my $licensepath = "$path_original/$AudioDirName/LICENSE";
-                        #my ($content,$title)= getSubmissionContents($parms,$readmepath,$promptspath,$licensepath,$AudioDirName,$readme,$tarfile);
-                        my ($content,$title)= getSubmissionContents($parms,$path_original ,$AudioDirName,$readme,$tarfile);
-                        # !!!!!!
-                        Upload($parms,$browser,$content,$title,$readme,$tarfile);
-                } else {
@@ -81 +69 @@
-                }
-        }
-        #$command = ("rm my_cookies.txt"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
-        print "\nWebGUIForumUpdate.pm completed!\n****************************************************\n\n";
-}
@@ -91 +78 @@
-        my ($parms,$readme) = @_;       
-                my $debug = $$parms{"debug"};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return $parms->getwebguiUploadURL;
-        # !!!!!!
-}
-
-sub getSubmissionContents {
-        # !!!!!!
-        #my ($parms,$readmepath,$promptspath,$licensepath,$AudioDirName,$readme,$tarfile) = @_;
-        my ($parms,$path_original ,$AudioDirName,$readme,$tarfile) = @_;
-        # !!!!!!
-                my $debug = $$parms{"debug"};
-        my ($content);
@@ -189 +157 @@
-                $content .= "<a href=\"" . getRepositoryURL($parms,$readme) . "/$title.tgz\">$title.tgz</a><br>";
-        }
-        # !!!!!!
-        # CURL expects URL encoded data for get; but does not need it for a post!
-        # therefore, don't need to use: "use URI::Escape;"
-        #                               encoded_string = uri_escape(raw_string);
-        #$content =~ s/;/,/g; # CURL submission options are separated by a semi-colon, therefore no semi-colons allowed in content submitted to WebGUI 
-        #$content =~ s/&/and/g; # CURL (or WebGUI) doesn't like ampersands?? 
-        # !!!!!!
-
-        return (\$content,\$title);
-}
@@ -203 +163 @@
-        my ($parms,$readme) = @_;       
-                my $debug = $$parms{"debug"};
-        # !!!!!!
-        #my $RepositoryURL;
-        my $AudioRateDir = $readme->getSamplingrate() . "_" . $readme->getSamplingrateformat() ;
-
-
-
-
-
-
-
+
+
-        my $RepositoryURL =  $parms->getwebguiRepositoryURL . "/$AudioRateDir"; 
-        return $RepositoryURL;
-        # !!!!!!
-}
-
@@ -221 +173 @@
-        my ($parms, $browser, $username, $identifier) = @_;
-                my $debug = $$parms{"debug"};
-        # !!!!!!
-        my $LoginURL = $parms->getwebguiLoginURL;
-        # !!!!!!        
-        my $result = $browser->post(
-      "$LoginURL",