X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.module;h=caf134167ae1e951813d69123cd383a9e8fb8d6f;hb=b5d84d4e70f55401474b83f90f89fc96e2aabca0;hp=918504265b5b5e318ba3d44a1a2d7f80585f818a;hpb=42f1893f4910001139f11d5cafceb0463b751d30;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.module b/mkdru.module
index 9185042..caf1341 100644
--- a/mkdru.module
+++ b/mkdru.module
@@ -71,6 +71,31 @@ 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.',
@@ -211,6 +236,16 @@ function mkdru_settings_form(&$form_state) {
       '#size' => 3,
       '#maxlength' => 3,
     );
+    $form['settings']['facets'][$facet]['remove'] = array(
+      '#type' => 'submit',
+      '#value' => t('Remove facet'),
+      '#mkdru facet' => $facet,
+      '#submit' => array('mkdru_remove_facet_submit'),
+      '#ahah' => array(
+        'path' => 'ahah-mkdru-facet',
+        'wrapper' => 'mkdru-facets-form-wrapper',
+      ),
+    );
   }
   $form['new_facet']  = array(
     '#type' => 'fieldset',
@@ -237,13 +272,19 @@ function mkdru_settings_form(&$form_state) {
 }
 
 function mkdru_add_facet_submit($form, &$form_state) {
-//   $newfacet = $form_state['values']['new_facet']['canonical'];
-  $newfacet = 'PFUI';
+  $newfacet = $form_state['values']['new_facet']['canonical'];
   $form_state['values']['settings']['facets'][$newfacet] = NULL;
   $form_state['rebuild'] = TRUE;
   return $form_state['values'];
 }
 
+function mkdru_remove_facet_submit($form, &$form_state) {
+  dpm($form_state);
+  $delfacet = $form_state['clicked_button']['#mkdru facet'];
+  if ($delfacet)
+    unset($form_state['values']['settings']['facets'][$delfacet]);
+}
+
 function mkdru_add_facet_callback() {
   // Necessary to work with hook_form
   module_load_include('inc', 'node', 'node.pages');