From c618d4743a6dff2764d4a95d8bcf4fc441fcd8db Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 18 Apr 2007 08:08:02 +0000
Subject: [PATCH] Doxygen comments in OID generated files.

---
 src/Makefile.am |    4 ++--
 src/oid_db.c    |    3 ++-
 src/oidtoc.tcl  |   23 +++++++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e63b368..b9ec18b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.62 2007-04-18 07:34:35 adam Exp $
+## $Id: Makefile.am,v 1.63 2007-04-18 08:08:02 adam Exp $
 
 YAZ_VERSION_INFO=3:0:0
 
@@ -42,7 +42,7 @@ marc8r.c: charconv.tcl codetables.xml
 
 # Generate OID database from CSV
 oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
-	$(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir)/oid.csv $(srcdir)/oid_std.c $(top_srcdir)/include/yaz/oid_std.h
+	$(TCLSH) $(srcdir)/oidtoc.tcl $(srcdir) oid.csv oid_std.c oid_std.h
 
 # Generate diagnostics from CSVs
 diagbib1.c $(top_srcdir)/include/yaz/diagbib1.h: csvtobib1.tcl bib1.csv
diff --git a/src/oid_db.c b/src/oid_db.c
index 3795bba..850b2a7 100644
--- a/src/oid_db.c
+++ b/src/oid_db.c
@@ -2,10 +2,11 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: oid_db.c,v 1.5 2007-04-16 21:53:09 adam Exp $
+ * $Id: oid_db.c,v 1.6 2007-04-18 08:08:02 adam Exp $
  */
 
 /**
+ * \file oid_db.c
  * \brief OID Database
  */
 #if HAVE_CONFIG_H
diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl
index 7809f3f..17469e3 100644
--- a/src/oidtoc.tcl
+++ b/src/oidtoc.tcl
@@ -2,7 +2,7 @@
 # Copyright (c) Index Data 2006-2007
 # See the file LICENSE for details.
 #
-# $Id: oidtoc.tcl,v 1.1 2007-04-16 21:53:09 adam Exp $
+# $Id: oidtoc.tcl,v 1.2 2007-04-18 08:08:02 adam Exp $
 #
 # Converts a CSV file with Object identifiers to C
 
@@ -34,11 +34,18 @@ proc readoids {input} {
     return $oids
 }
 
-proc oid_to_c {input cfile hfile} {
-    set oids [readoids $input]
+proc oid_to_c {srcdir input cname hname} {
+    set oids [readoids "${srcdir}/${input}"]
+
+    set cfile [open "${srcdir}/${cname}" w]
+    set hfile [open "${srcdir}/../include/yaz/${hname}" w]
+
+    puts $cfile "/** \\file $cname"
+    puts $hfile "/** \\file $hname"
+    set preamble "    \\brief Standard Object Identifiers: Generated from $input */"
+    puts $cfile $preamble
+    puts $hfile $preamble
 
-    set cfile [open $cfile w]
-    set hfile [open $hfile w]
 
     puts $cfile "\#include <yaz/oid_db.h>"
     puts $cfile ""
@@ -75,8 +82,8 @@ proc oid_to_c {input cfile hfile} {
     close $hfile
 }
 
-if {[llength $argv] != 3} {
-    puts "oidtoc.tcl csv cfile hfile"
+if {[llength $argv] != 4} {
+    puts "oidtoc.tcl srcdir csv cfile hfile"
     exit 1
 }
-oid_to_c [lindex $argv 0] [lindex $argv 1] [lindex $argv 2]
\ No newline at end of file
+oid_to_c [lindex $argv 0] [lindex $argv 1] [lindex $argv 2] [lindex $argv 3]
-- 
1.7.10.4