Handle settings passed in as JSON from new data model.

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

diff --git a/mkdru.module b/mkdru.module
index cf127cc..a4845e2 100644 (file)
--- a/mkdru.module
+++ b/mkdru.module
@@ -17,19 +17,27 @@ function mkdru_node_info() {
   );
 }
 
-function mkdru_ting_search_show($params) {
+function mkdru_ting_search_tab($keys) {
+  error_log("TING SEARCH TAB invoked");
    $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 . '/jquery.ba-bbq.js', 'module', 'footer');
+  drupal_add_js($path . '/recipe.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);
+    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' => $keys
+    )
+  ), 'setting');
+  return array("content" => $html, "title" => "Meta Search");
 }
 
 /**
@@ -128,7 +136,7 @@ function mkdru_form(&$node, $form_state) {
     '#type' => 'fieldset',
     '#title' => t('Service Proxy specific settings'),
     '#collapsible' => TRUE,
-    '#collapsed' => TRUE
+    '#collapsed' => FALSE
   );
   $form['sp_settings']['sp_user'] = array(
     '#type' => 'textfield',