Index: taxonomy_xml.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_xml/taxonomy_xml.module,v
retrieving revision 1.7.2.2
diff -u -r1.7.2.2 taxonomy_xml.module
--- taxonomy_xml.module	18 Dec 2007 03:13:06 -0000	1.7.2.2
+++ taxonomy_xml.module	4 Mar 2008 01:41:12 -0000
@@ -21,8 +21,8 @@
 /**
  * Implementation of hook_help().
  */
-function taxonomy_xml_help($section) {
-  switch ($section) {
+function taxonomy_xml_help($path, $args) {
+  switch ($path) {
     case 'admin/modules#description':
       return t('Makes it possible to import and export taxonomy terms via XML.');
     case 'admin/content/taxonomy/import':
@@ -35,7 +35,8 @@
     case 'admin/help#taxonomy_xml':
       return t("This module makes it possible to import and export vocabularies and taxonomy terms via XML (requires taxonomy.module). ".
                "Once installed and enabled, it module provides a list of downloadable XML documents for each vocabulary at !downloads. To import a vocabulary, use !upload.",
-        array('!downloads' => l(t("taxonomy XML"), "admin/taxonomy/export"), '!upload' => l("administer » categories » import", "admin/taxonomy/import", array(), NULL, NULL, FALSE, TRUE)));
+        array('!downloads' => l(t("taxonomy XML"), "admin/taxonomy/export"),
+          '!upload' => l("administer » categories » import", "admin/taxonomy/import", array('html' => true))));
   }
 }
 
@@ -44,27 +45,22 @@
  * 
  * @note See hook_menu for a description of parameters and return values.
  */
-function taxonomy_xml_menu($may_cache) {
-  if (!module_exists('taxonomy')) {
-    return;
-  }
+function taxonomy_xml_menu() {
   $items = array();
-  if ($may_cache) {
-    $items[] = array('path' => 'admin/content/taxonomy/export',
-      'title' => t('Export'),
-      'access' => user_access('administer taxonomy'),
-      'callback' => 'taxonomy_xml_export',
-      'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/content/taxonomy/import',
-      'title' => t('Import'),
-      'access' => user_access('administer taxonomy'),
-      'callback' => 'taxonomy_xml_import',
-      'type' => MENU_LOCAL_TASK);
-  }
-  $items[] = array('path' => 'taxonomy_xml',
-    'title' => t('Taxonomy XML'),
-    'callback' => 'taxonomy_xml_file',
-    'access' => true,
+  $items['admin/content/taxonomy/export'] = array(
+    'title' => 'Export',
+    'access arguments' => array('administer taxonomy'),
+    'page callback' => 'taxonomy_xml_export',
+    'type' => MENU_LOCAL_TASK);
+  $items['admin/content/taxonomy/import'] = array(
+    'title' => 'Import',
+    'access arguments' => array('administer taxonomy'),
+    'page callback' => 'taxonomy_xml_import',
+    'type' => MENU_LOCAL_TASK);
+  $items['taxonomy_xml'] = array(
+    'title' => 'Taxonomy XML',
+    'page callback' => 'taxonomy_xml_file',
+    'access arguments' => array('access content'),
     'type' => MENU_CALLBACK);
   return $items;
 }
@@ -131,8 +127,8 @@
 /**
  * Imports the actual XML.
  */
-function taxonomy_xml_import_form_validate($form_id, $form_values) {
-  if ($file = file_check_upload('xml')) {
+function taxonomy_xml_import_form_validate($form, &$form_state) {
+  if ($file = file_save_upload('xml', array())) {
     $fd = fopen($file->filepath, "rb");
     if (!$fd) {
       form_set_error('xml', t('Vocabulary import failed: file %filename cannot be read.', array('%filename' => $file->filename)));
@@ -144,7 +140,7 @@
 
       fclose($fd);
       drupal_set_message(t('Loaded file %filename.', array('%filename' => $file->filename)));
-      taxonomy_xml_parse($text, $form_values['vid'], $form_values['term'], $form_values['duplicate']);
+      taxonomy_xml_parse($text, $form_state['values']['vid'], $form_state['values']['term'], $form_state['values']['duplicate']);
     }
   }
   else {
@@ -216,7 +212,7 @@
   $output .= '<!DOCTYPE taxonomy SYSTEM "taxonomy.dtd">'."\n";
   $tree = module_invoke('taxonomy', 'get_tree', $vid, $parent, $depth, $max_depth);
   if ($tree) {
-    $vocabulary = module_invoke('taxonomy', 'get_vocabulary', $vid);
+    $vocabulary = module_invoke('taxonomy', 'vocabulary_load', $vid);
     $output .= "<vocabulary>\n";
     foreach ($vocabulary as $key => $value) {
       if (is_array($value)) {
@@ -330,7 +326,7 @@
   xml_set_character_data_handler($xml_parser, 'taxonomy_xml_element_data');
 
   if (!xml_parse($xml_parser, $data, 1)) {
-    watchdog('error', t('Taxonomy_xml: failed to parse file: %error at line %line.', array('%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))));
+    watchdog('error', 'Taxonomy_xml: failed to parse file: %error at line %line.', array('%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)));
     drupal_set_message(t('Failed to parse file: %error at line %line.', array('%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');
   }
   xml_parser_free($xml_parser);
Index: taxonomy_xml.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_xml/taxonomy_xml.info,v
retrieving revision 1.1
diff -u -r1.1 taxonomy_xml.info
--- taxonomy_xml.info	3 Jul 2007 07:04:38 -0000	1.1
+++ taxonomy_xml.info	4 Mar 2008 01:33:38 -0000
@@ -1,4 +1,5 @@
 ; $Id: taxonomy_xml.info,v 1.1 2007/07/03 07:04:38 nicolash Exp $
 name = Taxonomy import/export via XML
 description = Makes it possible to import and export taxonomy terms via XML.
-dependencies = taxonomy
\ No newline at end of file
+dependencies[] = taxonomy
+core = 6.x