<?php
-// $Id$
-
-
-
// Module metainfo
/**
* Implements hook_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' => variable_get('mkdru_ding'),
- 'pz2_path' => variable_get('pz2_path', '/pazpar2/search.pz2'),
- 'query' => $keys
- )
- ), 'setting');
- return array("content" => $html, "title" => "Meta Search");
-}
-
/**
* Implements hook_perm()
*/
'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'),
+ 'type' => MENU_CALLBACK,
);
return $items;
}
// Config form common to node and settings
// function mkdru_settings_form($form, &$form_state) {
function mkdru_settings_form(&$form_state) {
-// dpm($form_state);
if (isset($form_state['values']['settings'])) {
- $settings = $form_state['build_info']['args']['settings'];
+ $settings = $form_state['values']['settings'];
}
- else if (isset($form_state['build_info']['args']['settings'])) {
+ elseif (isset($form_state['build_info']['args']['settings'])) {
$settings = $form_state['build_info']['args']['settings'];
}
else {
$settings = variable_get('mkdru_defaults', NULL);
}
+ $form['#cache'] = TRUE;
+
$form['settings'] = array(
'#tree' => TRUE,
);
'#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,
'#collapsible' => TRUE,
'#collapsed' => FALSE
);
- if (empty($form_state['facet_names'])) {
- $form_state['facet_names'] = array('source', 'author', 'subject');
- }
- foreach ($form_state['facet_names'] as $facet) {
+
+ foreach (array_keys($settings['facets']) as $facet) {
$form['settings']['facets'][$facet] = array(
'#type' => 'fieldset',
'#title' => $facet . ' ' . t('facet'),
'#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'),
'#size' => 3,
'#maxlength' => 3,
);
+ $form['settings']['facets'][$facet]['remove'] = array(
+ '#type' => 'submit',
+ '#value' => t('Remove ') . $facet . t(' 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',
-// '#title' => t('Add new facet...'),
-// '#tree' => TRUE,
-// '#collapsible' => TRUE,
-// '#collapsed' => FALSE
-// );
-// $form['new_facet']['canonical'] = array(
-// '#type' => 'textfield',
-// '#title' => t('Canonical name of new facet'),
-// );
-// $form['new_facet']['button'] = array(
-// '#type' => 'submit',
-// '#value' => t('Add facet'),
-// '#description' => t('Configure additional facets based on Pazpar2/SP termlists'),
-// '#weight' => 1,
-// '#submit' => array('mkdru_add_facet_form'),
-// '#ajax' => array(
-// 'callback' => 'mkdru_add_facet_callback',
-// 'wrapper' => 'mkdru-facets-form-wrapper',
-// ),
-// );
+ $form['new_facet'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Add new facet...'),
+ '#tree' => TRUE,
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE
+ );
+ $form['new_facet']['canonical'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Canonical name of new facet'),
+ );
+ $form['new_facet']['button'] = array(
+ '#type' => 'submit',
+ '#value' => t('Add facet'),
+ '#description' => t('Configure additional facets based on Pazpar2/SP termlists'),
+ '#submit' => array('mkdru_add_facet_submit'),
+ '#ahah' => array(
+ 'path' => 'ahah-mkdru-facet',
+ 'wrapper' => 'mkdru-facets-form-wrapper',
+ ),
+ );
return $form;
}
+function mkdru_add_facet_submit($form, &$form_state) {
+ $newfacet = $form_state['values']['new_facet']['canonical'];
+ $form_state['values']['settings']['facets'][$newfacet] = NULL;
+ $form_state['rebuild'] = TRUE;
+ return $form_state['values'];
+}
-
-// 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_remove_facet_submit($form, &$form_state) {
+ $delfacet = $form_state['clicked_button']['#mkdru facet'];
+ if ($delfacet)
+ unset($form_state['values']['settings']['facets'][$delfacet]);
}
-function mkdru_ding_settings_submit($form, &$form_state) {
- dpm($form_state);
- variable_set('mkdru_ding', $form_state[values][settings]);
- drupal_set_message(t('The configuration options have been saved.'));
+
+function mkdru_add_facet_callback() {
+ // Necessary to work with hook_form
+ module_load_include('inc', 'node', 'node.pages');
+
+ // Retrieve form from cache
+ $form_state = array('storage' => NULL, 'submitted' => FALSE);
+ $form_build_id = $_POST['form_build_id'];
+ $form = form_get_cache($form_build_id, $form_state);
+
+ // Run drupal_process_form to call submit handler and update $form_state
+ $args = $form['#parameters'];
+ $form_id = array_shift($args);
+ $form_state['post'] = $form['#post'] = $_POST;
+ $form['#programmed'] = $form['#redirect'] = FALSE;
+ drupal_process_form($form_id, $form, $form_state);
+
+ // Regenerate form so we can render the new facet part
+ $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
+
+ // Choose subset of form to redraw.
+ $facet_form = $form['settings']['facets'];
+ // Prevent duplicate wrappers.
+ unset($facet_form['#prefix'], $facet_form['#suffix']);
+ $output = theme('status_messages') . drupal_render($facet_form);
+
+ // Final rendering callback
+ drupal_json(array('status' => TRUE, 'data' => $output));
}
+
// Node config
/**
* Implements hook_form()
}
$form = drupal_retrieve_form('mkdru_settings_form', &$form_state);
-
$type = node_get_types('type', $node);
$form['title'] = array(
'#type' => 'textfield',
function mkdru_block($op='list', $delta='sources', $edit=array()) {
switch ($op) {
case 'list':
- // facet blocks
- // D6 has no setting for note type visibility, set
- // the default to limit facet display to this type
- $visPHP = '<?php
- if (arg(0) == "node" && is_numeric(arg(1))) {
- $node = node_load(array("nid" => arg(1)));
- return $node->type == "mkdru";
- }
-?>';
-
- // NB: block caching is redundant for static content
- $blocks['mkdru_sources']['info'] = t('mkdru - source facets');
- $blocks['mkdru_sources']['cache'] = BLOCK_NO_CACHE;
- $blocks['mkdru_sources']['visibility'] = 2;
- $blocks['mkdru_sources']['pages'] = $visPHP;
- $blocks['mkdru_subjects']['info'] = t('mkdru - subject facets');
- $blocks['mkdru_subjects']['cache'] = BLOCK_NO_CACHE;
- $blocks['mkdru_subjects']['visibility'] = 2;
- $blocks['mkdru_subjects']['pages'] = $visPHP;
- $blocks['mkdru_authors']['info'] = t('mkdru - author facets');
- $blocks['mkdru_authors']['cache'] = BLOCK_NO_CACHE;
- $blocks['mkdru_authors']['visibility'] = 2;
- $blocks['mkdru_authors']['pages'] = $visPHP;
- // search blocks
- $result = db_query("SELECT title, nid FROM {node} WHERE type = 'mkdru';");
+ $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
$blocks['mkdru_search_' . $node->nid]['info'] =
t('mkdru - search box for "' . $node->title . '"');
- $blocks['mkdru_sources']['cache'] = BLOCK_NO_CACHE;
+ // facet blocks
+ $settings = json_decode($node->settings, TRUE);
+ foreach ($settings['facets'] as $facet_name => $facet) {
+ $key = 'mkdru_facet_' . $facet_name . '_' . $node->nid;
+ $blocks[$key]['info'] = 'mkdru - ' . $facet_name
+ . t(' facet for "') . $node->title . '"';
+ $blocks[$key]['visibility'] = 1;
+ $blocks[$key]['pages'] = 'node/' . $node->nid;
+ $blocks[$key]['cache'] = BLOCK_CACHE_GLOBAL;
+ }
};
return $blocks;
case 'view':
- switch ($delta) {
- case 'mkdru_sources':
- $block['subject'] = t('Source');
- $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-source');
- return $block;
- case 'mkdru_subjects':
- $block['subject'] = t('Subject');
- $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-subject');
- return $block;
- case 'mkdru_authors':
- $block['subject'] = t('Author');
- $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-author');
- return $block;
- }
- if (substr($delta, 0, 13) == 'mkdru_search_') {
- $nid = substr($delta, 13);
- $block['content'] = theme('mkdru_block_search', $nid, '/node/' . $nid);
- return $block;
- }
+ if (preg_match('/^mkdru_facet_(.*)_(\d+)$/', $delta, $matches) > 0) {
+ $facet = $matches[1];
+ $nid = $matches[2];
+
+ // this is rather spendy just to get the title, should really
+ // be able to set a default title in op=list. will be cached though
+ // so I suppose it's okay?
+ $result = db_query("SELECT settings FROM {mkdru} WHERE nid = %d;", $nid);
+ $settingsjson = db_fetch_object($result)->settings;
+ $settings = json_decode($settingsjson, TRUE);
+ if (isset($settings['facets'][$facet]['displayName'])) {
+ $block['subject'] = $settings['facets'][$facet]['displayName'];
+ }
+ $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-' . $facet);
+ }
+ else if (substr($delta, 0, 13) == 'mkdru_search_') {
+ $nid = substr($delta, 13);
+ $block['content'] = theme('mkdru_block_search', $nid, '/node/' . $nid);
+ }
+ return $block;
}
}
projects / mkdru-moved-to-drupal.org.git / blobdiff