SAP Connecor from Aschauer EDV

git-svn-id: svn://source.pentaho.org/svnkettleroot/Kettle/trunk@12424 5fb7f6ec-07c1-534a-b4ca-9155e429e800

Author: rwintner

src-ui/org/pentaho/di/ui/trans/steps/sapinput/SapInputDialog.java

@@ -19,7 +19,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -479,7 +481,23 @@ private void ok()
 			if (answer==SWT.CANCEL) {
 				return;
 			}
-		}
+		}
+		
+		// check tablecount
+		Set<String> tables = new HashSet<String>();
+		int nrParameters = wOutput.nrNonEmpty();
+		for (int i=0;i<nrParameters;i++) {
+			TableItem item = wOutput.getNonEmpty(i);
+			String tableName = item.getText(3);
+			tables.add(tableName);
+		}
+		if (tables.size() > 1)
+		{
+			int answer = showMultipleOutputTablesWarning(true);
+			if (answer==SWT.CANCEL) {
+				return;
+			}
+		}
 
 		getInfo(input);
 
@@ -489,14 +507,21 @@ private void ok()
 	private void about() {
 		new SapInputAboutDialog(SapInputDialog.this.shell).open();		
 	}
-
+
 	private int showDatabaseWarning(boolean includeCancel) {
 		MessageBox mb = new MessageBox(shell, SWT.OK | ( includeCancel ? SWT.CANCEL : SWT.NONE ) | SWT.ICON_ERROR );
 		mb.setMessage(BaseMessages.getString(PKG, "SapInputDialog.InvalidConnection.DialogMessage")); //$NON-NLS-1$
 		mb.setText(BaseMessages.getString(PKG, "SapInputDialog.InvalidConnection.DialogTitle")); //$NON-NLS-1$
 		return mb.open();
 	}
 
