@ -131,12 +131,26 @@ function getRawTarget(logline) {
}
}
}
}
function resolveTarget ( timeslot , target ) {
function resolveTarget ( mode , timeslot , target ) {
if ( mode . startsWith ( "DMR" ) ) {
mode = "DMR" ;
}
retval = null ;
retval = null ;
tmpval = talkgroups . filter ( function ( tg ) { return tg [ 0 ] == timeslot } ) ;
tmpval = talkgroups . filter ( function ( tg ) { return tg [ 0 ] == mode } ) ;
retval = tmpval . filter ( function ( tg ) { return tg [ 1 ] == target . substring ( 3 , target . length ) } ) ;
switch ( mode ) {
case "DMR" :
tmpval = talkgroups . filter ( function ( tg ) { return tg [ 1 ] == timeslot } ) ;
retval = tmpval . filter ( function ( tg ) { return tg [ 2 ] == target . substring ( 3 , target . length ) . trim ( ) } ) ;
break ;
case "YSF" :
retval = tmpval . filter ( function ( tg ) { return tg [ 2 ] == target . substring ( 6 , target . length ) . trim ( ) } ) ;
break ;
default :
break ;
}
if ( retval . length > 0 ) {
if ( retval . length > 0 ) {
return retval [ 0 ] [ 2 ] ;
return retval [ 0 ] [ 3 ] ;
} else {
} else {
return target ;
return target ;
}
}
@ -180,20 +194,20 @@ function getTarget(logline) {
}
}
}
}
} else {
} else {
if ( getMode ( logline ) . startsWith ( "DMR" ) ) {
//if (getMode(logline).startsWith("DMR")) {
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + resolveTarget ( get Timeslot( getMode ( logline ) ) , target ) + '</a>' ;
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + resolveTarget ( get Mode( logline ) , get Timeslot( getMode ( logline ) ) , target ) + '</a>' ;
return link ;
return link ;
} else {
/ * } e l s e {
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + target + '</a>' ;
link = '<a href="' + bmlink + linkTarget + '" target="_new">' + target + '</a>' ;
return link ;
return link ;
}
} * /
}
}
} else {
} else {
if ( getMode ( logline ) . startsWith ( "DMR" ) ) {
//if (getMode(logline).startsWith("DMR")) {
return resolveTarget ( get Timeslot( getMode ( logline ) ) , target ) ;
return resolveTarget ( get Mode( logline ) , get Timeslot( getMode ( logline ) ) , target ) ;
} else {
/ * } e l s e {
return target ;
return target ;
}
} * /
}
}
}
}
@ -861,7 +875,7 @@ function processData(data) {
var allRows = data . split ( /\r?\n|\r/ ) ;
var allRows = data . split ( /\r?\n|\r/ ) ;
for ( var singleRow = 1 ; singleRow < allRows . length ; singleRow ++ ) {
for ( var singleRow = 1 ; singleRow < allRows . length ; singleRow ++ ) {
var rowCells = allRows [ singleRow ] . split ( ',' ) ;
var rowCells = allRows [ singleRow ] . split ( ',' ) ;
talkgroups . push ( [ rowCells [ 0 ] , rowCells [ 1 ] , rowCells [ 2 ] ]) ;
talkgroups . push ( [ rowCells [ 0 ] , rowCells [ 1 ] , rowCells [ 2 ] , rowCells [ 3 ] ]) ;
}
}
logIt ( "Parsed TGs: " + talkgroups ) ;
logIt ( "Parsed TGs: " + talkgroups ) ;
}
}