Utility yaz-marcdump got option to display YAZ version (-V)

diff --git a/doc/yaz-marcdump-man.xml b/doc/yaz-marcdump-man.xml
index 8095098..3448628 100644 (file)
--- a/doc/yaz-marcdump-man.xml
+++ b/doc/yaz-marcdump-man.xml
@@ -31,11 +31,13 @@
    <arg choice="opt"><option>-f <replaceable>from</replaceable></option></arg>
    <arg choice="opt"><option>-t <replaceable>to</replaceable></option></arg>
    <arg choice="opt"><option>-l <replaceable>spec</replaceable></option></arg>
    <arg choice="opt"><option>-f <replaceable>from</replaceable></option></arg>
    <arg choice="opt"><option>-t <replaceable>to</replaceable></option></arg>
    <arg choice="opt"><option>-l <replaceable>spec</replaceable></option></arg>

-   <arg choice="opt"><option>-v</option></arg>

    <arg choice="opt"><option>-c <replaceable>cfile</replaceable></option></arg>
    <arg choice="opt"><option>-s <replaceable>prefix</replaceable></option></arg>
    <arg choice="opt"><option>-C <replaceable>size</replaceable></option></arg>
    <arg choice="opt"><option>-c <replaceable>cfile</replaceable></option></arg>
    <arg choice="opt"><option>-s <replaceable>prefix</replaceable></option></arg>
    <arg choice="opt"><option>-C <replaceable>size</replaceable></option></arg>

+   <arg choice="opt"><option>-n</option></arg>

    <arg choice="opt"><option>-p</option></arg>
    <arg choice="opt"><option>-p</option></arg>

+   <arg choice="opt"><option>-v</option></arg>
+   <arg choice="opt"><option>-V</option></arg>

    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

@@ -122,14 +124,6 @@
    </varlistentry>
 
    <varlistentry>
    </varlistentry>
 
    <varlistentry>

-    <term>-v</term>
-    <listitem><para>
-      Writes more information about the parsing process.
-      Useful if you have ill-formatted ISO2709 records as input.
-     </para></listitem>
-   </varlistentry>
-
-   <varlistentry>

     <term>-s <replaceable>prefix</replaceable></term>
     <listitem><para>
       Writes a chunk of records to a separate file with prefix given,
     <term>-s <replaceable>prefix</replaceable></term>
     <listitem><para>
       Writes a chunk of records to a separate file with prefix given,

@@ -155,6 +149,28 @@
      </para></listitem>
    </varlistentry>
 
      </para></listitem>
    </varlistentry>
 

+   <varlistentry>
+    <term>-n</term>
+    <listitem><para>
+      MARC output is omitted so that MARC input is only checkecd.
+     </para></listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term>-v</term>
+    <listitem><para>
+      Writes more information about the parsing process.
+      Useful if you have ill-formatted ISO2709 records as input.
+     </para></listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term>-V</term>
+    <listitem><para>
+      Prints YAZ version.
+     </para></listitem>
+   </varlistentry>
+

   </variablelist>
  </refsect1>
 
   </variablelist>
  </refsect1>
 

diff --git a/util/marcdump.c b/util/marcdump.c
index 2331768..43ff281 100644 (file)
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -58,12 +58,23 @@ static char *prog;
 
 static void usage(const char *prog)
 {
 
 static void usage(const char *prog)
 {

-    fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] "
-             "[-i format] [-o format] "
-             "[-n] [-l pos=value] [-v] [-C chunk] [-s splitfname] [-p] file...\n",
+    fprintf (stderr, "Usage: %s [-i format] [-o format] [-f from] [-t to] "
+             "[-l pos=value] [-c cfile] [-s prefix] [-C size] [-n] "
+             "[-p] [-v] [-V] file...\n",

              prog);
 } 
 
              prog);
 } 
 

+static void show_version(void)
+{
+    char vstr[20], sha1_str[41];
+
+    yaz_version(vstr, sha1_str);
+    printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+    if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+        printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
+    exit(0);
+}
+

 static int getbyte_stream(void *client_data)
 {
     FILE *f = (FILE*) client_data;
 static int getbyte_stream(void *client_data)
 {
     FILE *f = (FILE*) client_data;

@@ -402,7 +413,7 @@ int main (int argc, char **argv)
 #endif
 
     prog = *argv;
 #endif
 
     prog = *argv;

-    while ((r = options("i:o:C:npvc:xOeXIf:t:s:l:", argv, argc, &arg)) != -2)
+    while ((r = options("i:o:C:npc:xOeXIf:t:s:l:Vv", argv, argc, &arg)) != -2)

     {
         no++;
         switch (r)
     {
         no++;
         switch (r)

@@ -499,6 +510,9 @@ int main (int argc, char **argv)
         case 'v':
             verbose++;
             break;
         case 'v':
             verbose++;
             break;

+        case 'V': 
+            show_version();
+            break;

         default:
             usage(prog);
             exit(1);
         default:
             usage(prog);
             exit(1);