amalgame/commit
IMPROVED: my_atom_json_dict/3 redundant now I know proper value_string_as(atom) option of atom_json_dict/3
author | Jacco van Ossenbruggen |
---|---|
Wed Aug 13 10:56:51 2014 +0200 | |
committer | Jacco van Ossenbruggen |
Wed Aug 13 10:56:51 2014 +0200 | |
commit | c282707194d6fab19d195f903a72229115f5f306 |
tree | 752cca3b0e69850d2ad9574b4a5f08dda0bb9693 |
parent | 639980965d7fbe860f6160109cbb12b57a1dd1f7 |
Diff style: patch stat
diff --git a/api/evaluate.pl b/api/evaluate.pl index cebfea1..4199f28 100644 --- a/api/evaluate.pl +++ b/api/evaluate.pl @@ -74,8 +74,8 @@ http_data_evaluate(Request) :- user_property(User0, url(User)), - my_atom_json_dict(Values, Va, []), - my_atom_json_dict(Originals, Oa, []), + atom_json_dict(Values, Va, [value_string_as(atom)]), + atom_json_dict(Originals, Oa, [value_string_as(atom)]), concept_labels(Va, V), concept_labels(Oa, O), diff --git a/lib/amalgame/json_util.pl b/lib/amalgame/json_util.pl index e3e33e1..0d972dc 100644 --- a/lib/amalgame/json_util.pl +++ b/lib/amalgame/json_util.pl @@ -1,8 +1,7 @@ :- module(ag_json_util, [ js_mappings_metadata/3, js_focus_node/3, - js_strategy_nodes/2, - my_atom_json_dict/3 + js_strategy_nodes/2 ]). :- use_module(library(http/json)). @@ -17,13 +16,6 @@ :- use_module(library(amalgame/ag_reference)). :- use_module(library(amalgame/ag_evaluation)). -my_atom_json_dict(Json, Dict, Options) :- - var(Dict),!, - atom_json_dict(Json, StringDict, Options), - atomify_dict(StringDict, Dict). -my_atom_json_dict(Json, Dict, Options) :- - atom_json_dict(Json, Dict, Options). - js_mappings_metadata(Strategy, Results, Options) :- amalgame_strategy_mappings(Strategy, Mappings, Options), maplist(mapping_metadata(Strategy), Mappings, Pairs),