svn commit - mysqldoc@docsrva: r7765 - in trunk: . refman-4.1 refman-5.0 refman-5.1 tools

[paul]

Author: paul
Date: 2007-09-08 15:36:11 +0200 (Sat, 08 Sep 2007)
New Revision: 7765

Log:
 r30037@qbert:  paul | 2007-09-08 08:33:01 -0500
 If multiple mappings for a name occur, display all the names that it maps to.
 Fix multiple mappings discovered by this.


Modified:
   trunk/refman-4.1/renamed-nodes.txt
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.1/renamed-nodes.txt
   trunk/tools/map-expired-nodes.pl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29982
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24718
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30037
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24718
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005


Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2007-09-08 10:07:17 UTC (rev 7764)
+++ trunk/refman-4.1/renamed-nodes.txt	2007-09-08 13:36:11 UTC (rev 7765)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 537 bytes

@@ -238,7 +238,6 @@
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
 odbc myodbc-connector
-odbc myodbc-introduction
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
 odbc-net-op-c-sharp-cp myodbc-examples-programming


Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2007-09-08 10:07:17 UTC (rev 7764)
+++ trunk/refman-5.0/renamed-nodes.txt	2007-09-08 13:36:11 UTC (rev 7765)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 3; 1010 bytes

@@ -543,13 +543,12 @@
 nutshell-4-1-features ../../4.1/en/nutshell-4-1-features
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
-odbc myodbc-introduction
+odbc myodbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
 odbc-net-op-c-sharp-cp myodbc-examples-programming
 odbc-net-op-vb-cp  myodbc-examples-programming
 odbc-problems myodbc-support-bug-report
-open-bsd-2-8 ../../4.1/en/open-bsd-2-8
 open-bsd-2-8 operating-system-specific-notes
 open-tables table-cache
 optimisation table-optimization

@@ -604,7 +603,6 @@
 tips miscellaneous-optimization-tips
 todo roadmap
 todo-future roadmap
-todo-mysql-5-0 mysql-nutshell
 todo-mysql-5-0 roadmap
 todo-mysql-5-1 roadmap
 todo-sometime roadmap


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2007-09-08 10:07:17 UTC (rev 7764)
+++ trunk/refman-5.1/renamed-nodes.txt	2007-09-08 13:36:11 UTC (rev 7765)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 568 bytes

@@ -289,7 +289,7 @@
 nt-start windows-start-service
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
-odbc myodbc-introduction
+odbc myodbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
 odbc-net-op-c-sharp-cp myodbc-examples-programming


Modified: trunk/tools/map-expired-nodes.pl
===================================================================
--- trunk/tools/map-expired-nodes.pl	2007-09-08 10:07:17 UTC (rev 7764)
+++ trunk/tools/map-expired-nodes.pl	2007-09-08 13:36:11 UTC (rev 7765)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 7; 1380 bytes

@@ -160,8 +160,8 @@
 
 # Malformed input lines
 my @malformed;
-# Record old_name values for duplicate detection
-my %old_name;
+# Record all new_name values that old_name maps to
+my %mapping;
 # Illegal old_name values
 my %illegal_old_name;
 # Illegal new_name values

@@ -198,7 +198,9 @@
   my $new_name = $f[1];
   my $url;
 
-  ++$old_name{$old_name};
+  # Save the new_name that old_name maps to
+  $mapping{$old_name} = [] unless exists $mapping{$old_name};
+  push (@{$mapping{$old_name}}, $new_name);
 
   if ($old_name eq $new_name)
   {

@@ -318,15 +320,19 @@
 }
 $errors += scalar (@malformed);
 
-$caption = "Duplicate old-name values";
-foreach my $name (sort (keys (%old_name)))
+$caption = "old-name values that have multiple mappings";
+foreach my $name (sort (keys (%mapping)))
 {
-  my $count = $old_name{$name};
+  my $count = scalar (@{$mapping{$name}});
   if ($count > 1)
   {
     warn "ERROR: $caption:\n" if $caption;
     $caption = "";
-    warn "  $name ($count instances)\n";
+    warn "  $name ($count mappings)\n";
+    foreach my $name2 (sort (@{$mapping{$name}}))
+    {
+      print "    => $name2\n";
+    }
     $errors += $count;
   }
 }