Remove call to gnutls_global_init. tcpip_init already does it

[yaz-moved-to-github.git] / src / oidtoc.tcl

diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl
index 17469e3..2e72d03 100644 (file)
--- 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.2 2007-04-18 08:08:02 adam Exp $
 #
 # Converts a CSV file with Object identifiers to C
 
@@ -34,8 +33,70 @@ proc readoids {input} {
     return $oids
 }
 
+proc constant_var {oid} {
+    set lname [string tolower [lindex $oid 2]]
+    set lname [string map {- _ . _ { } _ ( {} ) {}} $lname]
+    set prefix [string tolower [lindex $oid 0]]
+       
+    return yaz_oid_${prefix}_${lname}
+}
+
+proc oid_to_xml {srcdir input xname} {
+    set oids [readoids "${input}"]
+    set xfile [open "${xname}" w]
+
+    puts $xfile "<!-- Generated by oidtoc.tcl from $input -->"
+    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*" colname="oid"></colspec>}
+    puts $xfile {<thead>}
+    puts $xfile {<row>}
+    puts $xfile {<entry>Name</entry>}
+    puts $xfile {<entry>Class</entry>}
+    puts $xfile {<entry>Constant / OID</entry>}
+    puts $xfile {</row>}
+    puts $xfile {</thead>}
+    puts $xfile {<tbody>}
+
+    foreach oid $oids {
+       puts $xfile {<row>}
+
+       puts $xfile {<entry morerows="1">}
+       puts $xfile [lindex $oid 2]
+       puts $xfile {</entry>}
+
+
+       puts $xfile {<entry morerows="1">}
+       puts $xfile [lindex $oid 0]
+       puts $xfile {</entry>}
+
+       puts $xfile {<entry><literal>}
+       set v [constant_var $oid]
+       puts $xfile $v
+       puts $xfile {</literal></entry>}
+
+
+       puts $xfile {</row>}
+       puts $xfile {<row>}
+
+       puts $xfile {<entry namest="oid">}
+       puts $xfile [lindex $oid 1]
+       puts $xfile {</entry>}
+
+       puts $xfile {</row>}
+    }
+
+    puts $xfile {</tbody>}
+    puts $xfile {</tgroup>}
+
+    puts $xfile {</informaltable>}
+    close $xfile
+}
+
 proc oid_to_c {srcdir input cname hname} {
-    set oids [readoids "${srcdir}/${input}"]
+    set oids [readoids "${input}"]
 
     set cfile [open "${srcdir}/${cname}" w]
     set hfile [open "${srcdir}/../include/yaz/${hname}" w]
@@ -45,31 +106,41 @@ proc oid_to_c {srcdir input cname hname} {
     set preamble "    \\brief Standard Object Identifiers: Generated from $input */"
     puts $cfile $preamble
     puts $hfile $preamble
+    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
+    puts $hfile "\#ifdef YAZ_DLL"
+    puts $hfile "\#define OID_EXPORT YAZ_EXPORT"
+    puts $hfile "\#else"
+    puts $hfile "\#define OID_EXPORT YAZ_IMPORT"
+    puts $hfile "\#endif"
+
+    puts $hfile "YAZ_BEGIN_CDECL"
     foreach oid $oids {
-       set lname [string tolower [lindex $oid 2]]
-       set lname [string map {- _ . _ { } _ ( {} ) {}} $lname]
-       set prefix [string tolower [lindex $oid 0]]
+
+       set v [constant_var $oid]
        
-       puts -nonewline $cfile "const int yaz_oid_${prefix}_${lname}\[\] = \{"
+       puts -nonewline $cfile "YAZ_EXPORT const Odr_oid $v\[\] = \{"
        puts -nonewline $cfile [string map {. ,} [lindex $oid 1]]
        puts $cfile ",-1\};"
 
-       puts $hfile "extern const int yaz_oid_${prefix}_${lname}\[\];"
+       puts $hfile "OID_EXPORT extern const Odr_oid $v\[\];"
     }
 
-    puts $cfile "struct yaz_oid_entry yaz_oid_standard_entries\[\] ="
+    puts $cfile "YAZ_EXPORT struct yaz_oid_entry yaz_oid_standard_entries\[\] ="
     puts $cfile "\{"
     foreach oid $oids {
-       set lname [string tolower [lindex $oid 2]]
-       set lname [string map {- _ . _ { } _ ( {} ) {}} $lname]
-       set prefix [string tolower [lindex $oid 0]]
+       set v [constant_var $oid]
        
        puts -nonewline $cfile "\t\{CLASS_[lindex $oid 0], "
-       puts -nonewline $cfile "yaz_oid_${prefix}_${lname}, "
+       puts -nonewline $cfile "$v, "
        puts -nonewline $cfile \"[lindex $oid 2]\"
        puts $cfile "\},"
     }
@@ -77,13 +148,18 @@ proc oid_to_c {srcdir input cname hname} {
     puts $cfile "\t\{CLASS_NOP, 0, 0\}"
     puts $cfile "\};"
 
-    puts $hfile "extern struct yaz_oid_entry yaz_oid_standard_entries\[\];"
+    puts $hfile "OID_EXPORT extern struct yaz_oid_entry yaz_oid_standard_entries\[\];"
+    puts $hfile "YAZ_END_CDECL"
+    puts $hfile "\#endif"
     close $cfile
     close $hfile
 }
 
-if {[llength $argv] != 4} {
+if {[llength $argv] == 4} {
+    oid_to_c [lindex $argv 0] [lindex $argv 1] [lindex $argv 2] [lindex $argv 3]
+} elseif {[llength $argv] == 3} {
+    oid_to_xml [lindex $argv 0] [lindex $argv 1] [lindex $argv 2]
+} else {
     puts "oidtoc.tcl srcdir csv cfile hfile"
     exit 1
 }
-oid_to_c [lindex $argv 0] [lindex $argv 1] [lindex $argv 2] [lindex $argv 3]