Author: magicaltrout
Date: Tue Nov 11 00:53:02 2014
New Revision: 1638002
URL: http://svn.apache.org/r1638002
Log:
OODT-792 Lookup fields from flow
Modified:
oodt/trunk/tools/pdi_plugin/build.xml
oodt/trunk/tools/pdi_plugin/ivy.xml
oodt/trunk/tools/pdi_plugin/ivysettings.xml
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrcheck/FilemgrCheckStepMeta.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrdelete/FilemgrDeleteStepMeta.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrget/FilemgrGetStepMeta.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepDialog.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepMeta.java
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
Modified: oodt/trunk/tools/pdi_plugin/build.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/build.xml?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
--- oodt/trunk/tools/pdi_plugin/build.xml (original)
+++ oodt/trunk/tools/pdi_plugin/build.xml Tue Nov 11 00:53:02 2014
@@ -41,13 +41,13 @@
<fileset dir="build" />
</copy>
- <copy file="eclipse/classpath.xml"
tofile="${approot.stage.dir}/.classpath">
+ <!--<copy file="eclipse/classpath.xml"
tofile="${approot.stage.dir}/.classpath">
<filterset>
<filter token="PROJECT-REVISION"
value="${project.revision}"/>
<filter token="METASTORE-REVISION"
value="${dependency.pentaho-metadata.revision}"/>
</filterset>
- </copy>
- <copy file="eclipse/project.xml"
tofile="${approot.stage.dir}/.project" />
+ </copy>-->
+ <!--<copy file="eclipse/project.xml"
tofile="${approot.stage.dir}/.project" />-->
</target>
Modified: oodt/trunk/tools/pdi_plugin/ivy.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/ivy.xml?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
Binary files - no diff available.
Modified: oodt/trunk/tools/pdi_plugin/ivysettings.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/ivysettings.xml?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
Binary files - no diff available.
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrcheck/FilemgrCheckStepMeta.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrcheck/FilemgrCheckStepMeta.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrcheck/FilemgrCheckStepMeta.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrcheck/FilemgrCheckStepMeta.java
Tue Nov 11 00:53:02 2014
@@ -62,7 +62,7 @@ import java.util.List;
@Step(
id = "FilemgrCheck",
- image = "bi/meteorite/filemgrcheck/resources/check/oodt.jpg",
+ image = "org/apache/oodt/filemgrcheck/resources/check/oodt.jpg",
i18nPackageName="bi.meteorite.filemgrcheck",
name="FilemgrCheckStep.Name",
description = "FilemgrCheckStep.TooltipDesc",
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrdelete/FilemgrDeleteStepMeta.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrdelete/FilemgrDeleteStepMeta.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrdelete/FilemgrDeleteStepMeta.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrdelete/FilemgrDeleteStepMeta.java
Tue Nov 11 00:53:02 2014
@@ -63,7 +63,7 @@ import java.util.List;
@Step(
id = "FilemgrCheck",
- image =
"org/pentaho/di/sdk/samples/steps/demo/resources/icon.png",
+ image = "org/apache/oodt/filemgrcheck/resources/check/oodt.jpg",
i18nPackageName="bi.meteorite.filemgrcheck",
name="FilemgrCheckStep.Name",
description = "FilemgrCheckStep.TooltipDesc",
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrget/FilemgrGetStepMeta.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrget/FilemgrGetStepMeta.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrget/FilemgrGetStepMeta.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgrget/FilemgrGetStepMeta.java
Tue Nov 11 00:53:02 2014
@@ -60,7 +60,7 @@ import java.util.List;
@Step(
id = "FilemgrGet",
- image = "bi/meteorite/filemgrget/resources/get/oodt.jpg",
+ image = "org/apache/oodt/filemgrcheck/resources/check/oodt.jpg",
i18nPackageName="bi.meteorite.filemgrget",
name="FilemgrGetStep.Name",
description = "FilemgrGetStep.TooltipDesc",
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
Tue Nov 11 00:53:02 2014
@@ -96,7 +96,7 @@ public class FilemgrIngestStep extends B
oodt.loadIngester(meta.getServerURLField());
} catch (InstantiationException e) {
logError(e.getMessage());
- e.printStackTrace();
+
}
return super.init(meta, data);
@@ -165,10 +165,6 @@ public class FilemgrIngestStep extends B
Metadata m = oodtproc.getMetadata((String)r[idx2]);
oodtproc.ingest(oodt, new File((String)r[idx]), m);
- } catch (Exception e) {
- logError(ExceptionUtils.getStackTrace(e));
- e.printStackTrace();
- }
// safely add the string "Hello World!" at the end of the output row
// the row array will be resized if necessary
@@ -183,7 +179,13 @@ public class FilemgrIngestStep extends B
}
// indicate that processRow() should be called again
- return true;
+
+ } catch (Exception e) {
+ logError(ExceptionUtils.getStackTrace(e));
+ putError(getInputRowMeta(), r, 1L, e.getMessage(), null,
+ "ERR_OODTINGEST_OUTPUT_01");
+ }
+ return true;
}
/**
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepDialog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepDialog.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepDialog.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepDialog.java
Tue Nov 11 00:53:02 2014
@@ -19,16 +19,21 @@
package org.apache.oodt.filemgringest;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.*;
import org.pentaho.di.core.Const;
+import org.pentaho.di.core.exception.KettleStepException;
+import org.pentaho.di.core.row.RowMetaInterface;
+import org.pentaho.di.core.row.ValueMetaInterface;
import org.pentaho.di.i18n.BaseMessages;
import org.pentaho.di.trans.TransMeta;
import org.pentaho.di.trans.step.BaseStepMeta;
import org.pentaho.di.trans.step.StepDialogInterface;
+import org.pentaho.di.trans.step.StepMeta;
import org.pentaho.di.ui.trans.step.BaseStepDialog;
/**
@@ -64,12 +69,13 @@ public class FilemgrIngestStepDialog ext
//private Text wHelloFieldName;
// text field holding the name of the field to check the filename against
- private Text wFilenameField;
+ private CCombo wFilenameField;
private Text wServerURLField;
private Text wResultField;
- private Text wMetadataField;
+ private CCombo wMetadataField;
+ private Button m_getFieldsBut;
- /**
+ /**
* The constructor should simply invoke super() and save the incoming
meta
* object to a local variable, so it can conveniently read and write
settings
* from/to it.
@@ -165,16 +171,33 @@ public class FilemgrIngestStepDialog ext
fdlValName.top = new FormAttachment(wStepname, margin);
wlValName.setLayoutData(fdlValName);
- wFilenameField = new Text(shell, SWT.SINGLE | SWT.LEFT |
SWT.BORDER);
+
+ wFilenameField = new CCombo(shell, SWT.SINGLE | SWT.LEFT |
SWT.BORDER);
props.setLook(wFilenameField);
wFilenameField.addModifyListener(lsMod);
FormData fdValName = new FormData();
fdValName.left = new FormAttachment(middle, 0);
- fdValName.right = new FormAttachment(100, 0);
+ ///fdValName.right = new FormAttachment(m_getFieldsBut,
-margin);
+ fdValName.right = new FormAttachment(100,0);
fdValName.top = new FormAttachment(wStepname, margin);
wFilenameField.setLayoutData(fdValName);
+/*
+ m_getFieldsBut = new Button(shell, SWT.PUSH | SWT.CENTER);
+ props.setLook(m_getFieldsBut);
+ m_getFieldsBut.setText(BaseMessages.getString(PKG,
+ "SSTableOutputDialog.GetFields.Button"));
+ FormData fd = new FormData();
+ fd.right = new FormAttachment(100, 0);
+ fdValName.top = new FormAttachment(wStepname, margin);
+ m_getFieldsBut.setLayoutData(fd);
+ m_getFieldsBut.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ setupFieldsCombo();
+ }
+ });*/
// output field value
Label wlMetadataName = new Label(shell, SWT.RIGHT);
wlMetadataName.setText(BaseMessages.getString(PKG,
"FilemgrIngest.MetadataFieldName.Label"));
@@ -185,7 +208,7 @@ public class FilemgrIngestStepDialog ext
fdlMetadataName.top = new FormAttachment(wFilenameField, margin);
wlMetadataName.setLayoutData(fdlMetadataName);
- wMetadataField = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
+ wMetadataField = new CCombo(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
props.setLook(wMetadataField);
wMetadataField.addModifyListener(lsMod);
FormData fdMetadataName = new FormData();
@@ -293,6 +316,7 @@ public class FilemgrIngestStepDialog ext
* and puts it into the dialog controls.
*/
private void populateDialog() {
+ setupFieldsCombo();
wStepname.selectAll();
wFilenameField.setText(meta.getFilenameField());
wServerURLField.setText(meta.getServerURLField());
@@ -330,4 +354,35 @@ public class FilemgrIngestStepDialog ext
// close the SWT dialog window
dispose();
}
+
+ protected void setupFieldsCombo() {
+
+ StepMeta stepMeta = transMeta.findStep(stepname);
+ if (stepMeta != null) {
+ try {
+ RowMetaInterface row = transMeta.getPrevStepFields(stepMeta);
+
+ if (row.size() == 0) {
+ /*MessageDialog.openError(shell, BaseMessages.getString(PKG,
+ "SSTableOutputData.Message.NoIncomingFields.Title"),
BaseMessages
+ .getString(PKG,
"SSTableOutputData.Message.NoIncomingFields"));*/
+ return;
+ }
+ wFilenameField.removeAll();
+ for (int i = 0; i < row.size(); i++) {
+ ValueMetaInterface vm = row.getValueMeta(i);
+ wFilenameField.add(vm.getName());
+ }
+
+ wMetadataField.removeAll();
+ for (int i = 0; i < row.size(); i++) {
+ ValueMetaInterface vm = row.getValueMeta(i);
+ wMetadataField.add(vm.getName());
+ }
+
+ } catch (KettleStepException e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepMeta.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepMeta.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepMeta.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStepMeta.java
Tue Nov 11 00:53:02 2014
@@ -63,7 +63,7 @@ import java.util.List;
@Step(
id = "FilemgrIngest",
- image = "bi/meteorite/filemgringest/resources/oodt.jpg",
+ image = "org/apache/oodt/filemgrcheck/resources/check/oodt.jpg",
i18nPackageName="bi.meteorite.filemgringest",
name="FilemgrIngestStep.Name",
description = "FilemgrIngestStep.TooltipDesc",
@@ -136,10 +136,10 @@ public class FilemgrIngestStepMeta exten
*/
public void setDefault() {
outputField = "demo_field";
- filenameField = "fieldname";
+ filenameField = "";
serverURLField = "http://localhost:9000";;
resultField = "result";
- metadataField = "metadata";
+ metadataField = "";
}
/**
Modified:
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java?rev=1638002&r1=1638001&r2=1638002&view=diff
==============================================================================
---
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
(original)
+++
oodt/trunk/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
Tue Nov 11 00:53:02 2014
@@ -19,12 +19,14 @@ package org.apache.oodt.filemgringest;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
+
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
import org.apache.oodt.cas.metadata.Metadata;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.logging.Logger;
/**
@@ -45,14 +47,18 @@ public class OODTProcesses {
Gson gson=new Gson();
Hashtable table = new Hashtable<String, String>();
table = (Hashtable<String, String>) gson.fromJson(json,
table.getClass());
+ Hashtable<String,Object> ht = new Hashtable<String,Object>();
ArrayList l = (ArrayList) table.get("data");
+ if(l!=null) {
LinkedTreeMap d = (LinkedTreeMap) l.get(0);
- Hashtable<String,Object> ht = new Hashtable<String,Object>();
-
+ ht.putAll(d);
+ }
+ else{
+ ht.putAll(table);
+ }
- ht.putAll(d);
Metadata m = new Metadata();
m.addMetadata(ht);
