diff --git a/modules/solr_site/js/solr_site_results.js b/modules/solr_site/js/solr_site_results.js
index c86be64..06720b5 100644
--- a/modules/solr_site/js/solr_site_results.js
+++ b/modules/solr_site/js/solr_site_results.js
@@ -1,47 +1,43 @@
Drupal.behaviors.roblib_search_solr_site_results = {
- attach: function (context, settings) {
- url = settings.roblib_search_solr_site_results.search_url;
- query = settings.roblib_search_solr_site_results.search_query;
- baseUrl = settings.roblib_search_solr_site_results.base_url;
- default_site_type = settings.roblib_search_solr_site_results.default_site_type + '/';
- jQuery.getJSON(url, function (data) {
- var items = [];
- total_found = data.response.numFound;
- var numberOfDocs = 0;
- try {
- numberOfDocs = data.response.docs.length;
- } catch (err) {
- // do nothing leave docLength at 0
- }
- if (numberOfDocs < 1) {
- jQuery('#' + 'roblib-search-content-solr-site-results').empty().append('No Results');
- jQuery('.' + 'pane-roblib-search-solr-site-roblib-search-solr-site-results').hide();
- } else {
- jQuery('#' + 'roblib-search-content-solr-site-results').empty();
- var counter = 0;
- var divs = new Array();
- var content = new Array();
- jQuery.each(data.response.docs, function (key, val) {
- id = 'roblib_search_solr_results_' + counter;
- content[counter] = val.teaser;
- divs[counter++] = id;
- items.push('
\n\
+ attach: function (context, settings) {
+ if (context == document) {
+ query = $current_path.replace('roblib_search/', '');
+ solrUrl = settings.solr_site_search_url + query;
+ baseUrl = settings.solr_site_base_url + query;
+ jQuery.getJSON(baseUrl, function (data) {
+ var items = [];
+ total_found = data.resultCount;
+
+ if (total_found < 1) {
+ jQuery('#' + 'roblib-search-content-solr-site-results').empty().append('No Results');
+ jQuery('.' + 'pane-roblib-search-solr-site-roblib-search-solr-site-results').hide();
+ } else {
+ jQuery('#' + 'roblib-search-content-solr-site-results').empty();
+ var counter = 0;
+ var divs = new Array();
+ var content = new Array();
+ jQuery.each(data.results, function (key, val) {
+ id = 'roblib_search_solr_results_' + counter;
+ content[counter] = val.teaser;
+ divs[counter++] = id;
+ items.push('
');
- });
- jQuery('#' + 'roblib-search-content-solr-site-results').empty().append(items.join(''));
- }
- if (numberOfDocs > 0) {
- results_url = '
see all results ('
- + total_found + ') ';
- move_me_div_url = '
Library Site ('
- + total_found + ') ';
- jQuery('#' + 'roblib-search-solr-site-results-more').empty().append(results_url);
- jQuery('#' + 'roblib-solr-more-results-results').empty().append(results_url);
- jQuery('#' + 'roblib-solr-search-toc-results').empty().append(move_me_div_url);
- }
- });
- }
+
' + val.title + '' +
+ '\n\
(' + val.type + ') ' + val.body + ' ');
+ });
+ jQuery('#' + 'roblib-search-content-solr-site-results').empty().append(items.join(''));
+ }
+ if (total_found > 0) {
+ results_url = '
-
+
+
+
-
-
+
+
diff --git a/modules/solr_site/templates/theme.inc b/modules/solr_site/templates/theme.inc
deleted file mode 100755
index 0b4ca58..0000000
--- a/modules/solr_site/templates/theme.inc
+++ /dev/null
@@ -1,43 +0,0 @@
- array(
- 'search_url' => $search_url,
- 'search_query' => $query,
- 'base_url' => $base_url,
- 'default_site_type' => $default_module
- )
- ), array('type' => 'setting'));
-}