Navigation

← Previous Changeset
Next Changeset →

Changeset 2620

Timestamp:

06/25/08 09:54:27 (3 months ago)

Author:

kmaclean

Message:

separated svn updates from RunDaily?.pl and created run_daily_all.sh bash script. This is to address the case where some code might get updated, but if the svn update is part of RunDail?.pl, it is not implemented immediately since the code for RunDaily?.pl has already been compiled and is in memory.

Files:

Trunk/Scripts/Mirroring_scripts/RunDaily.pl (modified) (3 diffs)
Trunk/Scripts/Mirroring_scripts/RunDaily_preprocessing.pl (modified) (2 diffs)
Trunk/Scripts/Mirroring_scripts/Single_WebGUIForum.pm (modified) (2 diffs)
Trunk/Scripts/Mirroring_scripts/etc/MemMonitorsh (deleted)
Trunk/Scripts/Mirroring_scripts/run_daily_all.sh (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

Trunk/Scripts/Mirroring_scripts/RunDaily.pl

r2577	r2620
68	68	### Main
69	69	####################################################################
70		# !!!!!!
71		Update($parms) \|\| confess "RunDaily-preprocessing error: $?";
72		# !!!!!!
	70	#Update($parms) \|\| confess "RunDaily-preprocessing error: $?";
73	71	my $userSubmission = UserSubmission->new($parms);
74	72	my $repository = Repository->new($parms);
…	…
78	76	UserMetrics::Process($parms); # English only
79	77	Rsync();
80
81		# get Repository->new to serialize the ProcessedUsersubmissions either using JSON (Perl: JSON::XS) or XML (Perl: App::Serializer::Xml)
82		# for easier restart if there is a problem with the above-listed classes/packages
83		WebGUIForum::Update($parms, $repository->getProcessedUserSubmissions, 'speechsubmission', 'xxxxx') or confess "UserSubmissions error: $?";
	78	WebGUIForum::Update($parms, $repository->getProcessedUserSubmissions, 'speechsubmission', 'n@wp@$$') or confess "UserSubmissions error: $?";
84	79
85	80	print STDOUT "!!!!!!run_daily completed\n";
…	…
101	96	}
102	97
103		# !!!!!!!
104		sub Update {
105		my ($parms ) = @_;
106		my $debug = $$parms{"debug"};
107		my $dir = $$parms{"MirroringScripts_dir"};
108		my $HTKdir = $$parms{"HTK_dir"};
109		my $Audio_scriptsdir = $$parms{"AudioScripts_dir"};
110		# Cleanup dynamically created Audio makefiles
111		$command = ("cd $dir && rm -f *_dyn_makefile"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";
112		# update from svn repository server
113		$command = ("svn update /data/svn-mirror/Main/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
114		$command = ("svn update /data/svn-mirror/Main/Tags"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
115		$command = ("svn update /data/svn-mirror/SpeechCorpus/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
116		$command = ("svn update /data/svn-mirror/Russian/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
117		$command = ("svn update /data/svn-mirror/de/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
118		$command = ("svn update /data/svn-mirror/Dutch/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
119		return 1;
120		}
121		# !!!!!!
	98	#sub Update {
	99	# my ($parms ) = @_;
	100	# my $debug = $$parms{"debug"};
	101	# my $dir = $$parms{"MirroringScripts_dir"};
	102	# my $HTKdir = $$parms{"HTK_dir"};
	103	# my $Audio_scriptsdir = $$parms{"AudioScripts_dir"};
	104	# # Cleanup dynamically created Audio makefiles
	105	# $command = ("cd $dir && rm -f *_dyn_makefile"); print "$command\n" if $debug; system($command) == 0 or die "system $command failed: $?";
	106	# # update from svn repository server
	107	# $command = ("svn update /data/svn-mirror/Main/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	108	# $command = ("svn update /data/svn-mirror/Main/Tags"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	109	# $command = ("svn update /data/svn-mirror/SpeechCorpus/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	110	# $command = ("svn update /data/svn-mirror/Russian/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	111	# $command = ("svn update /data/svn-mirror/de/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	112	# $command = ("svn update /data/svn-mirror/Dutch/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
	113	# return 1;
	114	#}
122	115	1;

Trunk/Scripts/Mirroring_scripts/RunDaily_preprocessing.pl

r2472	r2620
28	28
29	29	use lib "/data/svn-mirror/Main/Trunk/Scripts/Mirroring_scripts";
30		~~# !!!!!!~~
31	30	use VoxForge_config(); # Import nothing
32		~~#my $parms = VoxForge_config::getParms;~~
33	31	my $parms = VoxForge_config->new();
34		~~# !!!!!!~~
35	32	####################################################################
36	33	### Main
…	…
56	53	$command = ("svn update /data/svn-mirror/SpeechCorpus/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
57	54	$command = ("svn update /data/svn-mirror/Russian/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
58		~~# !!!!!!~~
59	55	$command = ("svn update /data/svn-mirror/de/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
60	56	$command = ("svn update /data/svn-mirror/Dutch/Trunk"); print "$command\n" if $debug;system($command) == 0 or die "system $command failed: $?";
61
62		~~# !!!!!!~~
63	57	return 1;
64	58	}

Trunk/Scripts/Mirroring_scripts/Single_WebGUIForum.pm

r2577	r2620
41	41	####################################################################
42	42	if (1) { #upload tarfile as attachment to WebGUI; Italian, Hebrew
43		$path_original ="/~~home/kmaclean/temp~~";
44		$tarfile ="~~HB-anonymous-20080511-fov[1068200919~~].zip"; # if undef then attachment does not get processed by LWP!
	43	$path_original ="/data/UserSubmissions/Quarantine";
	44	$tarfile ="IT-Andy86-20080619-hfn[2096523080].zip"; # if undef then attachment does not get processed by LWP!
45	45	#my $prefix ="DE-"; # prefix to remove from submission
46	46	####################################################################
…	…
73	73	##########fix submission that did not work properly; no tarfile to upload since linking to voxforge1.org
74	74	$path_original ="/data/UserSubmissions/Quarantine";
75		$AudioDirName="~~rocketman768-20080409-oip~~";
	75	$AudioDirName="Rhyhann-20080518-bbe";
76	76	$pathtoTarfile = undef;
77	77	}

Dev Site (Scripts)