X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.module;h=b21b38b68fb4a905e9aff22f458342e58b470eb2;hb=0c4192b6073310d6b208e7475981c8c131360f7b;hp=16442238ac630aa8f18d7b2d924b0ceaedc62ab1;hpb=368440f16fce179517479e3eed656aa5f5520dcb;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.module b/mkdru.module
index 1644223..b21b38b 100644
--- a/mkdru.module
+++ b/mkdru.module
@@ -5,31 +5,59 @@
 
 // Module metainfo
 /**
-* Implementation of hook_node_info()
+* Implements hook_node_info()
 */
 function mkdru_node_info() {
   return array(
     'mkdru' => array(
-      'name' => t("Z39.50/SRU metasearch interface"),
-      'module' => 'mkdru',
+      'name' => t("Pazpar2 metasearch interface"),
+      'base' => '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',
+    array('type' => 'file', 'scope' => 'footer'));
+  drupal_add_library('overlay', 'jquery-bbq');
+  drupal_add_js($path . '/mkdru.theme.js',
+    array('type' => 'file', 'scope' => 'footer'));
+  drupal_add_js($path . '/mkdru.client.js',
+    array('type' => 'file', 'scope' => '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()
+* Implements hook_permission()
 */
-function mkdru_perm() {
-  return array('create metasearch interface', 'edit any metasearch interface', 'edit own metasearch interface');
+function mkdru_permission() {
+  return array(
+    'administer metasearch interfaces' => array(
+      'title' => t('Administer Pazpar2 metasearch integration'),
+    ),
+    'create metasearch interface' => array(
+      'title' => t('Create metasearch interface'),
+    ),
+    'edit any metasearch interface' => array(
+      'title' => t('Edit any metasearch interface'),
+    ),
+    'edit own metasearch interface' => array(
+      'title' => t('Edit own metasearch interface'),
+    ),
+  );
 }
 
 /**
-* Implementation of hook_access()
+* Implements hook_node_access()
 */
-function mkdru_access($op, $node, $account) {
-
+function mkdru_node_access($node, $op, $account) {
   if ($op == 'create') {
     // Only users with permission to do so may create this node type.
     return user_access('create metasearch interface', $account);
@@ -48,7 +76,7 @@ function mkdru_access($op, $node, $account) {
 }
 
 /**
-* Implementation of hook_menu()
+* Implements hook_menu()
 */
 function mkdru_menu() {
   $items['admin/settings/mkdru'] = array(
@@ -66,21 +94,21 @@ function mkdru_menu() {
 /**
 * Implementation of hook_init()
 */
-function mkdru_init(){
+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');
 }
 
 
 
 // Node config
 /**
-* Implementation of hook_form()
+* Implements hook_form()
 */
 function mkdru_form(&$node, $form_state) {
-  $type = node_get_types('type', $node);
+  $type = node_type_get_type($node);
 
   $form['title'] = array(
     '#type' => 'textfield',
@@ -110,6 +138,29 @@ function mkdru_form(&$node, $form_state) {
     '#default_value' => isset($node->mkdru->use_sessions) ? $node->mkdru->use_sessions : 1,
   );
 
+  $form['sp_settings']  = array(
+    '#type' => 'fieldset',
+    '#title' => t('Service Proxy specific settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE
+  );
+  $form['sp_settings']['sp_user'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Service Proxy username'),
+    '#description' => t('Service Proxy username'),
+    '#required' => FALSE,
+    '#default_value' => isset($node->mkdru->sp_user) ? 
+      $node->mkdru->sp_user : '',
+  );
+  $form['sp_settings']['sp_pass'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Service Proxy password'),
+    '#description' => t('Service Proxy password'),
+    '#required' => FALSE,
+    '#default_value' => isset($node->mkdru->sp_pass) ? 
+      $node->mkdru->sp_pass : '',
+  );
+
   $form['display_settings']  = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
@@ -145,7 +196,7 @@ function mkdru_form(&$node, $form_state) {
 
 
 /**
-* Implementation of hook_validate()
+* Implements hook_validate()
 */
 function mkdru_validate($node) {
   if (!is_numeric($node->source_max)) {
@@ -160,15 +211,14 @@ function mkdru_validate($node) {
 }
 
 /**
-* Implementation of hook_insert().
+* Implements hook_insert().
 */
 function mkdru_insert($node) {
-  db_query("INSERT INTO {mkdru} (nid, vid, pz2_path, use_sessions, source_max, author_max, subject_max) VALUES (%d, %d, '%s', %d, %d, %d, %d)",
-    $node->nid, $node->vid, $node->pz2_path, $node->use_sessions, $node->source_max, $node->author_max, $node->subject_max);
+  drupal_write_record('mkdru', $node);
 }
 
 /**
-* Implementation of hook_update().
+* Implements hook_update().
 */
 function mkdru_update($node) {
   if ($node->revision) {
@@ -176,133 +226,148 @@ function mkdru_update($node) {
     mkdru_insert($node);
   }
   else {
-    db_query("UPDATE {mkdru} SET pz2_path = '%s', use_sessions = %d, source_max = %d, author_max = %d, subject_max = %d WHERE vid = %d", $node->pz2_path, $node->use_sessions, $node->source_max, $node->author_max, $node->subject_max, $node->vid);
+    drupal_write_record('mkdru', $node, 'vid');
   }
 }
 
 /**
- * Implementation of hook_nodeapi().
- *
- * When a node revision is deleted, we need to remove the corresponding record
- * from our table. The only way to handle revision deletion is by implementing
- * hook_nodeapi().
+ * Implements hook_node_revision_delete()
  */
-function mkdru_nodeapi(&$node, $op, $teaser, $page) {
-  switch ($op) {
-    case 'delete revision':
-      db_query('DELETE FROM {mkdru} WHERE vid = %d', $node->vid);
-      break;
-  }
+function mkdru_node_revision_delete($node) {
+  db_delete('mkdru')
+    ->condition('vid', $node->vid)
+    ->execute();
 }
 
 /**
- * Implementation of hook_delete().
- *
- * When a node is deleted, we need to remove all related records from our table.
+ * Implements hook_delete()
  */
 function mkdru_delete($node) {
   // Deleting by nid covers all revisions.
-  db_query('DELETE FROM {mkdru} WHERE nid = %d', $node->nid);
+  db_delete('mkdru')
+    ->condition('nid', $node->nid)
+    ->execute();
 }
 
 
 
 // Node rendering
 /**
-* Implementation of hook_load()
+* Implements hook_load()
 */
-function mkdru_load($node) {
-  return array('mkdru' => db_fetch_object(db_query(
-    'SELECT * FROM {mkdru} WHERE vid = %d', $node->vid)));
+function mkdru_load($nodes) {
+  $result = db_query('SELECT * FROM {mkdru} WHERE nid IN (:nids)', array(':nids' => array_keys($nodes)));
+  foreach ($result as $record) {
+    $nodes[$record->nid]->mkdru = $record;
+  }
 }
 
 /**
-* Implementation of hook_theme().
+* Implements hook_theme().
 */
 function mkdru_theme() {
   return array(
-    'mkdru_page' => array(
-      'template' => 'mkdru-page',
-      'arguments' => array(),
+    'mkdru_form' => array(
+      'template' => 'mkdru-form',
+      'variables' => array(),
+    ),
+    'mkdru_results' => array(
+      'template' => 'mkdru-results',
+      'variables' => array(),
     ),
-    'mkdru_page_js' => array(
-      'arguments' => array('node' => NULL),
+    'mkdru_js' => array(
+      'variables' => array('node' => NULL),
     ),
-//     'mkdru_block_facet' => array(
-//       'template' => 'mkdru-block-facet',
-//       'arguments' => array('divId' => NULL),
-//     ),
+    'mkdru_block_search' => array(
+      'template' => 'mkdru-block-search',
+      'variables' => array('nid' => NULL, 'path' => NULL),
+    ),
+    'mkdru_block_facet' => array(
+      'template' => 'mkdru-block-facet',
+      'variables' => array('class' => NULL)
+    )
   );
 }
 
 /**
 * Theme function to include Javascript search client and deps
 */
-function theme_mkdru_page_js($node) {
+function theme_mkdru_js(&$variables) {
   $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');
-  drupal_add_js(array('mkdru' => $node->mkdru), 'setting');
+  // Pazpar2 client library
+  drupal_add_js(variable_get('pz2_js_path', 'pazpar2/js') . '/pz2.js', array(
+    'type' => 'file', 'scope' => 'footer', 'defer' => TRUE, 'preprocess' => FALSE));
+  // jQuery plugin for query string/history manipulation.
+  drupal_add_library('overlay', 'jquery-bbq');
+  drupal_add_js($path . '/mkdru.theme.js', array(
+    'type' => 'file', 'scope' => 'footer', 'defer' => TRUE, 'preprocess' => FALSE));
+  drupal_add_js($path . '/mkdru.client.js', array(
+    'type' => 'file', 'scope' => 'footer', 'defer' => TRUE, 'preprocess' => FALSE));
+  drupal_add_js(array('mkdru' => $variables['node']->mkdru), 'setting');
 }
 
 /** 
-* Implementation of hook_view()
+* Implements hook_view()
 */
-function mkdru_view($node, $teaser = FALSE, $page = FALSE) {
-  $node->content['mkdru_page_js'] = array(
-    '#value' => theme('mkdru_page_js', $node), 
-    '#weight' => 0,
-  );
-  $node->content['mkdru_page'] = array(
-    '#value' => theme('mkdru_page'), 
-    '#weight' => 1,
-  );
+function mkdru_view($node, $view_mode) {
+  if ($view_mode == 'full') {
+    $node->content['mkdru_js'] = array(
+      '#markup' => theme('mkdru_js', array('node' => $node)), 
+      '#weight' => 0,
+    );
+    $node->content['mkdru_form'] = array(
+      '#markup' => theme('mkdru_form'), 
+      '#weight' => 1,
+    );
+    $node->content['mkdru_results'] = array(
+      '#markup' => theme('mkdru_results'), 
+      '#weight' => 2,
+    );
+  }
   return $node;
 }
 
+
+
+// Blocks
+/** 
+* Implements hook_block_info()
+*/
+function mkdru_block_info() {
+  // facet blocks
+  $facets = variable_get('mkdru_facets');
+  foreach ($facets as $facet) {
+    // NB: block caching is redundant for static content
+    $blocks['mkdru_facet_' . $facet]['info'] = "mkdru - $facet " . t('facet');
+    $blocks['mkdru_facet_' . $facet]['cache'] = DRUPAL_NO_CACHE;
+  }
+
+  // search blocks
+  $result = db_query("SELECT title, nid FROM {node} WHERE type = 'mkdru';");
+  foreach($result as $node) {
+    $blocks['mkdru_search_' . $node->nid]['info'] = 
+        t('mkdru - search box for "' . $node->title . '"');
+    $blocks['mkdru_sources']['cache'] = DRUPAL_NO_CACHE;
+  };
+
+  return $blocks;
+}
+
 /** 
-* Implementation of hook_block()
+* Implements hook_block_view()
 */
-function mkdru_block($op='list', $delta='sources', $edit=array()) {
-  switch ($op) {
-    case 'list':
-      $blocks['mkdru_sources']['info'] = t('mkdru - source facets');
-      $blocks['mkdru_sources']['cache'] = BLOCK_NO_CACHE;
-      $blocks['mkdru_subjects']['info'] = t('mkdru - subject facets');
-      $blocks['mkdru_subjects']['cache'] = BLOCK_NO_CACHE;
-      $blocks['mkdru_authors']['info'] = t('mkdru - author facets');
-      $blocks['mkdru_authors']['cache'] = BLOCK_NO_CACHE;
-      return $blocks;
-
-    case 'view':
-      switch ($delta) {
-        // TODO: make the facet themable, I have no clue why this won't work
-//         case 'mkdru_sources':
-//           $block['subject'] = t('Source');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-sources');
-//           return $block;
-//         case 'mkdru_subjects':
-//           $block['subject'] = t('Subject');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-subjects');
-//           return $block;
-//         case 'mkdru_authors':
-//           $block['subject'] = t('Author');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-authors');
-//           return $block;
-        case 'mkdru_sources':
-          $block['subject'] = t('Source');
-          $block['content'] = '<div id="mkdru-sources"> </div>';
-          return $block;
-        case 'mkdru_subjects':
-          $block['subject'] = t('Subject');
-          $block['content'] = '<div id="mkdru-subjects"> </div>';
-          return $block;
-        case 'mkdru_authors':
-          $block['subject'] = t('Author');
-          $block['content'] = '<div id="mkdru-authors"> </div>';
-          return $block;
-    }
+function mkdru_block_view($delta) {
+  if (substr($delta, 0, 12) == 'mkdru_facet_') {
+    $facet = substr($delta, 12);
+    $block['subject'] = t(ucwords($facet));
+    $block['content'] = theme('mkdru_block_facet',
+                               array('class' => 'mkdru-facet-' . $facet));
+    return $block;
+  }
+  elseif (substr($delta, 0, 13) == 'mkdru_search_') {
+    $nid = substr($delta, 13);
+    $block['content'] = theme('mkdru_block_search',
+        array('nid' => $nid, 'path' => '/node/' . $nid));
+    return $block;
   }
 }