anchor.diff:      %%--------------------------------------------------------------------
       io:format("test: locations_to_contacts2/3 - 0~n"),
       LTCNow = util:timestamp(),
  -    LTC_L1 = #phone{expire = LTCNow + 1, address = sipurl:parse("sip:ft@one.example.org")},
  -    LTC_L2 = #phone{expire = LTCNow + 2, address = sipurl:parse("sip:ft@two.example.org")},
  -    LTC_L3 = #phone{expire = never, address = sipurl:parse("sip:ft@static.example.org")},
  +    LTC_L1 = #siplocationdb_e{expire = LTCNow + 1, address = sipurl:parse("sip:ft@one.example.org")},
  +    LTC_L2 = #siplocationdb_e{expire = LTCNow + 2, address = sipurl:parse("sip:ft@two.example.org")},
  +    LTC_L3 = #siplocationdb_e{expire = never, address = sipurl:parse("sip:ft@static.example.org")},
   
       io:format("test: locations_to_contacts2/3 - 1~n"),
       %% test basic case
  
positive.code: get_priorities2([], Res) ->
      lists:sort(Res).
  
  %% Descrip. = find the Location/s that has the "best" priority in the Flags part of the tuple.
  %%            Note that some may lack a {priority, PrioVal} entry
  %% Returns  = list() of siplocationdb_e record() (all with same "best" priority - Priority)
  get_locations_with_prio(Priority, Locations) ->
      get_locations_with_prio2(Priority, Locations, []).
  
  
negative.code: 
  locations_to_contacts2([], _Now, Res) ->
      Res;
  locations_to_contacts2([#siplocationdb_e{expire = never} | T], Now, Res) ->
      %% Don't include static contacts which never expire
      locations_to_contacts2(T, Now, Res);
  locations_to_contacts2([H | T], Now, Res) when is_record(H, siplocationdb_e), is_integer(H#siplocationdb_e.expire) ->
      Location = H#siplocationdb_e.address,
      Expire = H#siplocationdb_e.expire,
  
      %% Expires can't be less than 0 so make sure we don't end up with a negative Expires
      NewExpire = lists:max([0, Expire - Now]),
  