Skip to content

Commit

Permalink
Revert "TextFileInput changes"
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdamour1976
mdamour1976 committed Aug 28, 2015
1 parent e76029f commit 8708f6c
Show file tree
Hide file tree
Showing 68 changed files with 3,557 additions and 15,059 deletions.
34 changes: 15 additions & 19 deletions core/src/org/pentaho/di/core/messages/messages_en_US.properties
View file
Expand Up @@ -58,26 +58,22 @@ LogWriter.Level.Basic.LongDesc=Basic logging
TransAction.label.ChangeJobEntry=change job-entry TransAction.label.ChangeJobEntry=change job-entry
Spoon.Log.SavePropertiesFailedWindowsBugAttr=The Spoon properties file [{0}] cannot be saved because you are using windows and the file is marked as ''hidden'' (general Java bug). Please first unset the ''hidden'' attribute, after that your configuration settings are going to saved. Spoon.Log.SavePropertiesFailedWindowsBugAttr=The Spoon properties file [{0}] cannot be saved because you are using windows and the file is marked as ''hidden'' (general Java bug). Please first unset the ''hidden'' attribute, after that your configuration settings are going to saved.


Const.DateFormat.Count=19 Const.DateFormat.Count=15
Const.DateFormat1=yyyy/MM/dd HH\:mm\:ss.SSS Const.DateFormat1=yyyy/MM/dd HH\:mm\:ss.SSS
Const.DateFormat2=yyyy/MM/dd HH\:mm\:ss.SSS XXX Const.DateFormat2=yyyy/MM/dd HH\:mm\:ss
Const.DateFormat3=yyyy/MM/dd HH\:mm\:ss Const.DateFormat3=yyyyMMddHHmmss
Const.DateFormat4=yyyy/MM/dd HH\:mm\:ss XXX Const.DateFormat4=yyyy/MM/dd
Const.DateFormat5=yyyyMMddHHmmss Const.DateFormat5=yyyy-MM-dd
Const.DateFormat6=yyyy/MM/dd Const.DateFormat6=yyyy-MM-dd HH\:mm\:ss
Const.DateFormat7=yyyy-MM-dd Const.DateFormat7=yyyyMMdd
Const.DateFormat8=yyyy-MM-dd HH\:mm\:ss Const.DateFormat8=MM/dd/yyyy
Const.DateFormat9=yyyy-MM-dd HH\:mm\:ss XXX Const.DateFormat9=MM/dd/yyyy HH\:mm\:ss
Const.DateFormat10=yyyyMMdd Const.DateFormat10=MM-dd-yyyy
Const.DateFormat11=MM/dd/yyyy Const.DateFormat11=MM-dd-yyyy HH\:mm\:ss
Const.DateFormat12=MM/dd/yyyy HH\:mm\:ss Const.DateFormat12=MM/dd/yy
Const.DateFormat13=MM-dd-yyyy Const.DateFormat13=MM-dd-yy
Const.DateFormat14=MM-dd-yyyy HH\:mm\:ss Const.DateFormat14=dd/MM/yyyy
Const.DateFormat15=MM/dd/yy Const.DateFormat15=dd-MM-yyyy
Const.DateFormat16=MM-dd-yy
Const.DateFormat17=dd/MM/yyyy
Const.DateFormat18=dd-MM-yyyy
Const.DateFormat19=yyyy-MM-dd''T''HH\:mm\:ss.SSSXXX


ResultFile.FileType.ErrorLine=Error line ResultFile.FileType.ErrorLine=Error line
TransAction.label.PositionStep=position step TransAction.label.PositionStep=position step
Expand Down
22 changes: 11 additions & 11 deletions core/src/org/pentaho/di/core/row/value/ValueMetaBase.java
View file
Expand Up @@ -694,19 +694,19 @@ protected synchronized Date convertStringToDate( String string ) throws KettleVa
} }


