From cf734e328fde7a4d58e72b8d4cda4961466ea37d Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Wed, 10 Apr 2013 14:55:16 -0300 Subject: [PATCH] added per_page to cufts query started the eds target --- targets/cufts/roblib_search_cufts.module | 2 +- targets/eds/js/eds_results.js | 23 +++ targets/eds/roblib_search_eds.info | 8 + targets/eds/roblib_search_eds.install | 2 + targets/eds/roblib_search_eds.module | 209 ++++++++++++++++++++ targets/eds/theme/roblib-search-eds.tpl.php | 24 +++ targets/eds/theme/theme.inc | 25 +++ 7 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 targets/eds/js/eds_results.js create mode 100644 targets/eds/roblib_search_eds.info create mode 100644 targets/eds/roblib_search_eds.install create mode 100644 targets/eds/roblib_search_eds.module create mode 100644 targets/eds/theme/roblib-search-eds.tpl.php create mode 100644 targets/eds/theme/theme.inc diff --git a/targets/cufts/roblib_search_cufts.module b/targets/cufts/roblib_search_cufts.module index a3fdcd4..7276db9 100644 --- a/targets/cufts/roblib_search_cufts.module +++ b/targets/cufts/roblib_search_cufts.module @@ -175,7 +175,7 @@ function roblib_search_cufts_get_results($query = NULL) { $url = variable_get('roblib_search_cufts_url', 'http://cufts2.lib.sfu.ca/CJDB/PCU/browse/show?'); $url_suffix = variable_get('roblib_search_cufts_search_suffix', 'browse_field=title&search_type=startswith&format=json&search_terms='); $number_of_records = variable_get('roblib_search_cufts_num_results', '5'); - $search_url = $url . $url_suffix . '"' . $query . '"' . '&submit=Search'; + $search_url = $url . $url_suffix . '"' . $query . '"' . '&submit=Search&per_page='.$number_of_records; $results = drupal_http_request($search_url); diff --git a/targets/eds/js/eds_results.js b/targets/eds/js/eds_results.js new file mode 100644 index 0000000..a7d717f --- /dev/null +++ b/targets/eds/js/eds_results.js @@ -0,0 +1,23 @@ +Drupal.behaviors.roblib_search_cufts = { + attach: function(context, settings) { + $url = settings.roblib_search_eds.search_url; + jQuery.getJSON($url, function(data) { + var items = []; + if(data.length < 1){ + jQuery('#' + 'roblib-search-content-eds').empty().append('No Results'); + } else { + jQuery.each(data.journals, function(key, val) { + items.push('
'); + items.push('
'); + items.push(''+val.title+'
'); + items.push('
'); + }); + } + jQuery('#' + 'roblib-search-content-eds').empty().append(items.join('')); + }); +} + +} + + + diff --git a/targets/eds/roblib_search_eds.info b/targets/eds/roblib_search_eds.info new file mode 100644 index 0000000..1aec1e1 --- /dev/null +++ b/targets/eds/roblib_search_eds.info @@ -0,0 +1,8 @@ +name = Roblib Search EDS +dependencies[] = roblib_search +configure = admin/roblib_search/eds_search +description = implements the Roblib Search modules _roblib_search hook +package = Roblib Search +version = 7.x-dev +core = 7.x +stylesheets[all][] = css/roblib_search_eds.base.css \ No newline at end of file diff --git a/targets/eds/roblib_search_eds.install b/targets/eds/roblib_search_eds.install new file mode 100644 index 0000000..a4abe2d --- /dev/null +++ b/targets/eds/roblib_search_eds.install @@ -0,0 +1,2 @@ + 'EDS search Target configuration', + 'description' => 'Configuration for the Roblib evergreen search target', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('roblib_search_eds_config_form'), + 'access arguments' => array('access administration pages'), + 'type' => MENU_NORMAL_ITEM, + ); + + $items['roblib_search/eds/ajax/%'] = array( + 'title' => 'eds ajax', + 'page callback' => 'roblib_search_eds_ajax', + 'page arguments' => array(3), + 'type' => MENU_CALLBACK, + 'access arguments' => array('search roblib eds'), + ); + + return $items; +} + +function roblib_search_eds_config_form($form, &$form_state) { + + $form['roblib_search_eds_url'] = array( + '#type' => 'textfield', + '#title' => t('EDS url'), + '#default_value' => variable_get('roblib_search_eds_url', 'http://eds2.lib.sfu.ca/CJDB/PCU/browse/show?'), + '#description' => t('The base EDS URL, for example http://eds2.lib.sfu.ca/CJDB/PCU/browse/show?'), + '#required' => TRUE, + ); + $form['roblib_search_eds_search_suffix'] = array( + '#type' => 'textfield', + '#title' => t('EDS search suffix'), + '#default_value' => variable_get('roblib_search_eds_search_suffix', 'browse_field=title&search_type=startswith&format=json&search_terms='), + '#description' => t('The suffix will be appended to the base url for searches, for example browse_field=title&search_type=startswith&format=json&search_terms='), + '#required' => TRUE, + ); + + $form['roblib_search_eds_num_results'] = array( + '#type' => 'textfield', + '#title' => t('Number of results to return'), + '#default_value' => variable_get('roblib_search_eds_num_results', '5'), + '#description' => t('The number of results to display in the Bento box'), + '#required' => TRUE, + ); + + + return system_settings_form($form); +} + +/** + * Implements hook_permission(). + */ +function roblib_search_eds_permission() { + return array( + 'search roblib eds' => array( + 'title' => t('Search the eds target'), + 'description' => t('Search oblib eds target. This permission exposes the search blocks and allows you to see search results.'), + ), + 'administer roblib search eds' => array( + 'title' => t('Administer Roblib Search EDS'), + 'description' => t('Administer settings for the Roblib eds search client.'), + ), + ); +} + +/** + * Implements hook_theme(). + */ +function roblib_search_eds_theme() { + // set path + $path = drupal_get_path('module', 'roblib_search_eds'); + $file = 'theme.inc'; + + return array( + // results page + 'roblib_search_eds' => array( + 'path' => $path . '/theme', + 'file' => $file, + 'template' => 'roblib-search-eds', + 'variables' => array('results' => NULL), + ) + ); +} + +function roblib_search_eds_block_info() { + + $blocks['roblib_search_eds_results'] = array( + // info: The name of the block. + 'info' => t('EDS Search Results block'), + // Block caching options (per role, per user, etc.) + 'cache' => DRUPAL_CACHE_PER_ROLE, // default + ); + + return $blocks; +} + +function roblib_search_eds_block_view($delta = '') { + //The $delta parameter tells us which block is being requested. + switch ($delta) { + case 'roblib_search_eds_results': + // The subject is displayed at the top of the block. Note that it + // should be passed through t() for translation. The title configured + // for the block using Drupal UI supercedes this one. + $block['subject'] = t('EDS Results'); + // The content of the block is typically generated by calling a custom + // function. + // $block['content'] = roblib_search_eds_get_results(); + $block['content'] = theme('roblib_search_eds', array('results' => NULL)); //we will get the results via javascript + break; + } + return $block; +} + +function roblib_search_eds_ajax($query) { + print roblib_search_eds_get_results($query); + exit(); +} +/** + * + * @param string $query + * @return string + * json string + */ +function roblib_search_eds_get_results($query = NULL) { + drupal_add_css(drupal_get_path('module', 'roblib_search_eds') . '/css/roblib_search_eds.theme.css'); + + // Url parameters. + if (!isset($query)) { + if (isset($_GET['roblib_query'])) { + $query = $_GET['roblib_query']; + } + else { + return ''; + } + } + //http://eds2.lib.sfu.ca/CJDB/PCU/browse/show?browse_field=title&search_type=startswith&format=json&search_terms=dog&submit=Search + $url = variable_get('roblib_search_eds_url', 'http://eds2.lib.sfu.ca/CJDB/PCU/browse/show?'); + $url_suffix = variable_get('roblib_search_eds_search_suffix', 'browse_field=title&search_type=startswith&format=json&search_terms='); + $number_of_records = variable_get('roblib_search_eds_num_results', '5'); + $search_url = $url . $url_suffix . '"' . $query . '"' . '&submit=Search'; + + $results = drupal_http_request($search_url); + + if ($results->code == '200') { + $output = $results->data; + } + else { + $output = $results->status_message; + } + return $output; +} + +/** + * Implements hook_help(). + * + * @param type $path + * @param type $arg + * @return type + */ +function roblib_search_eds_help($path, $arg) { + switch ($path) { + case 'admin/help#roblib_search_eds': + return t( + '

+ provides a target for the Roblib search module. This target uses javascript + to render the results. +

' + ); + } +} + diff --git a/targets/eds/theme/roblib-search-eds.tpl.php b/targets/eds/theme/roblib-search-eds.tpl.php new file mode 100644 index 0000000..4661acb --- /dev/null +++ b/targets/eds/theme/roblib-search-eds.tpl.php @@ -0,0 +1,24 @@ + + +
+ + +
+
Search all EDS
\ No newline at end of file diff --git a/targets/eds/theme/theme.inc b/targets/eds/theme/theme.inc new file mode 100644 index 0000000..8424479 --- /dev/null +++ b/targets/eds/theme/theme.inc @@ -0,0 +1,25 @@ + array('search_url' => $search_url)), array('type' => 'setting')); + +} +?>