'. t('This page is part of a book outline, and has other pages associated as child pages.') .'
', + '#weight' => -10, + ); } } /** - * Implementation of hook_form(). + * Returns an array of all books. */ -function book_form(&$node) { - $type = node_get_types('type', $node); - if (!empty($node->nid) && !$node->parent && !user_access('create new books')) { - $form['parent'] = array('#type' => 'value', '#value' => $node->parent); +function book_get_books() { + static $books; + + if (!isset($books)) { + $books = array(); + $result = db_query("SELECT DISTINCT(book_id) FROM {book}"); + $nids = array(); + while ($b = db_fetch_array($result)) { + $nids[] = $b['book_id']; + } + if ($nids) { + $result2 = db_query(db_rewrite_sql("SELECT n.type, b.*, ml.* FROM {book} b INNER JOIN {node} n on b.nid = n.nid INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE n.nid IN (". implode(',', $nids). ") AND n.status = 1 ORDER BY ml.weight, ml.link_title")); + while ($b = db_fetch_array($result2)) { + $books[] = $b; + } + } } - else { - $form['parent'] = array('#type' => 'select', - '#title' => t('Parent'), - '#default_value' => (isset($node->parent) ? $node->parent : arg(4)), - '#options' => book_toc(isset($node->nid) ? $node->nid : 0), - '#weight' => -4, - '#description' => user_access('create new books') ? t('The parent section in which to place this page. Note that each page whose parent is <top-level> is an independent, top-level book.') : t('The parent that this page belongs in.'), - ); + return $books; +} + +/** + * Returns an array of node types that are the basis of books that the user can access. + */ +function book_node_types() { + static $types; + + if (!isset($types)) { + $types = array(); + foreach (book_get_books() as $b) { + $types[] = $b['type']; + } + $types = array_unique($types); } + return $types; +} - $form['title'] = array('#type' => 'textfield', - '#title' => check_plain($type->title_label), - '#required' => TRUE, - '#default_value' => $node->title, - '#weight' => -5, - ); - - $form['body_field'] = node_body_field($node, $type->body_label, 1); - - if (user_access('administer nodes')) { - $form['weight'] = array('#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => isset($node->weight) ? $node->weight : 0, - '#delta' => 15, - '#weight' => 5, - '#description' => t('Pages at a given level are ordered first by weight and then by title.'), - ); + +/** + * AJAX callback to repalce the book parent select. + * + * @param $build_id + * The form's build_id. + * @param $book_id + * A book_id form from among those on the form. + * @return + * Prints the replacement HTML + */ +function book_form_update($build_id, $book_id) { + + $cid = 'form_'. $build_id; + $cache = cache_get($cid, 'cache_form'); + if ($cache) { + $form = $cache->data; + + // Validate the book_id. + if (isset($form['book']['book_id']['#options'][$book_id])) { + $book_link = $form['#node']->book; + $book_link['book_id'] = $book_id; + // Get the new options and update the cache. + $form['book']['plid'] = _book_parent_select($book_link); + $expire = max(ini_get('session.cookie_lifetime'), 86400); + cache_set($cid, $form, 'cache_form', $expire); + + $form_state = array(); + $form['#post'] = array(); + $form = form_builder($form['form_id']['#value'] , $form, $form_state); + $output = drupal_render($form['book']['plid']); + print(drupal_to_js(array('book' => $output))); + } + } + exit(); +} + +/** + * Implementation of hook_form_alter(). + */ +function book_form_alter(&$form, $form_state, $form_id) { + + if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) { + // Add elements to the node form + $node = $form['#node']; + + $access = user_access('outline posts in books') || user_access('create new books'); + if (!$access) { + if ((!empty($node->book['mlid']) && !empty($node->nid)) || in_array($node->type, book_node_types())) { + // Already in the book hierarchy or there are existing books based on this node type.. + $access = TRUE; + } + } + + if ($access) { + _book_add_form_elements($form, $node); + $form['book']['pick-book'] = array( + '#type' => 'submit', + '#value' => t('Change book (update list of parents)'), + '#submit' => array('book_pick_book_submit'), + '#weight' => 20, + ); + $form['#submit'][] = 'book_submit'; + } + } +} + +/** + * Like a node preview, to update options in the parent select. + */ +function book_pick_book_submit($form, &$form_state) { + // We do not want to execute button level handlers, we want the form level + // handlers to go in and change the submitted values. + unset($form_state['submit_handlers']); + form_execute_handlers('submit', $form, $form_state); + $form_state['rebuild'] = TRUE; + $form_state['node'] = $form_state['values']; +} + +function _book_parent_select($book_link) { + // Offer a drop-down to choose a different parent page. + $form = array('#type' => 'select', '#options' => array(-1 => ''), '#disabled' => TRUE); + + if ($book_link['nid'] === $book_link['book_id']) { + // This is a book - at the top level. + $form['#title'] = ''. t('This is the top-level page in this book') .''; + } + elseif (!$book_link['book_id']) { + $form['#title'] = ''. t('No book selected') .''; } else { - // If a regular user updates a book page, we preserve the node weight; otherwise - // we use 0 as the default for new pages - $form['weight'] = array( - '#type' => 'value', - '#value' => isset($node->weight) ? $node->weight : 0, + $form = array( + '#type' => 'select', + '#title' => t('Parent item'), + '#default_value' => $book_link['plid'], + '#description' => t('The parent page in the book.'), + '#options' => book_toc($book_link['book_id'], array($book_link['mlid'])), ); } - return $form; } -/** - * Implementation of function book_outline() - * Handles all book outline operations. - */ -function book_outline($form_state, $node) { - $form['parent'] = array('#type' => 'select', - '#title' => t('Parent'), - '#default_value' => isset($node->parent) ? $node->parent : 0, - '#options' => book_toc($node->nid), - '#description' => t('The parent page in the book.'), +function _book_add_form_elements(&$form, $node) { + $settings['book']['formCallback'] = url('book-form-update' , array()); + $settings['book']['formId'] = $form['#id']; + drupal_add_js($settings, 'setting'); + drupal_add_js(drupal_get_path('module', 'book'). '/book.js'); + + // Need this for AJAX. + $form['#cache'] = TRUE; + + $form['book'] = array( + '#type' => 'fieldset', + '#title' => t('Book outline options'), + '#weight' => -1, + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#tree' => TRUE, ); - $form['weight'] = array('#type' => 'weight', + foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'orig_book_id') as $key) { + $form['book'][$key] = array( + '#type' => 'value', + '#value' => $node->book[$key], + ); + } + + $form['book']['plid'] = _book_parent_select($node->book); + + $form['book']['weight'] = array( + '#type' => 'weight', '#title' => t('Weight'), - '#default_value' => isset($node->weight) ? $node->weight : 0, + '#default_value' => $node->book['weight'], '#delta' => 15, + '#weight' => 1, '#description' => t('Pages at a given level are ordered first by weight and then by title.'), ); - $form['log'] = array('#type' => 'textarea', - '#title' => t('Log message'), - '#description' => t('An explanation to help other authors understand your motivations to put this post into the book.'), + $options = array(); + if (!$node->book['mlid']) { + $options[0] = '<'. t('none') .'>'; + } + + foreach (book_get_books() as $book) { + if ($book['type'] == $node->type || user_access('outline posts in books') || $node->book['orig_book_id'] == $book['nid']) { + $options[$book['nid']] = check_plain($book['link_title']); + } + } + $nid = isset($node->nid) ? $node->nid : 'new'; + if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['orig_book_id']))) { + // The node can become a new book, if it is not one already. + $options = array($nid => '<'. t('create a new book') .'>') + $options; + } + + if ($node->book['book_id']) { + $title = t('Select a different book to move this post to'); + } + else { + $title = t('Select a book to add this post to'); + } + // Add a drop-down to select the destination book. + $form['book']['book_id'] = array( + '#type' => 'select', + '#title' => $title, + '#default_value' => (isset($node->book['book_id']) ? $node->book['book_id'] : 1), + '#options' => $options, + '#access' => (bool)$options, + '#description' => t('Select the book you wish to add/move your page to.'), + '#weight' => 15, ); +} - $form['nid'] = array('#type' => 'value', '#value' => isset($node->nid) ? $node->nid : 0); - if (isset($node->parent)) { - $form['update'] = array('#type' => 'submit', - '#value' => t('Update book outline'), - ); - $form['remove'] = array('#type' => 'submit', - '#value' => t('Remove from book outline'), - ); +/** + * Build the form to handle all book outline operations. + */ +function book_outline(&$form_state, $node) { + + if (!isset($node->book)) { + // The node is not part of any book yet - set default options. + $node->book = _book_link_defaults($node->nid); + } + else { + $node->book['orig_book_id'] = $node->book['book_id']; + } + $form['#node'] = $node; + $form['#id'] = 'book-outline'; + _book_add_form_elements($form, $node); + + $form['book']['#collapsible'] = FALSE; + + $form['book']['update'] = array( + '#type' => 'submit', + '#value' => t('Update book outline'), + '#weight' => 5, + ); + + $form['book']['remove'] = array( + '#type' => 'submit', + '#value' => t('Remove from book outline'), + '#access' => $node->nid != $node->book['book_id'] && $node->book['book_id'], + '#weight' => 10, + ); + + if ($node->book['book_id']) { + $action = t('Move to a different book'); } else { - $form['add'] = array('#type' => 'submit', '#value' => t('Add to book outline')); + $action = t('Add to book outline'); } + $form['book']['pick-book'] = array('#type' => 'submit', '#value' => $action, '#weight' => 20); + drupal_set_title(check_plain($node->title)); return $form; } +function _book_update_outline(&$node) { + if (empty($node->book['book_id'])) { + return FALSE; + } + $new = empty($node->book['mlid']); + + $node->book['link_path'] = 'node/'. $node->nid; + $node->book['link_title'] = $node->title; + + if ($node->book['book_id'] == $node->nid) { + $node->book['plid'] = 0; + } + else { + // Check in case parent is not is this book - book takes precedence. + if (!empty($node->book['plid'])) { + $parent = db_fetch_array(db_query("SELECT * FROM {book} WHERE mlid = %d", $node->book['plid'])); + } + if (empty($node->book['plid']) || !$parent || $parent['book_id'] != $node->book['book_id']) { + $node->book['plid'] = db_result(db_query("SELECT mlid FROM {book} WHERE nid = %d", $node->book['book_id'])); + } + } + if (menu_link_save($node->book)) { + if ($new) { + // Insert new. + db_query("INSERT INTO {book} (nid, mlid, book_id) VALUES (%d, %d, %d)", $node->nid, $node->book['mlid'], $node->book['book_id']); + } + else { + if ($node->book['book_id'] != db_result(db_query("SELECT book_id FROM {book} WHERE nid = %d", $node->nid))) { + // Update the book_id for this page and all children. + book_update_book_id($node->book); + } + } + return TRUE; + } + return FALSE; +} + /** * Handles book outline form submissions. */ function book_outline_submit($form, &$form_state) { - $op = $form_state['values']['op']; - $node = node_load($form_state['values']['nid']); + $node = $form['#node']; + $form_state['redirect'] = "node/". $node->nid; + $link = $form_state['values']['book']; + if (!$link['book_id']) { + return; + } + + $link['menu_name'] = book_menu_name($link['book_id']); - switch ($op) { + switch ($form_state['values']['op']) { case t('Add to book outline'): - db_query('INSERT INTO {book} (nid, vid, parent, weight) VALUES (%d, %d, %d, %d)', $node->nid, $node->vid, $form_state['values']['parent'], $form_state['values']['weight']); - db_query("UPDATE {node_revisions} SET log = '%s' WHERE vid = %d", $form_state['values']['log'], $node->vid); - drupal_set_message(t('The post has been added to the book.')); + case t('Move to a different book'): + if ($link['book_id'] != $node->book['book_id']) { + // Only act if the destination book is different from the current book. + $node->book = $link; + if (_book_update_outline($node)) { + if ($node->book['plid']) { + drupal_set_message(t('The post has been added to the book. You may now position it relative to other pages.')); + $form_state['redirect'] = "node/". $node->nid ."/outline"; + } + else { + drupal_set_message(t('The post is now a separate book.')); + } + } + else { + drupal_set_message(t('There was an error adding the post to the book.')); + } + } + else { + drupal_set_message(t('No changes were made')); + } break; case t('Update book outline'): - db_query('UPDATE {book} SET parent = %d, weight = %d WHERE vid = %d', $form_state['values']['parent'], $form_state['values']['weight'], $node->vid); - db_query("UPDATE {node_revisions} SET log = '%s' WHERE vid = %d", $form_state['values']['log'], $node->vid); - drupal_set_message(t('The book outline has been updated.')); + $node->book = $link; + if (_book_update_outline($node)) { + drupal_set_message(t('The book outline has been updated.')); + } break; case t('Remove from book outline'): - db_query('DELETE FROM {book} WHERE nid = %d', $node->nid); - drupal_set_message(t('The post has been removed from the book.')); + if ($node->nid != $node->book['book_id']) { + // Only allowed when this is not a book (top-level page). + menu_link_delete($node->book['mlid']); + db_query('DELETE FROM {book} WHERE nid = %d', $node->nid); + drupal_set_message(t('The post has been removed from the book.')); + } break; } - $form_state['redirect'] = "node/$node->nid"; - return; } /** - * Given a node, this function returns an array of 'book node' objects - * representing the path in the book tree from the root to the - * parent of the given node. - * - * @param $node - * A book node object for which to compute the path. - * - * @return - * An array of book node objects representing the path nodes root to - * parent of the given node. Returns an empty array if the node does - * not exist or is not part of a book hierarchy. + * Update the book_id for a page and its children when we move it to a new book. */ -function book_location($node, $nodes = array()) { - $parent = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'), $node->parent)); - if (isset($parent->title)) { - $nodes = book_location($parent, $nodes); - $nodes[] = $parent; +function book_update_book_id($link) { + + for ($i = 1; $i <= MENU_MAX_DEPTH && $link["p$i"]; $i++) { + $match[] = "p$i = %d"; + $args[] = $link["p$i"]; + } + $result = db_query("SELECT mlid FROM {menu_links} WHERE ". implode(' AND ', $match), $args); + + $mlids = array(); + while ($a = db_fetch_array($result)) { + $mlids[] = $a['mlid']; + } + if ($mlids) { + db_query("UPDATE {book} SET book_id = %d WHERE mlid IN (". implode(',', $mlids) .")", $link['book_id']); } - return $nodes; } /** - * Given a node, this function returns an array of 'book node' objects - * representing the path in the book tree from the given node down to - * the last sibling of it. - * - * @param $node - * A book node object where the path starts. + * Get the book menu tree for a page, and return it as a linear array. * + * @param $book_link + * A menu link that is part of the book hierarchy. * @return - * An array of book node objects representing the path nodes from the - * given node. Returns an empty array if the node does not exist or - * is not part of a book hierarchy or there are no siblings. - */ -function book_location_down($node, $nodes = array()) { - $last_direct_child = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND b.parent = %d ORDER BY b.weight DESC, n.title DESC'), $node->nid)); - if ($last_direct_child) { - $nodes[] = $last_direct_child; - $nodes = book_location_down($last_direct_child, $nodes); + * A linear array of menu links in the order that the links are shown in the + * menu, so the previous and next pages are the elements before and after the + * element corresponding to $node. The children of $node (if any) will come + * immediately after it in the array. + */ +function book_get_flat_menu($book_link) { + static $flat = array(); + + if (!isset($flat[$book_link['mlid']])) { + $tree = menu_tree_all_data($book_link['menu_name'], $book_link); + $flat[$book_link['mlid']] = array(); + _book_flatten_menu($tree, $flat[$book_link['mlid']]); + } + return $flat[$book_link['mlid']]; +} + +function _book_flatten_menu($tree, &$flat) { + foreach ($tree as $data) { + if (!$data['link']['hidden']) { + $flat[$data['link']['mlid']] = $data['link']; + if ($data['below']) { + _book_flatten_menu($data['below'], $flat); + } + } } - return $nodes; } /** - * Fetches the node object of the previous page of the book. + * Fetches the menu link for the previous page of the book. */ -function book_prev($node) { - // If the parent is zero, we are at the start of a book so there is no previous. - if ($node->parent == 0) { +function book_prev($book_link) { + // If the parent is zero, we are at the start of a book. + if ($book_link['plid'] == 0) { return NULL; } - - // Previous on the same level: - $direct_above = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 AND (b.weight < %d OR (b.weight = %d AND n.title < '%s')) ORDER BY b.weight DESC, n.title DESC"), $node->parent, $node->weight, $node->weight, $node->title)); - if ($direct_above) { - // Get last leaf of $above. - $path = book_location_down($direct_above); - - return $path ? (count($path) > 0 ? array_pop($path) : NULL) : $direct_above; - } - else { - // Direct parent: - $prev = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d AND n.status = 1'), $node->parent)); + $flat = book_get_flat_menu($book_link); + $curr = NULL; + do { + $prev = $curr; + list($key, $curr) = each($flat); + } while ($key && $key != $book_link['mlid']); + if ($key == $book_link['mlid']) { return $prev; } } /** - * Fetches the node object of the next page of the book. + * Fetches the menu link for the next page of the book. */ -function book_next($node) { - // get first direct child - $child = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 ORDER BY b.weight ASC, n.title ASC'), $node->nid)); - if ($child) { - return $child; +function book_next($book_link) { + $flat = book_get_flat_menu($book_link); + do { + list($key, $curr) = each($flat); + } while ($key && $key != $book_link['mlid']); + if ($key == $book_link['mlid']) { + return current($flat); } +} - // No direct child: get next for this level or any parent in this book. - $path = book_location($node); // Path to top-level node including this one. - $path[] = $node; +/** + * Format the menu links for the child pages of the current page. + */ +function book_children($book_link) { + $flat = book_get_flat_menu($book_link); + + $children = array(); - while (($leaf = array_pop($path)) && count($path)) { - $next = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 AND (b.weight > %d OR (b.weight = %d AND n.title > '%s')) ORDER BY b.weight ASC, n.title ASC"), $leaf->parent, $leaf->weight, $leaf->weight, $leaf->title)); - if ($next) { - return $next; + if ($book_link['has_children']) { + // Walk through the array until we find the current page. + do { + $link = array_shift($flat); + } while ($link && ($link['mlid'] != $book_link['mlid'])); + // Continue though the array and collect the links whose parent is this page. + while (($link = array_shift($flat)) && $link['plid'] == $book_link['mlid']) { + $data['link'] = $link; + $data['below'] = ''; + $children[] = $data; } } + return $children ? menu_tree_output($children) : ''; +} + +/** + * Generate the corresponding menu name from a book ID. + */ +function book_menu_name($book_id) { + return 'book-toc-'. $book_id; } /** - * Returns the content of a given node. If $teaser if TRUE, returns - * the teaser rather than full content. Displays the most recently - * approved revision of a node (if any) unless we have to display this - * page in the context of the moderation queue. + * Build an active trail to show in the breadcrumb. */ -function book_content($node, $teaser = FALSE) { - // Return the page body. - return node_prepare($node, $teaser); +function book_build_active_trail($book_link) { + static $trail; + + if (!isset($trail)) { + $trail = array(); + $trail[] = array('title' => t('Home'), 'href' => ''. t('There are no orphan pages.') .'
'); - } - $form['#submit'][] = 'book_admin_edit_submit'; - $form['#validate'][] = 'book_admin_edit_validate'; - $form['#theme'] = 'book_admin_edit'; - return $form; -} - function book_admin_edit_submit($form, &$form_state) { foreach ($form_state['values']['table'] as $row) { $node = node_load($row['nid']); - if ($row['title'] != $node->title || $row['weight'] != $node->weight) { + if ($row['title'] != $node->title || $row['weight'] != $node->book['weight']) { $node->title = $row['title']; - $node->weight = $row['weight']; + $node->book['link_title'] = $row['title']; + $node->book['weight'] = $row['weight']; + $node->revision = 1; node_save($node); watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); } } - if (is_numeric(arg(3))) { - // Updating pages in a single book. - $book = node_load(arg(3)); - drupal_set_message(t('Updated book %title.', array('%title' => $book->title))); - } - else { - // Updating the orphan pages. - drupal_set_message(t('Updated orphan book pages.')); - } -} - -/** - * Menu callback; displays the book administration page. - */ -function book_admin($nid = 0) { - if ($nid) { - return drupal_get_form('book_admin_edit', $nid); - } - else { - return book_admin_overview(); - } + drupal_set_message(t('Updated book %title.', array('%title' => $form['#node']->title))); } /** * Returns an administrative overview of all books. */ function book_admin_overview() { - $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = 0 ORDER BY b.weight, n.title')); + $result = db_query(db_rewrite_sql("SELECT n.title, b.* FROM {book} b INNER JOIN {node} n ON n.nid = b.nid WHERE b.nid = b.book_id ORDER BY n.title")); $rows = array(); while ($book = db_fetch_object($result)) { - $rows[] = array(l($book->title, "node/$book->nid"), l(t('outline'), "admin/content/book/$book->nid")); + $rows[] = array(l($book->title, "node/$book->nid"), l(t('edit order and titles'), "admin/content/book/$book->nid")); } $headers = array(t('Book'), t('Operations')); @@ -1008,3 +1171,65 @@ function book_help($section) { return ''. t('The outline feature allows you to include posts in the book hierarchy.', array('@book' => url('book'))) .'
'; } } + +/** + * Like menu_link_load(), but get extra data from the {book} table. + * + * Do not call when loading a node, since this function may call node_load(). + */ +function book_link_load($mlid) { + if ($item = db_fetch_array(db_query("SELECT * FROM {menu_links} ml INNER JOIN {book} b ON b.mlid = ml.mlid LEFT JOIN {menu_router} m ON m.path = ml.router_path WHERE ml.mlid = %d", $mlid))) { + _menu_link_translate($item); + return $item; + } + return FALSE; +} + +/** + * Get the data structure representing a subtree. the root item will be the + * link passed as a parameter, and the returned data will contain all the + * links that are below it in the menu tree.. + * + * @param $menu_name + * The named menu links to return + * @param $item + * A fully loaded menu link, + * @return + * An subtree of menu links in an array, in the order they should be rendered. + */ +function book_menu_subtree_data($item) { + static $tree = array(); + + $mlid = $item['mlid']; + $menu_name = $item['menu_name']; + $cid = 'links:'. $menu_name .':subtree:'. $mlid; + + if (!isset($tree[$cid])) { + $cache = cache_get($cid, 'cache_menu'); + if ($cache && isset($cache->data)) { + $tree[$cid] = $cache->data; + } + else { + $i = 1; + $match = array(); + while ($i <= MENU_MAX_DEPTH && $item["p$i"]) { + $match[] = "p$i = %d"; + $args[] = $item["p$i"]; + $i++; + } + $sql = " + SELECT b.*, m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options + FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path + INNER JOIN {book} b ON ml.mlid = b.mlid + WHERE ". implode(' AND ', $match) ." + ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC"; + + list(, $tree[$cid]) = _menu_tree_data(db_query($sql, $args), array(), $item['depth']); + cache_set($cid, $tree[$cid], 'cache_menu'); + } + _menu_tree_check_access($tree[$cid]); + } + + return $tree[$cid]; +} + === modified file 'modules/book/book.schema' --- modules/book/book.schema 2007-05-25 15:26:33 +0000 +++ modules/book/book.schema 2007-06-20 04:47:39 +0000 @@ -4,16 +4,15 @@ function book_schema() { $schema['book'] = array( 'fields' => array( - 'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), - 'parent' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), - 'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny') + 'mlid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + 'book_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), ), 'indexes' => array( 'nid' => array('nid'), - 'parent' => array('parent') + 'book_id' => array('book_id') ), - 'primary key' => array('vid'), + 'primary key' => array('mlid'), ); return $schema;