+	private int showMultipleOutputTablesWarning(boolean includeCancel) {
+		MessageBox mb = new MessageBox(shell, SWT.OK | ( includeCancel ? SWT.CANCEL : SWT.NONE ) | SWT.ICON_ERROR );
+		mb.setMessage(BaseMessages.getString(PKG, "SapInputDialog.MultipleOutputTables.DialogMessage")); //$NON-NLS-1$
+		mb.setText(BaseMessages.getString(PKG, "SapInputDialog.MultipleOutputTables.DialogTitle")); //$NON-NLS-1$
+		return mb.open();
+	}
+
 	private void getInfo(SapInputMeta meta) {
 		meta.setDatabaseMeta( transMeta.findDatabase(wConnection.getText()) );
 		meta.setFunction(function);

src/org/pentaho/di/trans/steps/sapinput/messages/messages_en_US.properties

@@ -14,6 +14,7 @@ SapInputDialog.FindFunctionButton.Label=Find it...
 SapInputDialog.DoMapping.UnableToFindInput=Unable to find input
 SapInputDialog.Function.Label=Function
 SapInputDialog.InvalidConnection.DialogTitle=Invallid connection\!
+SapInputDialog.MultipleOutputTables.DialogTitle=Multiple output structures or tables\!
 SapInputDialog.shell.Title=SAP Input
 SapFunctionBrowser.ResultView.Name.Column=Name
 SapInputDialog.ColumnInfo.SAPType=SAP Type
@@ -29,6 +30,7 @@ SapFunctionBrowser.ExceptionDialog.ErrorDuringSearch.Title=Search error\!
 SapInput.Exception.FunctionIsNeeded=A function is needed to make this step operate properly.
 SapInput.Exception.DatabaseConnectionsIsNeeded=An SAP database connection is needed to make this step function properly\!
 SapInputDialog.InvalidConnection.DialogMessage=An invalid connection is specified\:
+SapInputDialog.MultipleOutputTables.DialogMessage=You can only have one output structure or table. Please remove some output fields\!
 SapInputDialog.ClearInputOutput.DialogMessage=Are you sure you want to replace the input and output lines with new data?
 ^SapInputDialog.StepName=Step name 
 ^SapInputDialog.LimitSize=Limit size 

src/org/pentaho/di/trans/steps/sapinput/mock/SAPConnectionFactory.java

@@ -41,9 +41,12 @@ public String getConnectionTestReport(DatabaseMeta databaseMeta)
 
 		StringBuffer report = new StringBuffer();
 
-		SAPConnection sc = create();
+		SAPConnection sc = null;
 
 		try {
+
+			sc = create();
+
 			sc.open(databaseMeta);
 
 			// If the connection was successful

testfiles/blackbox/tests/trans/steps/sapinput/sapinput-test1.ktr

@@ -6,6 +6,7 @@
     <extended_description/>
     <trans_version/>
     <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
     <directory>&#47;</directory>
     <parameters>
     </parameters>
@@ -166,8 +167,8 @@
     <field><field_name>CURRENCY</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CURRENCY</new_name><target_type>String</target_type>    </field>
     <field><field_name>CURRENCY_ISO</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CURRENCY_ISO</new_name><target_type>String</target_type>    </field>
     <field><field_name>ACCTSTATUS</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>ACCTSTATUS</new_name><target_type>String</target_type>    </field>
-    <field><field_name>NET_VALUE</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>NET_VALUE</new_name><target_type>BigNumber</target_type>    </field>
-    <field><field_name>TAX_VALUE</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>TAX_VALUE</new_name><target_type>BigNumber</target_type>    </field>
+    <field><field_name>NET_VALUE</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>NET_VALUE</new_name><target_type>String</target_type>    </field>
+    <field><field_name>TAX_VALUE</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>TAX_VALUE</new_name><target_type>String</target_type>    </field>
     <field><field_name>CANCELLED</field_name><sap_type>STRUCTURE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CANCELLED</new_name><target_type>String</target_type>    </field>
     </fields>
      <cluster_schema/>
@@ -199,8 +200,8 @@
     <parameters>
     <parameter><field_name>SIGN</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>SIGN</parameter_name>    </parameter>
     <parameter><field_name>OPTION</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>OPTION</parameter_name>    </parameter>
-    <parameter><field_name>REF_DOC_LOW1</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>REF_DOC_LOW</parameter_name>    </parameter>
-    <parameter><field_name>REF_DOC_HIGH1</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>REF_DOC_HIGH</parameter_name>    </parameter>
+    <parameter><field_name>REF_DOC_LOW</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>REF_DOC_LOW</parameter_name>    </parameter>
+    <parameter><field_name>REF_DOC_HIGH</field_name><sap_type>STRUCTURE</sap_type><table_name>REFDOCRANGE</table_name><parameter_name>REF_DOC_HIGH</parameter_name>    </parameter>
     </parameters>
     <fields>
     <field><field_name>BILLINGDOC</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>BILLINGDOC</new_name><target_type>String</target_type>    </field>
@@ -210,8 +211,8 @@
     <field><field_name>CURRENCY</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CURRENCY</new_name><target_type>String</target_type>    </field>
     <field><field_name>CURRENCY_ISO</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CURRENCY_ISO</new_name><target_type>String</target_type>    </field>
     <field><field_name>ACCTSTATUS</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>ACCTSTATUS</new_name><target_type>String</target_type>    </field>
-    <field><field_name>NET_VALUE</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>NET_VALUE</new_name><target_type>BigNumber</target_type>    </field>
-    <field><field_name>TAX_VALUE</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>TAX_VALUE</new_name><target_type>BigNumber</target_type>    </field>
+    <field><field_name>NET_VALUE</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>NET_VALUE</new_name><target_type>String</target_type>    </field>
+    <field><field_name>TAX_VALUE</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>TAX_VALUE</new_name><target_type>String</target_type>    </field>
     <field><field_name>CANCELLED</field_name><sap_type>TABLE</sap_type><table_name>BILLINGDOCUMENTDETAIL</table_name><new_name>CANCELLED</new_name><target_type>String</target_type>    </field>
     </fields>
      <cluster_schema/>
@@ -364,7 +365,7 @@
         <precision>-1</precision>
       </field>
       <field>
-        <name>REF_DOC_LOW1</name>
+        <name>REF_DOC_LOW</name>
         <type>String</type>
         <format/>
         <currency/>
@@ -375,7 +376,7 @@
         <precision>-1</precision>
       </field>
       <field>
-        <name>REF_DOC_HIGH1</name>
+        <name>REF_DOC_HIGH</name>
         <type>String</type>
         <format/>
         <currency/>