Improve a few test canonifiers

This commit is contained in:
Daniel Thayer 2015-09-19 18:08:31 -05:00
parent 8a16145e31
commit a7aa393aef
3 changed files with 21 additions and 19 deletions

View file

@ -4,8 +4,8 @@
# prefix. # prefix.
if [ $# != 1 ]; then if [ $# != 1 ]; then
echo "usage: `basename $0` <field prefix>" echo "usage: `basename $0` <field prefix>"
exit 1 exit 1
fi fi
awk -v "PREFIX=$1" ' awk -v "PREFIX=$1" '
@ -18,17 +18,15 @@ BEGIN { FS="\t"; OFS="\t"; }
if ( index($i, PREFIX) == 1 ) if ( index($i, PREFIX) == 1 )
rem[i-1] = 1; rem[i-1] = 1;
} }
print; }
next;
/^[^#]/ {
for ( i in rem )
# Mark that it is set, but ignore content.
$i = "+";
} }
{ {
for ( i in rem )
# Mark that it iss set, but ignore content.
$i = "+";
print; print;
} }
' '

View file

@ -13,13 +13,15 @@ $1 == "#path" && $2 == "files" {
process = 1; process = 1;
} }
process && column1 > 0 && column2 > 0 { /^[^#]/ {
$column1 = "XXXXXXXXXXX"; if ( process && column1 > 0 && column2 > 0 ) {
$column2 = "XXXXXXXXXXX"; $column1 = "XXXXXXXXXXX";
$column2 = "XXXXXXXXXXX";
}
} }
/^#/ { /^#fields/ {
for ( i = 0; i < NF; ++i ) { for ( i = 2; i <= NF; ++i ) {
if ( $i == "fuid" ) if ( $i == "fuid" )
column1 = i - 1; column1 = i - 1;

View file

@ -5,12 +5,14 @@
awk ' awk '
BEGIN { FS="\t"; OFS="\t"; } BEGIN { FS="\t"; OFS="\t"; }
column > 0 { /^[^#]/ {
$column = "XXXXXXXXXXX"; if ( column > 0 ) {
$column = "XXXXXXXXXXX";
} }
}
/^#/ { /^#fields/ {
for ( i = 0; i < NF; ++i ) { for ( i = 2; i <= NF; ++i ) {
if ( $i == "uid" ) if ( $i == "uid" )
column = i - 1; column = i - 1;
} }