X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.module;h=2ee892cf91ffa14006a1091b97c44aa405fee042;hb=deb8e9b0f920132d5d939f46c6235eb93eaa9cdd;hp=9610cd03db895fe398019f7c7e61fbe62c4453fb;hpb=deb78c3383bd7ea1f9af782613c1007c14ea4763;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.module b/mkdru.module
index 9610cd0..2ee892c 100644
--- a/mkdru.module
+++ b/mkdru.module
@@ -238,7 +238,7 @@ function mkdru_settings_form(&$form_state) {
     );
     $form['settings']['facets'][$facet]['remove'] = array(
       '#type' => 'submit',
-      '#value' => t('Remove facet'),
+      '#value' => t('Remove ') . $facet . t(' facet'),
       '#mkdru facet' => $facet,
       '#submit' => array('mkdru_remove_facet_submit'),
       '#ahah' => array(
@@ -279,7 +279,6 @@ function mkdru_add_facet_submit($form, &$form_state) {
 }
 
 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]);
@@ -494,57 +493,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;
   }
 }