cluster_search_ui/commit

Changed the name of the settings.

authorChris Dijkshoorn
Sat Dec 13 17:47:17 2014 +0100
committerChris Dijkshoorn
Sat Dec 13 17:47:17 2014 +0100
commitae2b63f35a01835c6552274df5f53bb872c2d11e
tree1bddae3d7b9e94d463489095a85c5f2898539977
parentd0fc16e1ad5d3b116422e80a149908148813b548
Diff style: patch stat
diff --git a/api/cluster_search_ui.pl b/api/cluster_search_ui.pl
index 39fa995..12a130a 100644
--- a/api/cluster_search_ui.pl
+++ b/api/cluster_search_ui.pl
@@ -40,7 +40,6 @@ user:file_search_path(img, web(img)).
 
 :- set_setting_default(thumbnail:thumbnail_size, size(350,300)).
 :- set_setting_default(thumbnail:medium_size, size(1280,1024)).
-:- set_setting_default(search:image_filter, all).
 
 %%	search(+Request) is det.
 %
@@ -84,7 +83,7 @@ get_parameters(Request, Options) :-
 %	Replies the html page corresponding to the type of page and
 %	Request.
 reply_page(Page, Options) :-
-    setting(search:ui, UI),
+    setting(cluster_search_ui:ui, UI),
     rdf(UI, ui:iconLocation, literal(IconName)),
     http_absolute_location(icons(IconName), Icon, []),
     html_resource(css('search.css'), [requires([css('bootstrap.min.css')])]),
diff --git a/lib/cluster_search_ui/settings.pl b/lib/cluster_search_ui/settings.pl
index cc08003..912b204 100644
--- a/lib/cluster_search_ui/settings.pl
+++ b/lib/cluster_search_ui/settings.pl
@@ -7,13 +7,13 @@
 ***************************************************/
 
 
-:- setting(search:strategy, atom, cluster,
+:- setting(cluster_search_ui:strategy, atom, cluster,
 	   'The strategy used for searching.').
-:- setting(search:image_filter, atom, only_images,
+:- setting(cluster_search_ui:image_filter, atom, all,
 	   'Filter used for presenting the results.').
-:- setting(search:enrichment, atom, thumbnails,
+:- setting(cluster_search_ui:enrichment, atom, thumbnails,
 	   'Setting indicating the level of enrichment of results.').
-:- setting(search:ui, uri, rui:rijksmuseumUI,
+:- setting(cluster_search_ui:ui, uri, rui:rijksmuseumUI,
 	   'Default URI defining the UI for search').
-:- setting(search:annotate, boolean, false,
+:- setting(cluster_search_ui:annotate, boolean, false,
 	   'Indicate the possibility of annotating search result.').
diff --git a/lib/cluster_search_ui/web_ui_dcg.pl b/lib/cluster_search_ui/web_ui_dcg.pl
index 602ee0b..507a230 100644
--- a/lib/cluster_search_ui/web_ui_dcg.pl
+++ b/lib/cluster_search_ui/web_ui_dcg.pl
@@ -29,7 +29,7 @@ content(results, Options) -->
 
 content(result, Options) -->
     {option(uri(Uri), Options),
-     setting(search:annotate, Annotate),
+     setting(cluster_search_ui:annotate, Annotate),
      (Annotate
      ->	 get_annotation_options(Uri, AnnotationOrImage)
      ;	 get_image_options(Uri, AnnotationOrImage)
@@ -43,7 +43,7 @@ content(result, Options) -->
 
 content(about, _) -->
     {current_prolog_flag(version, Version),
-     setting(search:ui, UI),
+     setting(cluster_search_ui:ui, UI),
      rdf(UI, dcterms:title, literal(lang(en, Title)))
     },
     html({|html(Title, Version)||
@@ -157,11 +157,11 @@ ssl_verify(_SSL, _ProblemCertificate, _AllCertificates, _FirstCertificate, _Erro
 %
 %	Replies the title for the given page.
 title(front, _) -->
-    {setting(search:ui, UI),
+    {setting(cluster_search_ui:ui, UI),
     rdf(UI, dcterms:title, literal(lang(en, Title)))},
     html(title(Title)).
 title(about, _) -->
-    {setting(search:ui, UI),
+    {setting(cluster_search_ui:ui, UI),
     rdf(UI, dcterms:title, literal(lang(en, Title))),
     concat('About ', Title, TitleAbout)
     },
@@ -174,7 +174,7 @@ title(result, Options) -->
     html(title(Title)).
 
 title(analytics, _) -->
-    {setting(search:ui, UI),
+    {setting(cluster_search_ui:ui, UI),
     rdf(UI, dcterms:title, literal(lang(en, Title))),
     concat(Title, ' Statistics', TitleStatistics)},
     html(title(TitleStatistics)).
@@ -242,7 +242,7 @@ navigation_bar(front) -->
     {http_location_by_id(search, HttpWeb),
      http_location_by_id(results, HttpSearch),
      http_location_by_id(about, HttpAbout),
-     setting(search:ui, UI),
+     setting(cluster_search_ui:ui, UI),
      rdf(UI, dcterms:title, literal(lang(en, Title)))
     },
     html({|html(HttpWeb, HttpSearch, HttpAbout, Title)||
@@ -274,7 +274,7 @@ navigation_bar(about) -->
     {http_location_by_id(search, HttpWeb),
      http_location_by_id(results, HttpSearch),
      http_location_by_id(about, HttpAbout),
-     setting(search:ui, UI),
+     setting(cluster_search_ui:ui, UI),
      rdf(UI, dcterms:title, literal(lang(en, Title)))
     },
     html({|html(HttpWeb, HttpSearch, HttpAbout, Title)||