details: /erp/devel/pi/rev/4a410faff223
changeset: 6457:4a410faff223
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Feb 18 18:22:05 2010 +0530
summary: Fixes Issue 11793: An error appears when a csv is imported in Import
File Loader.
diffstat:
src/org/openbravo/erpCommon/ad_forms/FileImport.java | 17 ++++++++++----
src/org/openbravo/erpCommon/ad_forms/FileImport_data.xsql | 5 ++-
2 files changed, 15 insertions(+), 7 deletions(-)
diffs (65 lines):
diff -r 160a70ea1019 -r 4a410faff223
src/org/openbravo/erpCommon/ad_forms/FileImport.java
--- a/src/org/openbravo/erpCommon/ad_forms/FileImport.java Thu Feb 18
13:44:45 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/FileImport.java Thu Feb 18
18:22:05 2010 +0530
@@ -119,7 +119,7 @@
constant = constant + 1;
} else
texto.append(parseField(data2[i].getField(String.valueOf(j -
constant)),
- data[j].fieldlength, data[j].datatype, data[j].dataformat,
data[j].decimalpoint));
+ data[j].fieldlength, data[j].datatype, data[j].dataformat,
data[j].decimalpoint, ""));
if (i == 0 && strFirstLineHeader.equalsIgnoreCase("Y"))
texto.append("</th>");
else
@@ -175,7 +175,8 @@
constant = constant + 1;
} else
strValues.append(parseField(data2[i].getField(String.valueOf(j -
constant)),
- data[j].fieldlength, data[j].datatype, data[j].dataformat,
data[j].decimalpoint));
+ data[j].fieldlength, data[j].datatype, data[j].dataformat,
data[j].decimalpoint,
+ data[j].referencename));
strValues.append("'");
strFields.append(strValues);
strValues.delete(0, strValues.length());
@@ -228,7 +229,11 @@
}
private String parseField(String strTexto, String strLength, String
strDataType,
- String strDataFormat, String strDecimalPoint) throws ServletException {
+ String strDataFormat, String strDecimalPoint, String strReferenceName)
+ throws ServletException {
+ if (strReferenceName.equals("TableDir")) {
+ strLength = "32";
+ }
if (strDataType.equals("D")) {
strTexto = FileImportData.parseDate(this, strTexto, strDataFormat);
return strTexto;
@@ -364,8 +369,10 @@
sb.append(data[j].constantvalue);
constant = constant + 1;
} else
- sb.append(parseField(data2[i].getField(String.valueOf(j -
constant)),
- data[j].fieldlength, data[j].datatype, data[j].dataformat,
data[j].decimalpoint));
+ sb
+ .append(parseField(data2[i].getField(String.valueOf(j -
constant)),
+ data[j].fieldlength, data[j].datatype, data[j].dataformat,
+ data[j].decimalpoint, ""));
if (i == 0 && strFirstLineHeader.equalsIgnoreCase("Y"))
sb.append("</th>");
else
diff -r 160a70ea1019 -r 4a410faff223
src/org/openbravo/erpCommon/ad_forms/FileImport_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/FileImport_data.xsql Thu Feb 18
13:44:45 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/FileImport_data.xsql Thu Feb 18
18:22:05 2010 +0530
@@ -28,10 +28,11 @@
<SqlMethodComment></SqlMethodComment>
<Sql> <![CDATA[
SELECT f.SeqNo,c.ColumnName,f.StartNo,f.EndNo,f.DataType,c.FieldLength,
- f.DataFormat,f.DecimalPoint,f.DivideBy100,f.ConstantValue,f.Callout,
f.Name
- FROM AD_ImpFormat_Row f,AD_Column c
+ f.DataFormat,f.DecimalPoint,f.DivideBy100,f.ConstantValue,f.Callout,
f.Name, r.name AS referenceName
+ FROM AD_ImpFormat_Row f,AD_Column c, AD_Reference r
WHERE AD_ImpFormat_ID = ?
AND f.AD_Column_ID=c.AD_Column_ID
+ AND r.AD_Reference_ID=c.AD_Reference_ID
ORDER BY SeqNo
]]></Sql>
<Parameter name="adImpformatId"/>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
