? 2-21-to-patched-dev.patch ? node_export-766930.patch Index: node_export.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/node_export/Attic/node_export.drush.inc,v retrieving revision 1.1.2.10 diff -u -r1.1.2.10 node_export.drush.inc --- node_export.drush.inc 6 May 2010 04:06:24 -0000 1.1.2.10 +++ node_export.drush.inc 15 Sep 2010 19:23:22 -0000 @@ -13,132 +13,57 @@ $items = array(); $items['node-export-export'] = array( - 'callback' => 'node_export_drush_callback_export', - 'description' => "Export nodes by Node ID.", + 'callback' => 'drush_node_export_export', + 'description' => "Export nodes to code.", 'arguments' => array( - 'nids' => "A list of space-separated node IDs to export.", + 'nids' => 'Optional list of IDs of nodes to export. If not provided all nodes matching the filtering options will be exported.', ), 'options' => array( - '--file' => "The filename of the output file. If supplied, the node code will be exported to that file, otherwise it will export to stdout.", + '--file' => 'Path to the output file. If not supplied, exported code will be printed to stdout.', ), 'examples' => array( - 'drush node-export 45 46 47 --file=filename' => - "Export nodes with node IDs 45, 46, and 47 to the file with the supplied filename.", - //'drush node-export 45 46 47 > filename' => - // "Export nodes with node IDs 45, 46, and 47 to the file with the supplied filename. NOTE: Error messages may be output to the file.", + 'drush ne-export 45 46 47' => 'Export nodes 45, 46, and 47 to stdout.', + 'drush ne-export --status=published --type="page,story" --file=filename.txt' => 'Export published nodes of type page and story to filename.txt' ), + 'aliases' => array('ne-export'), ); + drush_bootstrap_max(); + if (drush_get_context('DRUSH_BOOTSTRAP_PHASE') >= DRUSH_BOOTSTRAP_DRUPAL_FULL) { + module_load_include('inc', 'node', 'node.admin'); + $choices = array(); + foreach (node_filters() as $filter => $data) { + foreach ($data['options'] as $key => $value) { + $choices[] = "$key ($value)"; + } + $items['node-export-export']['options']['--'.$filter] = dt('Filter nodes by !option. Choices are: !choices.', array('!option' => $filter, '!choices' => implode(', ', $choices))); + } + } + $items['node-export-import'] = array( - 'callback' => 'node_export_drush_callback_import', 'description' => "Import nodes from a previous export.", 'options' => array( - '--uid' => "User ID of user to save nodes as. If not given will use the user with an ID of 1. You may specify 0 for the Anonymous user.", - '--file' => "The filename of the input file. If supplied, the node code will be imported from that file, otherwise it will import to stdin.", - ), - 'examples' => array( - 'drush node-export-import --file=filename' => - 'Import nodes from the file with the given filename.', - 'drush node-export-import --uid=2 --file=filename' => - "Import nodes from the file with the given filename. The author of the nodes will be set to the user that has the user ID of 2.", - //'drush node-export-import < filename' => - // 'Import nodes from the file with the given filename.', - ), - ); - $items['node-export-type'] = array( - 'callback' => 'node_export_drush_callback_export_type', - 'description' => "Export all nodes of the given node type.", - 'arguments' => array( - 'type' => "The node type to export.", - ), - 'options' => array( - '--file' => "The filename of the output file. If supplied, the node code will be exported to that file, otherwise it will export to stdout.", + '--uid' => "User ID to save nodes with. If not supplied uid 1 will be used. You may specify 0 for the Anonymous user.", + '--file' => "Path to the input file. If not supplied, it will read from stdin.", ), 'examples' => array( - 'drush node-export-type story --file=filename' => - "Export all nodes of type 'story' to the file with supplied filename.", - //'drush node-export-type story > filename' => - // "Export all nodes of type 'story' to the file with supplied filename. NOTE: Error messages may be output to the file.", + 'drush ne-import --file=filename.txt' => 'Import nodes from filename.txt.', + 'drush ne-import --uid=2' => 'Import nodes from stdin. Nodes will be saved with uid 2.', ), + 'aliases' => array('ne-import'), ); - // Add aliases for usability. - node_export_drush_command_add_alias($items, 'node-export-export', 'node-export'); - node_export_drush_command_add_alias($items, 'node-export-export', 'ne-export'); - node_export_drush_command_add_alias($items, 'node-export-import', 'ne-import'); - return $items; } /** - * A function to help alias commands as other commands. - */ -function node_export_drush_command_add_alias(&$items, $command, $alias) { - // Create a property on the command for adding aliases, if not there. - if (!isset($items[$command]['node_export command aliases'])) { - $items[$command]['node_export command aliases'] = array(); - } - // Record the alias into that property. - $items[$command]['node_export command aliases'][] = $alias; - // Create the alias as a new command. - $items[$alias] = $items[$command]; - // Indicate what this new command is an alias for. - $items[$alias]['node_export alias for'] = $command; -} - -/** * Implementation of hook_drush_help(). - * - * This function is called whenever a drush user calls - * 'drush help ' - * - * @param - * A string with the help section (prepend with 'drush:') - * - * @return - * A string with the help text for your command. */ function node_export_drush_help($section) { - // This is to prevent duplication of information from hook_drush_command(). - $commands = node_export_drush_command(); - foreach ($commands as $command => $command_info) { - if ($section == 'drush:'. $command) { - $out = $command_info['description']; - if (isset($command_info['node_export alias for'])) { - $output .= "\nThis command is an alias for "; - $output .= $command_info['node_export alias for'] ."."; - } - if (isset($command_info['node_export command aliases'])) { - if (count($command_info['node_export command aliases']) == 1) { - $output .= "\nThis command can be called by it's alias; "; - $output .= $command_info['node_export command aliases'] ."."; - } - else { - $last_alias = array_pop($command_info['node_export command aliases']); - $output .= "\nThis command can be called by it's aliases; " - $output .= implode(", ", $command_info['node_export command aliases']); - $output .= ", or ". $last_alias ."."; - } - } - $out .= "\n\nArguments:"; - if (isset($command_info['arguments'])) { - foreach ($command_info['arguments'] as $k => $v) { - $out .= "\n ". $k ." : ". $v; - } - } - $out .= "\n\nOptions:"; - if (isset($command_info['options'])) { - foreach ($command_info['options'] as $k => $v) { - $out .= "\n ". $k ." : ". $v; - } - } - $out .= "\n\nExamples:"; - if (isset($command_info['examples'])) { - foreach ($command_info['examples'] as $k => $v) { - $out .= "\n \'". $k ."\' : ". $v; - } - } - return dt($out); - } + switch ($section) { + case 'drush:node-export-export': + return dt('Export nodes to code. You can select what nodes to export by several criteria.'); + case 'drush:node-export-import': + return dt('Import nodes from a previous export.'); } } @@ -147,20 +72,44 @@ * * Export nodes. */ -function node_export_drush_callback_export() { - $commands = func_get_args(); - - $nids = array_filter($commands, 'is_numeric'); - +function drush_node_export_export() { + $nids = func_get_args(); + + // If nids are not provided, use the filters. Ignore otherwise. + if (!count($nids)) { + module_load_include('inc', 'node', 'node.admin'); + $_SESSION['node_overview_filter'] = array(); + foreach (node_filters() as $filter => $data) { + $value = drush_get_option($filter); + if (!is_null($value)) { + $_SESSION['node_overview_filter'][] = array($filter, $value); + } + } + if (empty($_SESSION['node_overview_filter'])) { + if (!drush_confirm(dt('Do you want to export all nodes?'))) { + return drush_log(dt('Aborting.')); + } + $query = array('where' => '', 'join' => '', 'args' => array()); + } + else { + $query = node_build_filter_query(); + } + $rsc = db_query('SELECT nid FROM {node} n '.$query['join'].' '.$query['where'], $query['args']); + if ($rsc === FALSE) { + return drush_log(dt('Aborting.')); + } + while ($nid = db_result($rsc)) { + $nids[] = $nid; + } + } + $data = node_export_node_bulk($nids, TRUE); - $filename = drush_get_option('file'); - if ($filename) { // Output data to file. Note this only takes a flat filename for the current directory. // If file exists, ask for whether to overwrite. if (file_exists($filename)) { - if (!drush_confirm(dt("File $filename exists. Do you really want to overwrite?"))) { + if (!drush_confirm(dt('File !filename exists. Do you really want to overwrite?', array('!filename' => $filename)))) { return; } } @@ -178,7 +127,7 @@ * * Import nodes from data. */ -function node_export_drush_callback_import() { +function drush_node_export_import() { $commands = func_get_args(); // Switch to admin or the specified user so imported nodes are not anonymous. @@ -209,32 +158,4 @@ drush_set_error('DRUSH_NOT_COMPLETED', "A problem was found with the import data. Check that the node types and all the required modules exist."); } } - } - -/** - * Drush command callback. - * - * Export nodes of the provided type. -*/ -function node_export_drush_callback_export_type($type) { - if ($type == NULL) { - drush_set_error('DRUSH_NOT_COMPLETED', "Please supply the node type."); - } - - $nids = array(); - $sql = "SELECT nid FROM {node} WHERE type = '%s'"; - $rs = db_query($sql, $type); - - while ($row = db_fetch_array($rs)) { - $nids[] = $row['nid']; - } - - if (!empty($nids)) { - call_user_func_array('node_export_drush_callback_export', $nids); - } - else { - drush_set_error('DRUSH_NOT_COMPLETED', "No nodes found of type '$type'."); - } -} -