X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foidtoc.tcl;h=2e72d033a177d3b305b68bdd9f7d599f708f196a;hp=2cbe66e750deb8390286a5d8cb7ee5947b83f86a;hb=e33389ee14d909d3a1b9874a40aa1b53c3fe42be;hpb=7a98e9bfbb9d5fe7d44822a9838e3becbdce9363

diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl
index 2cbe66e..2e72d03 100644
--- a/src/oidtoc.tcl
+++ b/src/oidtoc.tcl
@@ -1,8 +1,7 @@
 # This file is part of the YAZ toolkit
-# Copyright (c) Index Data 2006-2007
+# Copyright (C) Index Data
 # See the file LICENSE for details.
 #
-# $Id: oidtoc.tcl,v 1.7 2007-05-08 08:22:36 adam Exp $
 #
 # Converts a CSV file with Object identifiers to C
 
@@ -47,19 +46,16 @@ proc oid_to_xml {srcdir input xname} {
     set xfile [open "${xname}" w]
 
     puts $xfile "<!-- Generated by oidtoc.tcl from $input -->"
-    puts $xfile {<table id="standard-oids">}
-    puts $xfile {<title>Standard Object Identifiers</title>}
-    puts $xfile {<tgroup cols="4">}
+    puts $xfile {<informaltable id="standard-oids">}
+    puts $xfile {<tgroup cols="3">}
     puts $xfile {<colspec colwidth="3*" colname="name"></colspec>}
     puts $xfile {<colspec colwidth="2*" colname="class"></colspec>}
-    puts $xfile {<colspec colwidth="4*" colspec="constant"></colspec>}
-    puts $xfile {<colspec colwidth="5*" colname="oid"></colspec>}
+    puts $xfile {<colspec colwidth="4*" colname="oid"></colspec>}
     puts $xfile {<thead>}
     puts $xfile {<row>}
     puts $xfile {<entry>Name</entry>}
     puts $xfile {<entry>Class</entry>}
-    puts $xfile {<entry>Constant</entry>}
-    puts $xfile {<entry>OID</entry>}
+    puts $xfile {<entry>Constant / OID</entry>}
     puts $xfile {</row>}
     puts $xfile {</thead>}
     puts $xfile {<tbody>}
@@ -67,12 +63,12 @@ proc oid_to_xml {srcdir input xname} {
     foreach oid $oids {
 	puts $xfile {<row>}
 
-	puts $xfile {<entry>}
+	puts $xfile {<entry morerows="1">}
 	puts $xfile [lindex $oid 2]
 	puts $xfile {</entry>}
 
 
-	puts $xfile {<entry>}
+	puts $xfile {<entry morerows="1">}
 	puts $xfile [lindex $oid 0]
 	puts $xfile {</entry>}
 
@@ -81,7 +77,11 @@ proc oid_to_xml {srcdir input xname} {
 	puts $xfile $v
 	puts $xfile {</literal></entry>}
 
-	puts $xfile {<entry>}
+
+	puts $xfile {</row>}
+	puts $xfile {<row>}
+
+	puts $xfile {<entry namest="oid">}
 	puts $xfile [lindex $oid 1]
 	puts $xfile {</entry>}
 
@@ -91,7 +91,7 @@ proc oid_to_xml {srcdir input xname} {
     puts $xfile {</tbody>}
     puts $xfile {</tgroup>}
 
-    puts $xfile {</table>}
+    puts $xfile {</informaltable>}
     close $xfile
 }
 
@@ -109,6 +109,10 @@ proc oid_to_c {srcdir input cname hname} {
     puts $hfile "\#ifndef OID_STD_H"
     puts $hfile "\#define OID_STD_H"
 
+    puts $cfile "\#if HAVE_CONFIG_H"
+    puts $cfile "\#include <config.h>"
+    puts $cfile "\#endif"
+
     puts $cfile "\#include <yaz/oid_db.h>"
     puts $cfile ""
     # To avoid LNK4049