X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foidtoc.tcl;h=fd35d0f9d602f37ac4e8d55dce8d67487519ae58;hp=265132887a7afc08d598a17649ea381eeee34d62;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=fe507b6b15788a3a8e58063d9dae52532a5229a5

diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl
index 2651328..fd35d0f 100644
--- a/src/oidtoc.tcl
+++ b/src/oidtoc.tcl
@@ -2,7 +2,6 @@
 # Copyright (c) Index Data 2006-2007
 # See the file LICENSE for details.
 #
-# $Id: oidtoc.tcl,v 1.4 2007-05-06 20:12:20 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]
@@ -48,8 +109,10 @@ proc oid_to_c {srcdir input cname hname} {
     puts $hfile "\#ifndef OID_STD_H"
     puts $hfile "\#define OID_STD_H"
 
-    # Define this. So that we don't get duplicate declartions with MSVC
-    puts $cfile "\#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
@@ -61,26 +124,23 @@ proc oid_to_c {srcdir input cname hname} {
 
     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 "YAZ_EXPORT extern 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 "OID_EXPORT extern const int yaz_oid_${prefix}_${lname}\[\];"
+	puts $hfile "OID_EXPORT extern const Odr_oid $v\[\];"
     }
 
     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 "\},"
     }
@@ -95,8 +155,11 @@ proc oid_to_c {srcdir input cname hname} {
     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]