Merge branch 'hotfix/1.0.1'

Author: Shriram Bhosle

merge2files.pl

@@ -17,6 +17,7 @@
 
 my $col_f1=$options->{'c1'};
 my $col_f2=$options->{'c2'};
+$options->{'hdr'}=0 unless($options->{'hdr'}); 
 chomp $col_f1;
 chomp $col_f2;
 
@@ -25,21 +26,23 @@
 
 # create hash of both the files....
 
-my ($file1_hash)=get_file_hash($fh1,$col_f1,$options->{'h'},$f1);
-my ($file2_hash)=get_file_hash($fh2,$col_f2,$options->{'h'},$f2);
+my ($file1_hash)=get_file_hash($fh1,$col_f1,$options->{'hdr'},$f1);
+my ($file2_hash)=get_file_hash($fh2,$col_f2,$options->{'hdr'},$f2);
 
 #combine files
-combine_hash($file1_hash,$file2_hash,$fh_common,$options->{'h'});
+combine_hash($file1_hash,$file2_hash,$fh_common,$options->{'hdr'});
 
 # sub to combine file data...
 sub combine_hash {
 	my($hash_f1,$hash_f2,$fh_combined,$header)=@_;
 	my $count=0;
-	# Write common rows file...
+	# Write header lines to  file...
 	if($header){
+		print $fh_common $hash_f1->{'pre_header_lines'};
 		print $fh_common $hash_f1->{'header'}."\t".$hash_f2->{'header'}."\n";
 	}
 	#print Dumper $hash_f1;
+  # write common rows
 	foreach my $key(keys %$hash_f1) {
 		next if $key eq 'header';
 		if ($hash_f2->{$key}) {
@@ -52,16 +55,22 @@ sub combine_hash {
 
 # create hash from file
 sub get_file_hash {
-	my ($fh,$columns,$header,$f)=@_;
+	my ($fh,$columns,$header_row,$f)=@_;
 	my $file_hash;
 	my $count=0;	
 	while (my $line=<$fh>) {	
 		$count++;
+		next if $line=~/^\s+\n/;
 		$line=~s/\n//g;
-		my ($col_key) = get_col_key($line,$columns);
-		if($header && $count == 1) {
-			$file_hash->{'header'}="$line";
-			print "Columns to compare from file: $f: $col_key\n"; 
+		my ($col_key) = get_col_key($line,$columns) if $count >= $header_row;
+		if($count <= $header_row ) {
+			if($count==$header_row) {
+			 $file_hash->{'header'}=$line;
+			}
+			else {
+				$file_hash->{'pre_header_lines'}.="$line\n";
+			}
+			print "Columns to compare from file: : $col_key\n" if defined $col_key; 
 			next;
 		} 
 		$file_hash->{$col_key}="$line";
@@ -77,6 +86,7 @@ sub get_file_hash {
 sub get_col_key {
 	my ($line,$columns)=@_;
 	my $col_key;
+	
                 my @col=split(',',$columns);
                 foreach my $col_num(@col) {
                         my($field)=(split "\t", $line)[$col_num - 1];
@@ -103,7 +113,7 @@ sub option_builder {
 					'f2|file2=s'  => \$opts{'f2'},
 					'c1|col1=s'  => \$opts{'c1'},
 					'c2|col2=s'  => \$opts{'c2'},
-					'h|header=s'  => \$opts{'h'},
+					'hdr|header=s'  => \$opts{'hdr'},
 					'v|version'  => \$opts{'v'},
 	);
 
@@ -115,21 +125,20 @@ sub option_builder {
 __END__
 =head1 NAME
 
-compare_files.pl - creates file with matching columns from both files    
+merge2files.pl - creates a single merged file using user defined matching columns from both files    
 
 =head1 SYNOPSIS
 
-createConfig.pl [-h] -p -o  [ -o -h -v ]
+merge2files.pl [-h] -f1 -f2 -c1 -c2 [-hdr]
 
-  Required Options (project must be defined):
+  Required Options:
     --help          (-h)  This message and format of input file
      One or more of the following:
-     
     --file1  (-f1) file1 
     --file2  (-f2) file2 
     --col1  (-c1) comma separated column numbers fom file1  
     --col2  (-c2) comma separated columns numbers fom file2 
-    --header  (-h) [1|0] header line present 
+    --header  (-hdr)  header row number 
 
 =cut