svn commit - mysqldoc@docsrva: r6380 - in trunk: . tools

[paul]

Author: paul
Date: 2007-05-08 21:25:18 +0200 (Tue, 08 May 2007)
New Revision: 6380

Log:
 r24682@polar:  paul | 2007-05-08 14:22:41 -0500
 Revert earlier change to dynamic-doc script now that we have a
 different way of breaking the idmap <=> dependency circular
 relationship.


Modified:
   trunk/tools/dyndocs-opsfuncs-generate.pl

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


Modified: trunk/tools/dyndocs-opsfuncs-generate.pl
===================================================================
--- trunk/tools/dyndocs-opsfuncs-generate.pl	2007-05-08 19:24:47 UTC (rev 6379)
+++ trunk/tools/dyndocs-opsfuncs-generate.pl	2007-05-08 19:25:18 UTC (rev 6380)
Changed blocks: 3, Lines Added: 18, Lines Deleted: 47; 4455 bytes

@@ -8,30 +8,11 @@
 # mc@stripped
 # 2006-08-29
 
-# 2007-05-07 [PD]
-# - Commented out stuff relating to ID maps to remove circular dependency:
-#   - Generation of dynamic docs first requires ID maps so that links can
-#     be included in dynamic docs content.
-#   - "make idmap" first generates the dynamic docs before generating ID maps
-#     because the dynamic doc files are part of the manual and thus need
-#     to have ID map files created.
-# Two possible ways to break the cycle:
-# - Define IDMAP_SRCS in the Makefile to *exclude* the dynamic docs files
-#   so that "make idmap" won't think it has to create map files for them.
-#   This runs us into some order-of-variable-definition problems.
-# - Assume that if an entry is listed in the functions or operator file
-#   for a given version of the manual, the id for that entry is defined
-#   somewhere in the manual. I judge this acceptable, because if the id
-#   is not present, it should be. This means that every entry in the
-#   function and operator file should have an id value that is present
-#   in the manual, or (if not) an xrefto to override the id with a value
-#   that is present in the manual.
-
 use strict;
-#use lib '../tools';
+use lib '../tools';
 use Getopt::Long;
 use Data::Dumper;
-#use IDMap;
+use IDMap;
 
 my ($opt_version,$opt_class,$opt_genxref,$opt_tabletype) = 
     (undef,undef,undef,undef);

@@ -412,7 +393,7 @@
 {
     my ($td,$idlist,$options) = @_;
 
-#    my $idmap = IDMap->new({sources => [sprintf('../refman-%s',$options->{version})]});
+    my $idmap = IDMap->new({sources => [sprintf('../refman-%s',$options->{version})]});
 
     my $iodest = IO::String->new();
 

@@ -453,31 +434,21 @@
 #        else
 #        {
 
-        # Assume the id is defined elsewhere in the doc. If it is not,
-        # validation will fail. That's a signal to either define the
-        # id in the doc, or add to the bad entry an xrefto attribute
-        # that names an id that exists in the doc.
-
-#        if (exists($idmap->{$td->{$id}->{xrefto}}))
-#        {
-#            print $iodest xml_row(xml_entry(sprintf('<link linkend="%s">%s</link>%s',
-#                                                    $td->{$id}->{xrefto},
-#                                                    join(', ',map { xml_literal(xml_escape($_)) } @{$td->{$id}->{display}}),
-#                                                    $versionstring)),
-#                                  xml_entry($td->{$id}->{description}));
-#        }
-#        else
-#        {
-#            print $iodest xml_row(xml_entry(sprintf('%s%s',
-#                                                    join(', ',map { xml_literal(xml_escape($_)) } @{$td->{$id}->{display}}),
-#                                                    $versionstring)),
-#                                  xml_entry($td->{$id}->{description}));
-#        }
-        print $iodest xml_row(xml_entry(sprintf('<link linkend="%s">%s</link>%s',
-                                                $td->{$id}->{xrefto},
-                                                join(', ',map { xml_literal(xml_escape($_)) } @{$td->{$id}->{display}}),
-                                                $versionstring)),
-                              xml_entry($td->{$id}->{description}));
+        if (exists($idmap->{$td->{$id}->{xrefto}}))
+        {
+            print $iodest xml_row(xml_entry(sprintf('<link linkend="%s">%s</link>%s',
+                                                    $td->{$id}->{xrefto},
+                                                    join(', ',map { xml_literal(xml_escape($_)) } @{$td->{$id}->{display}}),
+                                                    $versionstring)),
+                                  xml_entry($td->{$id}->{description}));
+        }
+        else
+        {
+            print $iodest xml_row(xml_entry(sprintf('%s%s',
+                                                    join(', ',map { xml_literal(xml_escape($_)) } @{$td->{$id}->{display}}),
+                                                    $versionstring)),
+                                  xml_entry($td->{$id}->{description}));
+        }
     }
     print $iodest "</tbody>\n</tgroup>\n</informaltable>\n";
     $iodest->pos(0);