Merge pull request #2382 from rpastrana/h2h_filter_formatchars

#2356 Filter out format related chars from dataformat param Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · May 29, 2012 · 69c5422 · 69c5422
2 parents 5e9a826 + 80ce87e
commit 69c5422
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/dataconnectors/hdfsconnector/ecl/HDFSConnector.ecl b/plugins/dataconnectors/hdfsconnector/ecl/HDFSConnector.ecl
@@ -36,7 +36,7 @@ EXPORT HDFSConnector := MODULE
 
 	export PipeIn(ECL_RS, HadoopFileName, Layout, HadoopFileFormat, HDFSHost, HDSFPort) := MACRO
 	#uniquename(formatstr)
-		%formatstr% := STD.Str.CleanSpaces(#TEXT(HadoopFileFormat));
+		%formatstr% := STD.Str.FilterOut(#TEXT(HadoopFileFormat), ' \t\n\r');
 		#IF(%formatstr%[1..3] = 'XML')
 			#IF (LENGTH(%formatstr%) > 3)
 				#uniquename(rowtagcont)
@@ -136,7 +136,7 @@ EXPORT HDFSConnector := MODULE
 	#uniquename(formatstr)
 	#uniquename(outpartaction)
 	#uniquename(mergepartsaction)
-		%formatstr% := STD.Str.CleanSpaces(#TEXT(HadoopFileFormat));
+		%formatstr% := STD.Str.FilterOut(#TEXT(HadoopFileFormat), ' \t\n\r');
 		#IF(%formatstr%[1..4] != 'FLAT')
 		OUTPUT(ECL_RS,,
 				PIPE('hdfspipe -sop '
@@ -182,7 +182,7 @@ EXPORT HDFSConnector := MODULE
 	#uniquename(formatstr)
 	#uniquename(outpartaction)
 	#uniquename(mergepartsaction)
-		%formatstr% := STD.Str.CleanSpaces(#TEXT(HadoopFileFormat));
+		%formatstr% := STD.Str.FilterOut(#TEXT(HadoopFileFormat), ' \t\n\r');
 		#IF(%formatstr%[1..4] != 'FLAT')
 		//%mergepartsaction% :=DISTRIBUTE(ECL_RS , 1);
 		%outpartaction%:=OUTPUT(ECL_RS,,