cluster_search_ui/commit
First work on move to pengines.
author | Chris Dijkshoorn |
---|---|
Sat Dec 13 21:49:09 2014 +0100 | |
committer | Chris Dijkshoorn |
Sat Dec 13 21:49:09 2014 +0100 | |
commit | 52bf4abd6cbda82f66c5bcffdd523a57ca5d6eb1 |
tree | f39cf4e78d3fe50ce559394026211cf58166ab91 |
parent | 88a3391348b425446660ff6a6e433f82610903d9 |
Diff style: patch stat
diff --git a/api/cluster_search_ui.pl b/api/cluster_search_ui.pl index 36dc73c..b6f5d5d 100644 --- a/api/cluster_search_ui.pl +++ b/api/cluster_search_ui.pl @@ -39,7 +39,6 @@ user:file_search_path(img, web(img)). :- http_handler(fonts('.'), serve_files_in_directory(fonts), [prefix]). :- http_handler(img('.'), serve_files_in_directory(img), [prefix]). -%pengines try out :- pengine_application(enrichment). :- use_module(enrichment:'cpack/cluster_search_ui/lib/cluster_search_ui/enrichment.pl'). diff --git a/config-available/cluster_search_ui.pl b/config-available/cluster_search_ui.pl index b440b74..15b12a8 100644 --- a/config-available/cluster_search_ui.pl +++ b/config-available/cluster_search_ui.pl @@ -3,10 +3,9 @@ /** <module> Frontend for cluster search */ -:- use_module(library('semweb/rdf_db')). :- use_module(library('semweb/rdf_library')). -:- rdf_attach_library(cluster_search(rdf)). +:- rdf_attach_library(cluster_search_ui(rdf)). :- rdf_load_library('cluster-search-ui-schema'). :- rdf_load_library('rijksmuseum-search-ui'). :- rdf_load_library('bird-search-ui'). diff --git a/lib/cluster_search_ui/enrichment.pl b/lib/cluster_search_ui/enrichment.pl index 02ece60..3f156f7 100644 --- a/lib/cluster_search_ui/enrichment.pl +++ b/lib/cluster_search_ui/enrichment.pl @@ -1,12 +1,9 @@ :- module(enrichment, [ - uri_label/2, - kipperdekip/1 + uri_label/2 ]). :- use_module(library(semweb/rdf_label)). uri_label(Uri, Label) :- - rdf_display_label(Uri, _, Label). - -kipperdekip(X) :- - X = a. + %rdf_display_label(Uri, _, Label). + Label = Uri. diff --git a/lib/cluster_search_ui/web_ui_dcg.pl b/lib/cluster_search_ui/web_ui_dcg.pl index 507a230..8891350 100644 --- a/lib/cluster_search_ui/web_ui_dcg.pl +++ b/lib/cluster_search_ui/web_ui_dcg.pl @@ -203,6 +203,7 @@ scripts(front) --> scripts(results) --> html([\load_javascript(jquery), \load_javascript(bootstrap), + \load_javascript(pengines), \load_javascript(search), \load_javascript(pagination), \load_javascript(thumbnail)]). @@ -210,6 +211,7 @@ scripts(results) --> scripts(result) --> html([\load_javascript(jquery), \load_javascript(bootstrap), + \load_javascript(pengines), \load_javascript(search)]). scripts(about) --> @@ -225,6 +227,8 @@ load_javascript(jquery) --> load_javascript(bootstrap) --> {http_absolute_location(js('bootstrap.min.js'), JavaScriptBootstrap, [])}, html(script(src(JavaScriptBootstrap),'')). +load_javascript(pengines) --> + html(script(src('/pengine/pengines.js'),'')). load_javascript(search) --> {http_absolute_location(js('search.js'), JavaScriptSearch, [])}, html(script(src(JavaScriptSearch),'')). diff --git a/web/js/search.js b/web/js/search.js index e9a135b..1606570 100644 --- a/web/js/search.js +++ b/web/js/search.js @@ -12,6 +12,7 @@ function search(keyword) { query = keyword; $(document).prop('title', 'Searching for ' + query); $("#results").append(searchingHtml()); + start_pengine(); $.getJSON("json", {query:query}) .done(function(data){ showResults(data); @@ -21,6 +22,22 @@ function search(keyword) { $(document).prop('title', 'Error on ' + query);}); } +var pengine; +function start_pengine() { + console.log("Creating pengine enrichment engine!"); + var label; + pengine = new Pengine({ application: 'enrichment', + ask: 'uri_label(uri, Label)', + onsuccess: handleSuccess + }); + //How to reuse pengine? +} + +function handleSuccess() { + var solution = JSON.stringify(this.data[0].Label); + console.log(solution); +} + function searchingHtml(){ return '<div class="row"><div class="col-lg-10 col-md-offset-1"><h3> Searching for <span class="text-info">' + query +