ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

reworked csv-listing

Browse source
This commit is contained in:
Arndt 2014-09-28 14:33:07 +02:00
parent 65d150fd43
commit 1ee41026c1
4 changed files with 21 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

41
brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
View file

@ -166,7 +166,7 @@ public final class BExpressionContext
decode( ld2, ab );
for( int inum = 0; inum < lookupValues.size(); inum++ ) // loop over lookup names
{
if ( ld2[inum] != ld[inum] ) throw new RuntimeException( "assertion failed encoding " + getKeyValueDescription(ab) );
if ( ld2[inum] != ld[inum] ) throw new RuntimeException( "assertion failed encoding " + getKeyValueDescription(false, ab) );
}
return ab;
@ -273,7 +273,7 @@ public final class BExpressionContext
}
}
public String getCsvDescription( boolean inverseDirection, byte[] ab )
public String getKeyValueDescription( boolean inverseDirection, byte[] ab )
{
int inverseBitByteIndex = meta.readVarLength ? 0 : 7;
int abLen = ab.length;
@ -285,41 +285,16 @@ public final class BExpressionContext
decode( lookupData, ab_copy );
for( int inum = 0; inum < lookupValues.size(); inum++ ) // loop over lookup names
{
int idx = meta.readVarLength ? (inum+1)%lookupValues.size() : inum; // reversebit at the end..
BExpressionLookupValue[] va = lookupValues.get(idx);
sb.append( '\t' ).append( va[lookupData[idx]].toString() );
BExpressionLookupValue[] va = lookupValues.get(inum);
String value = va[lookupData[inum]].toString();
if ( value != null && value.length() > 0 )
{
sb.append( " " + lookupNames.get( inum ) + "=" + value );
}
}
return sb.toString();
}
public String getCsvHeader()
{
StringBuilder sb = new StringBuilder( 200 );
for( int inum = 0; inum < lookupNames.size(); inum++ ) // loop over lookup names
{
int idx = meta.readVarLength ? (inum+1)%lookupValues.size() : inum; // reversebit at the end..
sb.append( '\t' ).append( lookupNames.get(idx) );
}
return sb.toString();
}
public String getKeyValueDescription( byte[] ab )
{
StringBuilder sb = new StringBuilder( 200 );
decode( lookupData, ab );
for( int inum = 0; inum < lookupValues.size(); inum++ ) // loop over lookup names
{
BExpressionLookupValue[] va = lookupValues.get(inum);
String value = va[lookupData[inum]].toString();
if ( value != null && value.length() > 0 )
{
sb.append( " " + lookupNames.get( inum ) + "=" + value );
}
}
return sb.toString();
}
private int parsedLines = 0;
private boolean fixTagsWritten = false;