mkdru.removeLimits() no longer leaves dangling limit_subject

[mkdru-moved-to-drupal.org.git] / mkdru.module

diff --git a/mkdru.module b/mkdru.module
index cb20ab0..d057df2 100644 (file)
--- a/mkdru.module
+++ b/mkdru.module
@@ -5,7 +5,7 @@
 
 // Module metainfo
 /**
-* Implementation of hook_node_info()
+* Implements hook_node_info()
 */
 function mkdru_node_info() {
   return array(
@@ -27,20 +27,26 @@ function mkdru_ting_search_show($params) {
   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');
+    array(
+      'use_sessions' => variable_get('use_sessions', '1'),
+      'pz2_path' => variable_get('pz2_path', '/pazpar2/search.pz2'),
+      'sp_user' => variable_get('sp_user', ''),
+      'sp_pass' => variable_get('sp_pass', ''),
+      'query' => $params['keys']
+    )
+  ), 'setting');
   return array("content" => $html);
 }
 
 /**
-* Implementation of hook_perm()
+* Implements hook_perm()
 */
 function mkdru_perm() {
   return array('create metasearch interface', 'edit any metasearch interface', 'edit own metasearch interface');
 }
 
 /**
-* Implementation of hook_access()
+* Implements hook_access()
 */
 function mkdru_access($op, $node, $account) {
 
@@ -62,7 +68,7 @@ function mkdru_access($op, $node, $account) {
 }
 
 /**
-* Implementation of hook_menu()
+* Implements hook_menu()
 */
 function mkdru_menu() {
   $items['admin/settings/mkdru'] = array(
@@ -78,7 +84,7 @@ function mkdru_menu() {
 }
 
 /**
-* Implementation of hook_init()
+* Implements hook_init()
 */
 function mkdru_init() {
   // Applies our module specific CSS to all pages. This works best because
@@ -91,7 +97,7 @@ function mkdru_init() {
 
 // Node config
 /**
-* Implementation of hook_form()
+* Implements hook_form()
 */
 function mkdru_form(&$node, $form_state) {
   $type = node_get_types('type', $node);
@@ -124,6 +130,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' => FALSE
+  );
+  $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'),
@@ -159,7 +188,7 @@ function mkdru_form(&$node, $form_state) {
 
 
 /**
-* Implementation of hook_validate()
+* Implements hook_validate()
 */
 function mkdru_validate($node) {
   if (!is_numeric($node->source_max)) {
@@ -174,15 +203,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) {
@@ -190,12 +218,12 @@ 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().
+ * Implements 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
@@ -210,7 +238,7 @@ function mkdru_nodeapi(&$node, $op, $teaser, $page) {
 }
 
 /**
- * Implementation of hook_delete().
+ * Implements hook_delete().
  */
 function mkdru_delete($node) {
   // Deleting by nid covers all revisions.
@@ -221,7 +249,7 @@ function mkdru_delete($node) {
 
 // Node rendering
 /**
-* Implementation of hook_load()
+* Implements hook_load()
 */
 function mkdru_load($node) {
   return array('mkdru' => db_fetch_object(db_query(
@@ -229,7 +257,7 @@ function mkdru_load($node) {
 }
 
 /**
-* Implementation of hook_theme().
+* Implements hook_theme().
 */
 function mkdru_theme() {
   return array(
@@ -270,7 +298,7 @@ function theme_mkdru_js($node) {
 }
 
 /** 
-* Implementation of hook_view()
+* Implements hook_view()
 */
 function mkdru_view($node, $teaser = FALSE, $page = FALSE) {
   $node->content['mkdru_js'] = array(
@@ -289,7 +317,7 @@ function mkdru_view($node, $teaser = FALSE, $page = FALSE) {
 }
 
 /** 
-* Implementation of hook_block()
+* Implements hook_block()
 */
 function mkdru_block($op='list', $delta='sources', $edit=array()) {
   switch ($op) {