Phasing out the old slug system.

Author: mikl

ding_breadcrumbs/ding_breadcrumbs.module

@@ -1,9 +1,7 @@
 <?php
-
 /**
- * @file ding_breadcrumbs.module
- * Handles the generation and loading of nodes from "slugs",
- * small bits of text, suitable for use in URLs.
+ * @file
+ * Provides custom breadcrumbs for Ding pages.
  */
 
 /**
@@ -41,17 +39,15 @@ function ding_breadcrumbs_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
     else {
       if (isset($node->field_library_ref[0]['nid'])) {
         $trail[] = l(t('Libraries'), 'biblioteker');
-        $library = node_load($node->field_library_ref[0]['nid']);
-        $trail[] = l($library->title, 'node/' . $library->nid);
+        $nid = $node->field_library_ref[0]['nid'];
+
+        $trail[] = l($library->title, 'node/' . $nid);
 
-        // Slugs are generated separately from library nodes and consequently
-        // may not be set. Default to nid.
-        $library_id = ($library->slug) ? $library->slug : $library->nid;
         if ($node->type == 'article') {
-          $trail[] = l(t('Blog'), 'biblioteker/' . $library_id . '/blog');
+          $trail[] = l(t('Blog'), 'node/' . $nid . '/blog');
         }
         elseif ($node->type == 'event') {
-          $trail[] = l(t('Events'), 'biblioteker/' . $library_id . '/arrangementer');
+          $trail[] = l(t('Events'), 'node/' . $nid . '/arrangementer');
         }
       }
     }

ding_event/ding_event.module

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Module for handling event nodes.
@@ -65,13 +64,8 @@ function ding_event_theme() {
 function ding_event_views_pre_render(&$view) {
   // When the event list is being displayed on a library page...
   if ($view->name == 'event_list' && $view->current_display == 'panel_pane_2') {
-    // Generate the link to the library's event page
-    $id = ding_library_get_slug($view->args[0]);
-    if (!$id) {
-      // No slug? Fall back to nid
-      $id = $view->args[0];
-    }
-    $url = url('biblioteker/' . $id . '/arrangementer');
+    // Generate link to the library's event page.
+    $url = url('node/' . $view->args[0] . '/arrangementer');
 
     // Replace the URL in the more link to point at the library's event
     // page instead of the global one.

ding_library/ding_library.admin.inc

@@ -1,7 +1,6 @@
 <?php
-
 /**
- * @file ding_library.admin.inc
+ * @file
  * Admin forms, page callbacks and related functions.
  *
  * Much of this stuff is a taken from the scaffolding example module.
@@ -166,115 +165,3 @@ function theme_ding_library_admin_ordering_form($form) {
   return $output;
 }
 
-/**
- * Slug editing form.
- */
-function ding_library_admin_slugs_form(&$form_state) {
-  // Confirmation form for changing existing slugs. The storage array
-  // is set by the submit handler, and as long as it is non-empty, we're
-  // returned to the form.
-  if (!empty($form_state['storage']['slug_changes'])) {
-    $changes_text = array();
-    foreach ($form_state['storage']['slug_changes'] as $change) {
-      $changes_text[] = t('Change slug for %library from !old to !new', array(
-        '%library' => $change['title'],
-        '!old' => '<tt>' . check_plain($change['old_slug']) . '</tt>',
-        '!new' => '<tt>' . check_plain($change['new_slug']) . '</tt>',
-      ));
-    }
-
-    return confirm_form(array(), t('Please confirm these slug changes'), $_GET['q'], theme('item_list', $changes_text), t('Confirm'), t('Cancel'));
-  }
-
-  // Grab all the library nodes with their weight.
-  $query = db_query("
-    SELECT n.nid, n.title, p.value AS slug FROM {node} AS n
-    LEFT JOIN {purl} AS p ON (p.id = n.nid AND provider = 'ding_library')
-    WHERE n.type = 'library'
-    ORDER BY n.title;
-  ");
-
-  $existing = array();
-  $form = array();
-
-  $form['warning'] = array(
-    '#prefix' => '<div class="warning">',
-    '#value' => t("Here you can edit the identifying part of a library's URL, called “slugs”. Be aware that changing the existing slugs will URLs to change, resulting in dead links."),
-    '#suffix' => '</div>',
-  );
-
-  $form['records']['#tree'] = TRUE;
-  while ($row = db_fetch_object($query)) {
-    $form['records'][$row->nid] = array(
-      '#type' => 'textfield',
-      '#title' => $row->title,
-      '#default_value' => $row->slug,
-    );
-    // Add the existing slugs to an array, so we'll be able to detect
-    // overwriting in the validation.
-    if (!empty($row->slug)) {
-      $existing[$row->nid] = $row->slug;
-    }
-  }
-
-  $form['existing_slugs'] = array(
-    '#type' => 'value',
-    '#value' => $existing,
-  );
-
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save changes'),
-  );
-
-  return $form;
-}
-
-/**
- * Submit handler for the slug editing form.
- */
-function ding_library_admin_slugs_form_submit($form, &$form_state) {
-  // If the there's slug changes in the storage array, it means that
-  // we've been through the confirmation form, and should now proceeed
-  // to change the slugs in the database.
-  if (isset($form_state['storage']['slug_changes'])) {
-    foreach ($form_state['storage']['slug_changes'] as $change) {
-      purl_save(array(
-        'id' => $change['nid'],
-        'provider' => 'ding_library',
-        'value' => $change['new_slug'],
-      ));
-
-      // Unset the storage, so we'll won't get the confirmation page again.
-      unset($form_state['storage']);
-      return;
-    }
-  }
-
-  $slug_changes = array();
-
-  foreach ($form_state['values']['records'] as $nid => $slug) {
-    if (!empty($slug)) {
-      if (isset($form_state['values']['existing_slugs'][$nid]) && $form_state['values']['existing_slugs'][$nid] != $slug) {
-        // Existing slug is being changed, store the changes so we can
-        // create a confirmation form with it.
-        $slug_changes[$nid] = array(
-          'nid' => $nid,
-          'title' => $form['records'][$nid]['#title'],
-          'old_slug' => $form_state['values']['existing_slugs'][$nid],
-          'new_slug' => ding_library_slugify($slug),
-        );
-      }
-      else {
-        // Save the newly added slug via PURL.
-        purl_save(array(
-          'id' => $nid,
-          'provider' => 'ding_library',
-          'value' => ding_library_slugify($slug),
-        ));
-      }
-    }
-  }
-  $form_state['storage']['slug_changes'] = $slug_changes;
-}
-

