amalgame/commit

removed unused set_user_preferences/2, conditional compile for user:lang setting

authorJacco van Ossenbruggen
Mon Oct 15 17:08:31 2012 +0200
committerJacco van Ossenbruggen
Mon Oct 15 17:08:31 2012 +0200
commitbde43aa92540a53e12411541ea8496ac7d4aebed
tree85f59a72adec7cc29356ed7aaa7c6c8817591288
parent77f82b09344ac424a3154471984aa64817c9d31a
Diff style: patch stat
diff --git a/config-available/ag_preferences.pl b/config-available/ag_preferences.pl
index 799e15d..a86f14b 100644
--- a/config-available/ag_preferences.pl
+++ b/config-available/ag_preferences.pl
@@ -1,6 +1,4 @@
-:- module(ag_preferences, [
-			   set_user_preferences/2
-			  ]).
+:- module(ag_preferences, []).
 
 :- use_module(library(http/http_session)).
 :- use_module(library(semweb/rdf_db)).
@@ -13,8 +11,11 @@
 	cliopatria:user_preference_default(r,o),
 	set_user_preferences(r,o).
 
-
+:- if(current_setting(user:lang)).
+% do nothing
+:- else.
 :- setting(user:lang, atom, en, 'Preferred language').
+:- endif.
 
                  /*******************************
                  *   USER/SESSION PREFERENCES   *
@@ -28,17 +29,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.