X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.module;h=51df633b706c7cd7a73c59993559bb26f617202d;hb=92f23f8e3751e247fea54584fb84fb9266bb4ec9;hp=16442238ac630aa8f18d7b2d924b0ceaedc62ab1;hpb=368440f16fce179517479e3eed656aa5f5520dcb;p=mkdru-moved-to-drupal.org.git diff --git a/mkdru.module b/mkdru.module index 1644223..51df633 100644 --- a/mkdru.module +++ b/mkdru.module @@ -13,11 +13,24 @@ function mkdru_node_info() { 'name' => t("Z39.50/SRU metasearch interface"), 'module' => 'mkdru', 'description' => t("Metasearch interface for Z39.50/SRU and other targets via a Pazpar2/Service Proxy backend"), - ) ); } +function mkdru_ting_search_show($params) { + $path = drupal_get_path('module', 'mkdru'); + // Include client library. + drupal_add_js(variable_get('pz2_js_path', 'pazpar2/js') + . '/pz2.js', 'module', 'footer'); + drupal_add_js($path . '/mkdru.theme.js', 'module', 'footer'); + drupal_add_js($path . '/mkdru.client.js', 'module', 'footer'); + $html = theme('mkdru_results'); + drupal_add_js(array('mkdru' => + array('use_sessions' => '1', 'query' => $params['keys'] + )), 'setting'); + return array("content" => $html); +} + /** * Implementation of hook_perm() */ @@ -70,7 +83,7 @@ function mkdru_init(){ // Applies our module specific CSS to all pages. This works best because // all CSS is aggregated and cached so we reduce the number of HTTP // requests and the size is negligible. - drupal_add_css(drupal_get_path('module', 'mkdru') .'/mkdru-page.css'); + drupal_add_css(drupal_get_path('module', 'mkdru') .'/mkdru.css'); } @@ -197,8 +210,6 @@ function mkdru_nodeapi(&$node, $op, $teaser, $page) { /** * Implementation of hook_delete(). - * - * When a node is deleted, we need to remove all related records from our table. */ function mkdru_delete($node) { // Deleting by nid covers all revisions. @@ -221,11 +232,15 @@ function mkdru_load($node) { */ function mkdru_theme() { return array( - 'mkdru_page' => array( - 'template' => 'mkdru-page', + 'mkdru_form' => array( + 'template' => 'mkdru-form', 'arguments' => array(), ), - 'mkdru_page_js' => array( + 'mkdru_results' => array( + 'template' => 'mkdru-results', + 'arguments' => array(), + ), + 'mkdru_js' => array( 'arguments' => array('node' => NULL), ), // 'mkdru_block_facet' => array( @@ -238,7 +253,7 @@ function mkdru_theme() { /** * Theme function to include Javascript search client and deps */ -function theme_mkdru_page_js($node) { +function theme_mkdru_js($node) { $path = drupal_get_path('module', 'mkdru'); // Include client library. drupal_add_js(variable_get('pz2_js_path', 'pazpar2/js') . '/pz2.js', 'module', 'footer'); @@ -251,14 +266,18 @@ function theme_mkdru_page_js($node) { * Implementation of hook_view() */ function mkdru_view($node, $teaser = FALSE, $page = FALSE) { - $node->content['mkdru_page_js'] = array( - '#value' => theme('mkdru_page_js', $node), + $node->content['mkdru_js'] = array( + '#value' => theme('mkdru_js', $node), '#weight' => 0, ); - $node->content['mkdru_page'] = array( - '#value' => theme('mkdru_page'), + $node->content['mkdru_form'] = array( + '#value' => theme('mkdru_form'), '#weight' => 1, ); + $node->content['mkdru_results'] = array( + '#value' => theme('mkdru_results'), + '#weight' => 2, + ); return $node; } @@ -293,15 +312,15 @@ function mkdru_block($op='list', $delta='sources', $edit=array()) { // return $block; case 'mkdru_sources': $block['subject'] = t('Source'); - $block['content'] = '
'; + $block['content'] = '
'; return $block; case 'mkdru_subjects': $block['subject'] = t('Subject'); - $block['content'] = '
'; + $block['content'] = '
'; return $block; case 'mkdru_authors': $block['subject'] = t('Author'); - $block['content'] = '
'; + $block['content'] = '
'; return $block; } }