X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=mkdru.module;h=26e72337728d30b8a957094df6f10973bf78bc2e;hb=ec0098486f6a1120e0becc3fd38d1e07a72cc3a3;hp=2ee892cf91ffa14006a1091b97c44aa405fee042;hpb=deb8e9b0f920132d5d939f46c6235eb93eaa9cdd;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.module b/mkdru.module
index 2ee892c..26e7233 100644
--- a/mkdru.module
+++ b/mkdru.module
@@ -1,8 +1,4 @@
 <?php
-// $Id$
-
-
-
 // Module metainfo
 /**
 * Implements hook_node_info()
@@ -17,27 +13,6 @@ function mkdru_node_info() {
   );
 }
 
-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(
-      'settings' => json_encode(variable_get('mkdru_ding', NULL)),
-      'pz2_path' => variable_get('pz2_path', '/pazpar2/search.pz2'),
-      'query' => $keys
-    )
-  ), 'setting');
-  return array("content" => $html, "title" => "Meta Search");
-}
-
 /**
 * Implements hook_perm()
 */
@@ -71,31 +46,6 @@ function mkdru_access($op, $node, $account) {
 * Implements hook_menu()
 */
 function mkdru_menu() {
-  // Can't get tabbed menus to work in D6. The children work and the tabs
-  // show up there but the top level's url results in it trying to find
-  // the system module's system.inc in mkdru's directory
-//   $items['admin/settings/mkdru'] = array(
-//     'title' => 'Pazpar2 Metasearch Settings',
-//     'description' => 'Settings for mkdru.',
-//     'access arguments' => array('administer site configuration'),
-//   );
-//   $items['admin/settings/mkdru/settings'] = array(
-//     'title' => 'Settings',
-//     'description' => 'Settings for mkdru.',
-//     'page callback' => 'drupal_get_form',
-//     'page arguments' => array('mkdru_admin_settings'),
-//     'type' => MENU_DEFAULT_LOCAL_TASK,
-//     'file' => 'mkdru.admin.inc',
-//     'weight' => 0,
-//   );
-//   $items['admin/settings/mkdru/ding'] = array(
-//     'title' => 'Ding Integration',
-//     'description' => 'Search settings for mkdru instance integrated into Ding.',
-//     'page callback' => 'drupal_get_form',
-//     'page arguments' => array('mkdru_ding_settings'),
-//     'type' => MENU_LOCAL_TASK,
-//     'weight' => 1,
-//   );
   $items['admin/settings/mkdru'] = array(
     'title' => 'Pazpar2 Metasearch Settings',
     'description' => 'Settings for mkdru.',
@@ -105,14 +55,6 @@ function mkdru_menu() {
     'type' => MENU_NORMAL_ITEM,
     'file' => 'mkdru.admin.inc',
   );
-  $items['admin/settings/mkdru-ding'] = array(
-    'title' => 'Pazpar2 Metasearch Ding Integration',
-    'description' => 'Search settings for mkdru instance integrated into Ding.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('mkdru_ding_settings'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-  );
   $items['ahah-mkdru-facet'] = array(
     'page callback' => 'mkdru_add_facet_callback',
     'access arguments' => array('create metasearch interface'),
@@ -179,7 +121,7 @@ function mkdru_settings_form(&$form_state) {
     '#default_value' => $settings['sp']['user'],
   );
   $form['settings']['sp']['pass'] = array(
-    '#type' => 'password',
+    '#type' => 'textfield',
     '#title' => t('Service Proxy password'),
     '#description' => t('Service Proxy password'),
     '#required' => FALSE,
@@ -221,6 +163,11 @@ function mkdru_settings_form(&$form_state) {
       '#default_value' => $settings['facets'][$facet]['limiter'],
       '#size' => 5,
     );
+    $form['settings']['facets'][$facet]['multiLimit'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Allow multiple limits?'),
+      '#default_value' => $settings['facets'][$facet]['multiLimit'],
+    );
     $form['settings']['facets'][$facet]['max'] = array(
       '#type' => 'textfield',
       '#title' => t('Number of terms to display'),
@@ -315,23 +262,6 @@ function mkdru_add_facet_callback() {
 
 
 
-// Ding config
-function mkdru_ding_settings(&$form_state) {
-  $form_state['build_info']['args']['settings'] = variable_get('mkdru_ding', NULL);
-  $form = drupal_retrieve_form('mkdru_settings_form', &$form_state);
-  $form['settings']['#title'] = t('Default search settings');
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => 'Save configuration',
-  );
-  return $form;
-}
-function mkdru_ding_settings_submit($form, &$form_state) {
-  variable_set('mkdru_ding', $form_state['values']['settings']);
-  drupal_set_message(t('The configuration options have been saved.'));
-}
-
-
 
 // Node config
 /**
@@ -493,7 +423,6 @@ function mkdru_view($node, $teaser = FALSE, $page = FALSE) {
 function mkdru_block($op='list', $delta='sources', $edit=array()) {
   switch ($op) {
     case 'list':
-      // maybe if I label the tables or something?
       $result = db_query("SELECT title, {mkdru}.nid as nid, settings FROM {node},{mkdru} WHERE {mkdru}.nid = {node}.nid;");
       while ($node = db_fetch_object($result)) {
         // search blocks