image_annotation/commit
removed unused set_user_preferences/2, conditional compile for user:lang setting
author | Jacco van Ossenbruggen |
---|---|
Mon Oct 15 17:09:01 2012 +0200 | |
committer | Jacco van Ossenbruggen |
Mon Oct 15 17:09:01 2012 +0200 | |
commit | 3863603833a0ac49774c735f835a04b84144bd46 |
tree | d13907c44775f40cef9cb14aa63cd31fe98150ce |
parent | a0e9a560ddc04b84e6960600cf783106019ecdcb |
Diff style: patch stat
diff --git a/config-available/ann_preferences.pl b/config-available/ann_preferences.pl index c8f9cb2..9e1782f 100644 --- a/config-available/ann_preferences.pl +++ b/config-available/ann_preferences.pl @@ -1,6 +1,4 @@ -:- module(ann_preferences, [ - set_user_preferences/2 - ]). +:- module(ann_preferences, []). :- use_module(library(http/http_session)). :- use_module(library(semweb/rdf_db)). @@ -10,11 +8,13 @@ :- rdf_meta cliopatria:user_preference_db(r,o), - cliopatria:user_preference_default(r,o), - set_user_preferences(r,o). - + cliopatria:user_preference_default(r,o). +:- if(current_setting(user:lang)). +% do nothing +:- else. :- setting(user:lang, atom, en, 'Preferred language'). +:- endif. /******************************* * USER/SESSION PREFERENCES * @@ -28,17 +28,10 @@ % values are compatible with RDF to allow implementing the user % database in RDF, typically using the OpenID as subject. -cliopatria:user_preferences_db(Property, Value) :- +cliopatria:user_preference_db(Property, Value) :- logged_on(User, anonymous), http_session_data(rdf(User, Property, Value)). -set_user_preferences(Property, Value) :- - cliopatria:user_preferences_db(Property, Value), !. - -set_user_preferences(Property, Value) :- - logged_on(User, anonymous), - http_session_assert(rdf(User, Property, Value)). - %% cliopatria:user_preference_default(?Property:atom, ?Value:rdf_object) is nondet. % % Provides defaults for the user_preference/2.