yaz-icu: input file may be given.

As an alternative to stdin.. Needed it for a gdb run and it seems
useful.

diff --git a/doc/yaz-icu-man.xml b/doc/yaz-icu-man.xml
index 5248b73..7c016bf 100644 (file)
--- a/doc/yaz-icu-man.xml
+++ b/doc/yaz-icu-man.xml
@@ -29,11 +29,11 @@
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-icu</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-icu</command>

-   <arg choice="opt" rep="repeat">commands</arg>

    <arg>-c <replaceable>config</replaceable></arg>
    <arg>-p <replaceable>opt</replaceable></arg>
    <arg>-s</arg>
    <arg>-x</arg>
    <arg>-c <replaceable>config</replaceable></arg>
    <arg>-p <replaceable>opt</replaceable></arg>
    <arg>-s</arg>
    <arg>-x</arg>

+   <arg choice="opt">infile</arg>

   </cmdsynopsis>
  </refsynopsisdiv>
  
   </cmdsynopsis>
  </refsynopsisdiv>
  

@@ -42,6 +42,17 @@
    <command>yaz-icu</command> is utility which demonstrates 
    the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
   </para>
    <command>yaz-icu</command> is utility which demonstrates 
    the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
   </para>

+  <para>
+    The utility can be used in two ways. It may read some text
+    using an XML configuration for configuring ICU and show text analysis.
+    This mode is triggered by option <literal>-c</literal> which specififies
+    the configuration to be used. The input file is read from standard
+    input or from a file if <literal>infile</literal> is specified.
+  </para>
+  <para>
+    The utility may also show ICU information. This is triggered by
+    option <literal>-p</literal>.
+  </para>

  </refsect1>
 
  <refsect1><title>OPTIONS</title>
  </refsect1>
 
  <refsect1><title>OPTIONS</title>

diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index 25e4de0..fe86bed 100644 (file)
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <errno.h>

 
 #include <yaz/options.h>
 
 
 #include <yaz/options.h>
 

@@ -40,12 +41,12 @@ static struct config_t {
   
 void print_option_error(const struct config_t *p_config)
 {  
   
 void print_option_error(const struct config_t *p_config)
 {  

-    fprintf(stderr, "Calling error, valid options are :\n");
-    fprintf(stderr, "yaz-icu\n"
-            "   [-c (path/to/config/file.xml)]\n"
-            "   [-p (a|c|l|t)] print ICU info \n"
-            "   [-s] Show sort normalization key\n"
-            "   [-x] XML output\n"
+    fprintf(stderr, "yaz-icu [options] [infile]\n"
+            "Options:\n"
+            "   -c file         XML configuration\n"
+            "   -p a|c|l|t      Print ICU info \n"
+            "   -s              Show sort normalization key\n"
+            "   -x              XML output instread of text\n"

             "\n"
             "Examples:\n"
             "cat hugetextfile.txt | ./yaz-icu -c config.xml \n"
             "\n"
             "Examples:\n"
             "cat hugetextfile.txt | ./yaz-icu -c config.xml \n"

@@ -75,7 +76,7 @@ void read_params(int argc, char **argv, struct config_t *p_config)
     p_config->xmloutput = 0;
     p_config->sortoutput = 0;
     p_config->chain = 0;
     p_config->xmloutput = 0;
     p_config->sortoutput = 0;
     p_config->chain = 0;

-    p_config->infile = stdin;
+    p_config->infile = 0;

     p_config->outfile = stdout;
     
     /* set up command line parameters */
     p_config->outfile = stdout;
     
     /* set up command line parameters */

@@ -96,17 +97,30 @@ void read_params(int argc, char **argv, struct config_t *p_config)
         case 'x':
             p_config->xmloutput = 1;
             break;
         case 'x':
             p_config->xmloutput = 1;
             break;

+        case 0:
+            if (p_config->infile)
+            {
+                fprintf(stderr, "yaz-icu: only one input file may be given\n");
+                print_option_error(p_config);
+            }
+            p_config->infile = fopen(arg, "r");
+            if (!p_config->infile)
+            {
+                fprintf(stderr, "yaz-icu: cannot open %s : %s\n",
+                        arg, strerror(errno));
+                exit(1);
+            }
+            break;

         default:
         default:

-            printf("Got %d\n", ret);
+            fprintf(stderr, "yaz_icu: invalid option: %s\n", arg);

             print_option_error(p_config);
         }
     }
             print_option_error(p_config);
         }
     }

-    
-    if ((!strlen(p_config->conffile)
-         && !strlen(p_config->print))
-        || !config.infile
-        || !config.outfile)
-        
+
+    if (p_config->infile == 0)
+        p_config->infile = stdin;
+
+    if (!strlen(p_config->conffile) && !strlen(p_config->print))

         print_option_error(p_config);
 }
 
         print_option_error(p_config);
 }