try { try {
ParsePosition pp = new ParsePosition( 0 ); // PDI 5595 need to add ISO 8601 support for java 1.6
Date result = getDateFormat().parse( string, pp ); String df = ( getDateFormat() != null ) ? getDateFormat().toPattern() : null;
if ( pp.getErrorIndex() >= 0 ) { if ( df != null ) {
// error happen if ( getQuotesBeforeSymbol( df, "Z" ) % 2 == 0 ) {
throw new ParseException( string, pp.getErrorIndex() ); if ( string.contains( "Z" ) ) {
} string = string.replace( "Z", "UTC" );
for ( int i = pp.getIndex(); i < string.length(); i++ ) { } else if ( string.matches( ".*[\\+|\\-]\\d\\d:\\d\\d" ) ) {
// only space chars can be placed after date int lPos = string.lastIndexOf( ":" );
if ( !Character.isWhitespace( string.charAt( i ) ) ) { string = string.substring( 0, lPos ) + string.substring( lPos + 1 );
throw new ParseException( string, pp.getIndex() ); }
} }
} }
return result; return getDateFormat().parse( string );
} catch ( ParseException e ) { } catch ( ParseException e ) {
String dateFormat = ( getDateFormat() != null ) ? getDateFormat().toPattern() : "null"; String dateFormat = ( getDateFormat() != null ) ? getDateFormat().toPattern() : "null";
throw new KettleValueException( toString() + " : couldn't convert string [" + string throw new KettleValueException( toString() + " : couldn't convert string [" + string
Expand Down
30 changes: 7 additions & 23 deletions core/src/org/pentaho/di/core/util/StringEvaluator.java
View file
Expand Up @@ -34,7 +34,6 @@
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;


import org.apache.commons.lang.StringUtils;
import org.pentaho.di.core.Const; import org.pentaho.di.core.Const;
import org.pentaho.di.core.exception.KettleValueException; import org.pentaho.di.core.exception.KettleValueException;
import org.pentaho.di.core.row.ValueMeta; import org.pentaho.di.core.row.ValueMeta;
Expand Down Expand Up @@ -120,13 +119,10 @@ private void challengeConversions( String value ) {
} else { } else {
string = value; string = value;
} }
if ( StringUtils.isEmpty( value ) ) { if ( !( "Y".equalsIgnoreCase( string )
cmm.incrementNrNull(); || "N".equalsIgnoreCase( string ) || "TRUE".equalsIgnoreCase( string ) || "FALSE"
} else if ( !( "Y".equalsIgnoreCase( string ) || "N".equalsIgnoreCase( string ) || "TRUE".equalsIgnoreCase( .equalsIgnoreCase( string ) ) ) {
string ) || "FALSE".equalsIgnoreCase( string ) ) ) {
evaluationResults.remove( cmm ); evaluationResults.remove( cmm );
} else {
cmm.incrementSuccesses();
} }
} else { } else {
try { try {
Expand Down Expand Up @@ -203,10 +199,6 @@ private void challengeConversions( String value ) {
cmm.setMax( object ); cmm.setMax( object );
} }


if ( !cmm.getConversionMeta().isNull( object ) ) {
cmm.incrementSuccesses();
}

} catch ( KettleValueException e ) { } catch ( KettleValueException e ) {
// This one doesn't work, remove it from the list! // This one doesn't work, remove it from the list!
// //
Expand All @@ -231,7 +223,7 @@ private void evaluatePrecision( String value ) {


private boolean containsInteger() { private boolean containsInteger() {
for ( StringEvaluationResult result : evaluationResults ) { for ( StringEvaluationResult result : evaluationResults ) {
if ( result.getConversionMeta().isInteger() && result.getNrSuccesses() > 0 ) { if ( result.getConversionMeta().isInteger() ) {
return true; return true;
} }
} }
Expand All @@ -240,7 +232,7 @@ private boolean containsInteger() {


private boolean containsNumber() { private boolean containsNumber() {
for ( StringEvaluationResult result : evaluationResults ) { for ( StringEvaluationResult result : evaluationResults ) {
if ( result.getConversionMeta().isNumber() && result.getNrSuccesses() > 0 ) { if ( result.getConversionMeta().isNumber() ) {
return true; return true;
} }
} }
Expand All @@ -249,7 +241,7 @@ private boolean containsNumber() {


private boolean containsDate() { private boolean containsDate() {
for ( StringEvaluationResult result : evaluationResults ) { for ( StringEvaluationResult result : evaluationResults ) {
if ( result.getConversionMeta().isDate() && result.getNrSuccesses() > 0 ) { if ( result.getConversionMeta().isDate() ) {
return true; return true;
} }
} }
Expand Down Expand Up @@ -490,18 +482,10 @@ public Set<String> getValues() {
} }


/** /**
* PDI-7736: Only list of successful evaluations returned.
*
* @return The list of string evaluation results * @return The list of string evaluation results
*/ */
public List<StringEvaluationResult> getStringEvaluationResults() { public List<StringEvaluationResult> getStringEvaluationResults() {
List<StringEvaluationResult> result = new ArrayList<>(); return evaluationResults;
for ( StringEvaluationResult ev : evaluationResults ) {
if ( ev.getNrSuccesses() > 0 ) {
result.add( ev );
}
}
return result;
} }


/** /**
Expand Down
6 changes: 3 additions & 3 deletions core/test-src/org/pentaho/di/core/row/ValueMetaTest.java
View file
Expand Up @@ -191,7 +191,7 @@ public void testDateStringDL8601() throws Exception {
TimeZone.setDefault( TimeZone.getTimeZone( "America/New_York" ) ); TimeZone.setDefault( TimeZone.getTimeZone( "America/New_York" ) );


ValueMetaInterface datValueMeta = new ValueMetaString(); ValueMetaInterface datValueMeta = new ValueMetaString();
datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH:mm:ss'.000'XXX" ); datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH:mm:ss'.000'Z" );
try { try {
Date res = datValueMeta.getDate( "2008-03-09T02:34:54.000Z" ); Date res = datValueMeta.getDate( "2008-03-09T02:34:54.000Z" );
// make sure it's what we expect... // make sure it's what we expect...
Expand All @@ -205,7 +205,7 @@ public void testDateStringDL8601() throws Exception {
} }


datValueMeta = new ValueMetaString(); datValueMeta = new ValueMetaString();
datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH:mm:ss'.000'XXX" ); datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH:mm:ss'.000'Z" );
try { try {
Date res = datValueMeta.getDate( "2008-03-09T02:34:54.000+01:00" ); Date res = datValueMeta.getDate( "2008-03-09T02:34:54.000+01:00" );
// make sure it's what we expect... // make sure it's what we expect...
Expand All @@ -219,7 +219,7 @@ public void testDateStringDL8601() throws Exception {
} }


datValueMeta = new ValueMetaString(); datValueMeta = new ValueMetaString();
datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH-mm-ss'.000'XXX" ); datValueMeta.setConversionMask( "yyyy-MM-dd'T'HH-mm-ss'.000'Z" );
try { try {
Date res = datValueMeta.getDate( "2008-03-09T02-34-54.000-01:00" ); Date res = datValueMeta.getDate( "2008-03-09T02-34-54.000-01:00" );
// make sure it's what we expect... // make sure it's what we expect...
Expand Down
52 changes: 2 additions & 50 deletions core/test-src/org/pentaho/di/core/row/value/ValueMetaBaseTest.java
View file
Expand Up @@ -21,27 +21,19 @@
******************************************************************************/ ******************************************************************************/
package org.pentaho.di.core.row.value; package org.pentaho.di.core.row.value;


import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.apache.commons.lang.SystemUtils.*;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_BIGNUMBER; import static org.pentaho.di.core.row.ValueMetaInterface.*;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_BINARY;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_BOOLEAN;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_DATE;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_INET;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_INTEGER;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_NUMBER;
import static org.pentaho.di.core.row.ValueMetaInterface.TYPE_STRING;


import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
Expand All @@ -52,10 +44,7 @@
import java.sql.Timestamp; import java.sql.Timestamp;
import java.sql.Types; import java.sql.Types;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;


import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.junit.BeforeClass; import org.junit.BeforeClass;
Expand Down Expand Up @@ -502,41 +491,4 @@ public void testCompareDate() throws KettleValueException {
assertEquals( 0, dateMeta.compare( date1, date1 ) ); assertEquals( 0, dateMeta.compare( date1, date1 ) );
} }


@Test
public void testDateParsing8601() throws Exception {
ValueMetaBase dateMeta = new ValueMetaBase( "date", TYPE_DATE );
dateMeta.setDateFormatLenient( false );

// try to convert date by 'start-of-date' make - old behavior
try {
dateMeta.setConversionMask( "yyyy-MM-dd" );
dateMeta.convertStringToDate( "1918-03-25T07:40:03.012+03:00" );
fail( "Shouldn't be converted" );
} catch ( KettleValueException ex ) {
}

// convert ISO-8601 date - supported since Java 7
dateMeta.setConversionMask( "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" );
assertEquals( utc( 1918, 3, 25, 5, 10, 3, 12 ), dateMeta.convertStringToDate( "1918-03-25T07:40:03.012+02:30" ) );
assertEquals( utc( 1918, 3, 25, 7, 40, 3, 12 ), dateMeta.convertStringToDate( "1918-03-25T07:40:03.012Z" ) );

// convert date
dateMeta.setConversionMask( "yyyy-MM-dd" );
assertEquals( local( 1918, 3, 25, 0, 0, 0, 0 ), dateMeta.convertStringToDate( "1918-03-25" ) );
// convert date with spaces at the end
assertEquals( local( 1918, 3, 25, 0, 0, 0, 0 ), dateMeta.convertStringToDate( "1918-03-25 \n" ) );
}

Date local( int year, int month, int dat, int hrs, int min, int sec, int ms ) {
GregorianCalendar cal = new GregorianCalendar( year, month - 1, dat, hrs, min, sec );
cal.set( Calendar.MILLISECOND, ms );
return cal.getTime();
}

Date utc( int year, int month, int dat, int hrs, int min, int sec, int ms ) {
GregorianCalendar cal = new GregorianCalendar( year, month - 1, dat, hrs, min, sec );
cal.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
cal.set( Calendar.MILLISECOND, ms );
return cal.getTime();
}
} }
58 changes: 0 additions & 58 deletions core/test-src/org/pentaho/di/core/util/StringEvaluatorTest.java
View file

This file was deleted.

1 change: 0 additions & 1 deletion engine/src/kettle-steps.xml
View file
Expand Up @@ -7,7 +7,6 @@
<step id="SocketWriter"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SocketWriter</description> <classname>org.pentaho.di.trans.steps.socketwriter.SocketWriterMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Inline</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SocketWriter</tooltip> <iconfile>ui/images/SKW.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Socket+writer</documentation_url> <cases_url/> <forum_url/> </step> <step id="SocketWriter"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SocketWriter</description> <classname>org.pentaho.di.trans.steps.socketwriter.SocketWriterMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Inline</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SocketWriter</tooltip> <iconfile>ui/images/SKW.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Socket+writer</documentation_url> <cases_url/> <forum_url/> </step>
<step id="SelectValues"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SelectValues</description> <classname>org.pentaho.di.trans.steps.selectvalues.SelectValuesMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SelectValues</tooltip> <iconfile>ui/images/SEL.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Select+Values</documentation_url> <cases_url>http://jira.pentaho.com/browse/PDI</cases_url> <forum_url>http://forums.pentaho.com/forumdisplay.php?135-Pentaho-Data-Integration-Kettle</forum_url> </step> <step id="SelectValues"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SelectValues</description> <classname>org.pentaho.di.trans.steps.selectvalues.SelectValuesMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SelectValues</tooltip> <iconfile>ui/images/SEL.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Select+Values</documentation_url> <cases_url>http://jira.pentaho.com/browse/PDI</cases_url> <forum_url>http://forums.pentaho.com/forumdisplay.php?135-Pentaho-Data-Integration-Kettle</forum_url> </step>
<step id="TextFileInput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.TextFileInput</description> <classname>org.pentaho.di.trans.steps.textfileinput.TextFileInputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.TextInputFile</tooltip> <iconfile>ui/images/TFI.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Text+File+Input</documentation_url> <cases_url>http://jira.pentaho.com/browse/PDI</cases_url> <forum_url>http://forums.pentaho.com/forumdisplay.php?135-Pentaho-Data-Integration-Kettle</forum_url> </step> <step id="TextFileInput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.TextFileInput</description> <classname>org.pentaho.di.trans.steps.textfileinput.TextFileInputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.TextInputFile</tooltip> <iconfile>ui/images/TFI.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Text+File+Input</documentation_url> <cases_url>http://jira.pentaho.com/browse/PDI</cases_url> <forum_url>http://forums.pentaho.com/forumdisplay.php?135-Pentaho-Data-Integration-Kettle</forum_url> </step>
<step id="OldTextFileInput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.OldTextFileInput</description> <classname>org.pentaho.di.trans.steps.oldtextfileinput.OldTextFileInputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.OldTextInputFile</tooltip> <iconfile>ui/images/TFI.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Text+File+Input</documentation_url> <cases_url>http://jira.pentaho.com/browse/PDI</cases_url> <forum_url>http://forums.pentaho.com/forumdisplay.php?135-Pentaho-Data-Integration-Kettle</forum_url> </step>
<step id="Calculator"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.Caculator</description> <classname>org.pentaho.di.trans.steps.calculator.CalculatorMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Calculator</tooltip> <iconfile>ui/images/CLC.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Calculator</documentation_url> <cases_url/> <forum_url/> </step> <step id="Calculator"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.Caculator</description> <classname>org.pentaho.di.trans.steps.calculator.CalculatorMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Calculator</tooltip> <iconfile>ui/images/CLC.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Calculator</documentation_url> <cases_url/> <forum_url/> </step>
<step id="Constant"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.AddConstants</description> <classname>org.pentaho.di.trans.steps.constant.ConstantMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Addconstants</tooltip> <iconfile>ui/images/CST.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Add+Constants</documentation_url> <cases_url/> <forum_url/> </step> <step id="Constant"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.AddConstants</description> <classname>org.pentaho.di.trans.steps.constant.ConstantMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Addconstants</tooltip> <iconfile>ui/images/CST.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Add+Constants</documentation_url> <cases_url/> <forum_url/> </step>
<step id="Abort"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.Abort</description> <classname>org.pentaho.di.trans.steps.abort.AbortMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Flow</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Abort</tooltip> <iconfile>ui/images/ABR.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Abort</documentation_url> <cases_url/> <forum_url/> </step> <step id="Abort"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.Abort</description> <classname>org.pentaho.di.trans.steps.abort.AbortMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Flow</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Abort</tooltip> <iconfile>ui/images/ABR.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Abort</documentation_url> <cases_url/> <forum_url/> </step>
Expand Down
1 change: 0 additions & 1 deletion engine/src/org/pentaho/di/trans/step/messages/messages_en_US.properties
View file
Expand Up @@ -150,7 +150,6 @@ BaseStepDialog.ErrorHandling.NrErrField.Label=Nr of errors fieldname
BaseStep.TypeLongDesc.LDAPInput=LDAP Input BaseStep.TypeLongDesc.LDAPInput=LDAP Input
BaseStep.Log.OutputRowInfo=output rel. is {0}\:{1} BaseStep.Log.OutputRowInfo=output rel. is {0}\:{1}
BaseStep.TypeLongDesc.TextFileInput=Text file input BaseStep.TypeLongDesc.TextFileInput=Text file input
BaseStep.TypeLongDesc.OldTextFileInput=Old text file input
BaseStep.Log.MaxPercentageRejectedReached=The maximum percentage of rejected rows of {0} has been reached. {1} rows where rejected out of {2}. This transformation is being asked to stop. BaseStep.Log.MaxPercentageRejectedReached=The maximum percentage of rejected rows of {0} has been reached. {1} rows where rejected out of {2}. This transformation is being asked to stop.
BaseStep.TypeTooltipDesc.MergeRows=Merge two streams of rows, sorted on a certain key. The two streams are compared and the equals, changed, deleted and new rows are flagged. BaseStep.TypeTooltipDesc.MergeRows=Merge two streams of rows, sorted on a certain key. The two streams are compared and the equals, changed, deleted and new rows are flagged.
BaseStep.TypeTooltipDesc.StringCut=Strings cut (substring). BaseStep.TypeTooltipDesc.StringCut=Strings cut (substring).
Expand Down

0 comments on commit 8708f6c

Please sign in to comment.