diff --git a/src/main/java/com/sforce/dataset/DatasetUtilConstants.java b/src/main/java/com/sforce/dataset/DatasetUtilConstants.java index 0530470..0bea49c 100644 --- a/src/main/java/com/sforce/dataset/DatasetUtilConstants.java +++ b/src/main/java/com/sforce/dataset/DatasetUtilConstants.java @@ -35,7 +35,7 @@ public class DatasetUtilConstants { public static final int DEFAULT_BUFFER_SIZE = 8*1024*1024; - public static boolean createNewDateParts = false; +// public static boolean createNewDateParts = false; public static final String defaultEndpoint = "https://login.salesforce.com/services/Soap/u/32.0"; public static final String defaultTestEndpoint = "https://test.salesforce.com/services/Soap/u/32.0"; diff --git a/src/main/java/com/sforce/dataset/DatasetUtilMain.java b/src/main/java/com/sforce/dataset/DatasetUtilMain.java index ccaffe3..9ec3b40 100644 --- a/src/main/java/com/sforce/dataset/DatasetUtilMain.java +++ b/src/main/java/com/sforce/dataset/DatasetUtilMain.java @@ -200,11 +200,11 @@ else if(args[i-1].equalsIgnoreCase("--rootObject")) { params.rootObject = args[i]; } - else if(args[i-1].equalsIgnoreCase("--createNewDateParts")) - { - if(args[i]!=null && args[i].trim().equalsIgnoreCase("true")) - DatasetUtilConstants.createNewDateParts = true; - } +// else if(args[i-1].equalsIgnoreCase("--createNewDateParts")) +// { +// if(args[i]!=null && args[i].trim().equalsIgnoreCase("true")) +// DatasetUtilConstants.createNewDateParts = true; +// } else if(args[i-1].equalsIgnoreCase("--fileEncoding")) { params.fileEncoding = args[i]; diff --git a/src/main/java/com/sforce/dataset/loader/DatasetLoader.java b/src/main/java/com/sforce/dataset/loader/DatasetLoader.java index 11d4793..af313a2 100644 --- a/src/main/java/com/sforce/dataset/loader/DatasetLoader.java +++ b/src/main/java/com/sforce/dataset/loader/DatasetLoader.java @@ -314,8 +314,8 @@ public static boolean uploadDataset(String inputFileString, // } ExternalFileSchema altSchema = schema; - if(DatasetUtilConstants.createNewDateParts) - altSchema = ExternalFileSchema.getSchemaWithNewDateParts(schema); +// if(DatasetUtilConstants.createNewDateParts) +// altSchema = ExternalFileSchema.getSchemaWithNewDateParts(schema); String hdrId = getLastIncompleteFileHdr(partnerConnection, datasetAlias, logger); if(hdrId!=null) diff --git a/src/main/java/com/sforce/dataset/loader/EbinFormatWriter.java b/src/main/java/com/sforce/dataset/loader/EbinFormatWriter.java index ff72c37..bb1b75c 100644 --- a/src/main/java/com/sforce/dataset/loader/EbinFormatWriter.java +++ b/src/main/java/com/sforce/dataset/loader/EbinFormatWriter.java @@ -130,8 +130,8 @@ public EbinFormatWriter(OutputStream out, FieldType[] dataTypes,PrintStream logg _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Quarter", null, null)); _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Week", null, null)); - if(DatasetUtilConstants.createNewDateParts) - { +// if(DatasetUtilConstants.createNewDateParts) +// { _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Hour", null, null)); _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Minute", null, null)); _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Second", null, null)); @@ -143,7 +143,7 @@ public EbinFormatWriter(OutputStream out, FieldType[] dataTypes,PrintStream logg _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Quarter_Fiscal", null, null)); _dataTypes.add(FieldType.GetStringKeyDataType(dataType.getName() + "_Week_Fiscal", null, null)); } - } +// } } } @@ -323,8 +323,8 @@ public void addrow(String[] values) throws IOException,NumberFormatException, P key_value_count++; //This check is temporary remove when schema supports these new data parts - if(DatasetUtilConstants.createNewDateParts) - { +// if(DatasetUtilConstants.createNewDateParts) +// { //dim_values.add(Integer.toString(hour)); //dim_keys.add(_dataTypes.get(key_value_count).getName()); curr.put(_dataTypes.get(key_value_count).getName(), null); @@ -362,7 +362,7 @@ public void addrow(String[] values) throws IOException,NumberFormatException, P curr.put(_dataTypes.get(key_value_count).getName(), null); key_value_count++; } - } +// } }else { Date dt = null; @@ -444,8 +444,8 @@ public void addrow(String[] values) throws IOException,NumberFormatException, P key_value_count++; //This check is temporary remove when schema supports these new data parts - if(DatasetUtilConstants.createNewDateParts) - { +// if(DatasetUtilConstants.createNewDateParts) +// { dim_values.add(df.format(hour)); dim_keys.add(_dataTypes.get(key_value_count).getName()); curr.put(_dataTypes.get(key_value_count).getName(), hour); @@ -488,7 +488,7 @@ public void addrow(String[] values) throws IOException,NumberFormatException, P curr.put(_dataTypes.get(key_value_count).getName(), fiscal_week); key_value_count++; } - } +// } }