X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=bin%2Fparse_ward_data;h=2a5848e56720362a92a8d089d7bfffca2ed5218b;hb=HEAD;hp=e6d94fb4e1670239ce13538b8df23a1d62597a41;hpb=63574045f42044601bfc460bf844ea82387f421f;p=eq%2F.git

diff --git a/bin/parse_ward_data b/bin/parse_ward_data
index e6d94fb..2a5848e 100755
--- a/bin/parse_ward_data
+++ b/bin/parse_ward_data
@@ -10,78 +10,49 @@ else { require "db_config"; }
 
 %hometeaching_data = ();
 %membership_data = ();
-getopts('vsn:o:b');
-
-$monthname2num{'Jan'} = '01';
-$monthname2num{'Feb'} = '02';
-$monthname2num{'Mar'} = '03';
-$monthname2num{'Apr'} = '04';
-$monthname2num{'May'} = '05';
-$monthname2num{'Jun'} = '06';
-$monthname2num{'Jul'} = '07';
-$monthname2num{'Aug'} = '08';
-$monthname2num{'Sep'} = '09';
-$monthname2num{'Oct'} = '10';
-$monthname2num{'Nov'} = '11';
-$monthname2num{'Dec'} = '12';
+getopts('vsn:o');
 
 ######################################################################
 # SUBROUTINES
 ######################################################################
 sub csv_to_hash
 {
-    my ($filename, $hashref) = @_;
-
-    open(FILE,$filename) || die "-E- Could not open $filename for reading\n";
-
-    my $found_header = 0; my $index = 0;
-    while(<FILE>)
-    {
-	$line = $_;
-	@data = split /\",/, $line;
-	if(!$found_header) { @header = @data; $found_header = 1; }
-	else {
-	    foreach $i (0..$#data-1) {
-		$data[$i] =~ s/\"//g;
-		$header[$i] =~ s/\"//g;
-	        $hashref->{$index}{$header[$i]} = $data[$i];
-		#print "$index: $i: $header[$i]: $data[$i]\n";
-	    }
-	    $index++;
+	my ($filename, $hashref) = @_;
+
+	open(FILE,$filename) || die "-E- Could not open $filename for reading\n";
+
+	my $found_header = 0; my $index = 0;
+	while(<FILE>)
+	{
+		$line = $_;
+		@data = split /\",/, $line;
+		if(!$found_header) { @header = @data; $found_header = 1; }
+		else {
+			foreach $i (0..$#data-1) {
+				$data[$i] =~ s/\"//g;
+				$header[$i] =~ s/\"//g;
+				$hashref->{$index}{$header[$i]} = $data[$i];
+				#print "$index: $i: $header[$i]: $data[$i]\n";
+			}
+			$index++;
+		}
 	}
-    }
-    
-    close(FILE);
-}
-
-######################################################################
-sub print_hash
-{
-    my ($hashref) = @_;
 
-    foreach $key (sort {$a <=> $b} keys %$hashref) {
-	print "Index: $key\n";
-	foreach $field (keys %{$hashref->{$key}}) {
-	    print "$field: $hashref->{$key}{$field}\n";
-	}
-	print "\n";
-    }
+	close(FILE);
 }
 
 ######################################################################
-sub print_birthdays
+sub print_hash
 {
-    my ($hashref) = @_;
-
-    foreach $key (sort {$a <=> $b} keys %$hashref) {
-	$name = "";
-	$birthday = "";
-	foreach $field (keys %{$hashref->{$key}}) {
-	    if($field =~ /Full Name/) { $name = $hashref->{$key}{$field}; }
-	    if($field =~ /Birth/) { $birthday = $hashref->{$key}{$field}; }
+	my ($hashref) = @_;
+
+	foreach $key (sort {$a <=> $b} keys %$hashref) {
+		print "Index: $key\n";
+		foreach $field (keys %{$hashref->{$key}}) {
+			print "$field: $hashref->{$key}{$field}\n";
+		}
+		print "\n";
 	}
-	if($name ne "" && $birthday ne "") { printf "%-30s %-10s\n",$name,$birthday; }
-    }
 }
 
 ######################################################################
@@ -106,14 +77,12 @@ print "-> Processing all ward data files in $datadir\n";
 &csv_to_hash("$datadir/HomeTeaching.csv",\%hometeaching_data);
 
 if($opt_v) {
-    print "-> Membership Data Dump\n\n";
-    &print_hash(\%membership_data);
-    print "-> HomeTeaching Data Dump\n\n";
-    &print_hash(\%hometeaching_data);
+	print "-> Membership Data Dump\n\n";
+	&print_hash(\%membership_data);
+	print "-> HomeTeaching Data Dump\n\n";
+	&print_hash(\%hometeaching_data);
 }
 
-if($opt_b) { &print_birthdays(\%membership_data); }
-
 if($opt_s) { $dbh->disconnect(); exit; }
 
 ###################################################