--- psiconv/trunk/program/psiconv/psiconv.c	1999/12/02 17:18:55	34
+++ psiconv/trunk/program/psiconv/psiconv.c	2000/12/15 17:17:45	66
@@ -36,8 +36,8 @@
 #include <magick/magick.h>
 #endif
 
-#include "data.h"
-#include "parse.h"
+#include "psiconv/data.h"
+#include "psiconv/parse.h"
 #include "gen.h"
 #include "psiconv.h"
 
@@ -45,8 +45,6 @@
 static void print_version(void);
 static void strtoupper(char *str);
 
-int psiconv_verbosity = PSICONV_VERB_WARN;
-
 void print_help(void)
 {
   psiconv_fileformat ff;
@@ -56,7 +54,6 @@
   puts("Convert the psion Word file FILE to a HTML file");
   puts("If FILE is not specified, use stdin");
   puts("  -d, --debug          Show debug information on stderr");
-  puts("  -e, --exact          Quit on any parse errors or warnings");
   puts("  -h, --help           Display this help and exit");
   puts("  -o, --outputfile     Output to file instead of stdout");
   puts("  -s, --silent         Do not even show warnings on stderr");
@@ -97,7 +94,6 @@
     {"silent",no_argument,NULL,'s'},
     {"outputfile",required_argument,NULL,'o'},
     {"type",required_argument,NULL,'T'},
-    {"exact",no_argument,NULL,'e'},
     {0,0,0,0}
   };
   const char* short_options = "hVvsdo:eT:";
@@ -107,15 +103,16 @@
 
   const char *inputfilename = "";
   const char *outputfilename = "";
-  char *type = strdup("HTML");
-  int exact=0;
+  char *type = strdup("HTML3");
 
   int c,i,res;
   psiconv_buffer buf;
   psiconv_file file;
   psiconv_fileformat ff;
 
-  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat));
+  psiconv_verbosity = PSICONV_VERB_WARN;
+
+  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s));
   init_txt();
   init_html();
   init_html4();
@@ -133,8 +130,7 @@
                   psiconv_verbosity = PSICONV_VERB_PROGRESS; 
                 break;
       case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
-      case 's': psiconv_verbosity = PSICONV_VERB_SILENT; break;
-      case 'e': exact = 1; break;
+      case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
       case 'o': outputfilename = strdup(optarg); break;
       case 'T': type = strdup(optarg); break;
       case '?': case ':': fputs("Try `-h' for more information\n",stderr); 
@@ -151,6 +147,7 @@
   } else if (optind == argc-1) 
     inputfilename = strdup(argv[optind]);
 
+
   /* Open inputfile for reading */
     
   if (strlen(inputfilename) != 0) {
@@ -176,26 +173,21 @@
       exit(1);
     }
 
-  if (psiconv_parse(buf,&file))
-    if(exact)
-       exit(1);
-
-  /* Open outputfile for writing */
-  if (strlen(outputfilename) != 0) {
-    f = fopen(outputfilename,"w");
-    if (! f) {
-      perror(outputfilename);
-      exit(1);
-    }
-  } else 
-    f = stdout;
+  if (psiconv_parse(buf,&file) || (file->type == psiconv_unknown_file))
+  {
+     fprintf(stderr,"Parse error\n");
+     exit(1);
+  }
+
+  /* Set correct output file */
+  if (strlen(outputfilename) == 0) 
+    outputfilename = "/dev/stdout";
 
-  
   strtoupper(type);
   for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
     ff = psiconv_list_get(fileformat_list,i);
     if (! strcmp(type,ff->name)) {
-      res = ff->output(f,file,type);
+      res = ff->output(outputfilename,file,type);
       if (res) {
         fprintf(stderr,
                 "Output format `%s' not permitted for this file type\n",type);
@@ -210,12 +202,6 @@
     exit(1);
   }
 
-  if (strlen(outputfilename) != 0) 
-    if (fclose(f)) {
-      perror(outputfilename);
-      exit(1);
-    }
-
   psiconv_free_file(file);
 
   exit(0);