X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=mkdru.module;h=7ad747997993d714c69667b7cd55560f8ca8d56a;hb=refs%2Fheads%2Fding1-theme;hp=d988da74edad96ee4c7f774c8d6551be001ff14a;hpb=3a8afed1034f596f553f0caafbf54c1588f97ac3;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.module b/mkdru.module
index d988da7..7ad7479 100644
--- a/mkdru.module
+++ b/mkdru.module
@@ -20,9 +20,18 @@ 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');
+  // D6 is not to be able to handle external scripts and always
+  // prepends '/' (so we cannot keep pz2.js on remote host)
+  // we will try to be even smarter :)
+  $pz2_js_path = variable_get('pz2_js_path', 'pazpar2/js');
+  if (preg_match('/^\//', $pz2_js_path)) {
+     $pz2_js_path = trim($pz2_js_path, '/');
+     drupal_add_js($pz2_js_path.'/pz2.js', 'module', 'footer',
+       TRUE, TRUE, FALSE);
+     error_log("Pz2.js added as alias script '".$pz2_js_path);  
+  } else {
+    drupal_add_js($path.'/'.$pz2_js_path.'/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');
@@ -138,7 +147,7 @@ function mkdru_settings_form(&$form_state) {
   if (isset($form_state['values']['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 {
@@ -179,7 +188,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 +230,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'),
@@ -236,6 +250,16 @@ function mkdru_settings_form(&$form_state) {
       '#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',
@@ -268,6 +292,12 @@ function mkdru_add_facet_submit($form, &$form_state) {
   return $form_state['values'];
 }
 
+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_add_facet_callback() {
   // Necessary to work with hook_form
   module_load_include('inc', 'node', 'node.pages');
@@ -311,7 +341,7 @@ function mkdru_ding_settings(&$form_state) {
   return $form;
 }
 function mkdru_ding_settings_submit($form, &$form_state) {
-  variable_set('mkdru_ding', $form_state[values][settings]);
+  variable_set('mkdru_ding', $form_state['values']['settings']);
   drupal_set_message(t('The configuration options have been saved.'));
 }
 
@@ -477,57 +507,45 @@ function mkdru_view($node, $teaser = FALSE, $page = FALSE) {
 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';");
+      // 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
         $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;
   }
 }