ding_library/ding_library.info

@@ -12,7 +12,7 @@ dependencies[] = "location"
 dependencies[] = "node"
 dependencies[] = "office_hours"
 dependencies[] = "page_manager"
-dependencies[] = "purl"
+dependencies[] = "panels_subsites"
 dependencies[] = "rules"
 dependencies[] = "strongarm"
 dependencies[] = "views_content"
@@ -38,10 +38,6 @@ features[rules_categories][] = "ding_library"
 features[variable][] = "ant_library"
 features[variable][] = "comment_library"
 features[variable][] = "content_extra_weights_library"
-features[variable][] = "gmap_default"
-features[variable][] = "gmap_markermanager"
-features[variable][] = "gmap_mm_type"
-features[variable][] = "gmap_node_markers"
 features[variable][] = "language_content_type_library"
 features[variable][] = "location_defaultnum_library"
 features[variable][] = "location_geocode_dk"

ding_library/ding_library.install

@@ -1,7 +1,6 @@
 <?php
-
 /**
- * @file ding_library.install
+ * @file
  * Installation and upgrade hooks for the ding_library module.
  */
 
@@ -192,3 +191,32 @@ function ding_library_update_6007() {
   db_add_index($ret, 'ding_library', 'branch_id', array('branch_id'));
   return $ret;
 }
+
+/**
+ * Enable panels_subsites.
+ */
+function ding_library_update_6008() {
+  module_disable(array('purl'));
+  drupal_install_modules(array('panels_subsites'));
+}
+
+
+/**
+ * Migrate from our old slugs to panels_subsites.
+ */
+function ding_library_update_6009() {
+  $old_slugs = db_query('
+    SELECT p.id AS nid, p.value AS slug, n.type AS node_type
+    FROM purl AS p
+    INNER JOIN node AS n ON (n.nid = p.id)
+  ');
+
+  while ($row = db_fetch_object($old_slugs)) {
+    drupal_write_record('panels_subsites_slugs', $row);
+  }
+
+  // Get rid of the PURL modules.
+  //drupal_uninstall_module('purl_test');
+  //drupal_uninstall_module('purl');
+}
+