cluster_search_ui/commit

Updated conflincting term, solves #6

authorChris Dijkshoorn
Sat Dec 20 10:13:15 2014 +0100
committerChris Dijkshoorn
Sat Dec 20 10:13:15 2014 +0100
commitc0ea25d0a9917d767142622b571616b5225f7bc2
tree9508f51491d2b23267d926ee9e19f1bc8335f840
parenta143a471d8574f7dcdbcc2eea108cb02dfc26794
Diff style: patch stat
diff --git a/api/cluster_search_ui.pl b/api/cluster_search_ui.pl
index b6f5d5d..fc6f756 100644
--- a/api/cluster_search_ui.pl
+++ b/api/cluster_search_ui.pl
@@ -32,7 +32,7 @@ http:location(img, cliopatria(img), []).
 user:file_search_path(fonts, web(fonts)).
 user:file_search_path(img, web(img)).
 
-:- http_handler(cliopatria(search), search, []).
+:- http_handler(cliopatria(cluster_search), cluster_search, []).
 :- http_handler(cliopatria(results), results, []).
 :- http_handler(cliopatria(about), about, []).
 :- http_handler(cliopatria(item), item, []).
@@ -45,10 +45,10 @@ 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)).
 
-%%	search(+Request) is det.
+%%	cluster_search(+Request) is det.
 %
 %	Generate front page.
-search(_Request) :-
+cluster_search(_Request) :-
     reply_page(front, _Options).
 
 %%	results(+Request) is det.
diff --git a/lib/cluster_search_ui/web_ui_dcg.pl b/lib/cluster_search_ui/web_ui_dcg.pl
index 159af78..ed5b61c 100644
--- a/lib/cluster_search_ui/web_ui_dcg.pl
+++ b/lib/cluster_search_ui/web_ui_dcg.pl
@@ -237,7 +237,7 @@ load_javascript(thumbnail) -->
 %
 %	Generates the navigation bar for the given page.
 navigation_bar(front) -->
-    {http_location_by_id(search, HttpWeb),
+    {http_location_by_id(cluster_search, HttpWeb),
      http_location_by_id(results, HttpSearch),
      http_location_by_id(about, HttpAbout),
      setting(cluster_search_ui:ui, UI),
@@ -269,7 +269,7 @@ navigation_bar(front) -->
 	 |}).
 
 navigation_bar(about) -->
-    {http_location_by_id(search, HttpWeb),
+    {http_location_by_id(cluster_search, HttpWeb),
      http_location_by_id(results, HttpSearch),
      http_location_by_id(about, HttpAbout),
      setting(cluster_search_ui:ui, UI),