X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=cedfca21a154245e26c92ddb16c175477f79bfca;hb=845f7ac49d5e63b96aca7a4cd1f60ac5e3230033;hp=c54d46debb53d3a4c9e8624d6120c9a9e9c104f3;hpb=5d770d0f89235b28f9c75ea43df29ce48a94ffa5;p=gedcom-parse.git

diff --git a/standalone.c b/standalone.c
index c54d46d..cedfca2 100644
--- a/standalone.c
+++ b/standalone.c
@@ -2,80 +2,76 @@
 /* $Name$ */
 
 #include "gedcom.h"
+#include "multilex.h"
+
+void show_help ()
+{
+  printf("gedcom-parse test program for libgedcom\n\n");
+  printf("Usage:  gedcom-parse [options] file\n");
+  printf("Options:\n");
+  printf("  -h    Show this help text\n");
+  printf("  -nc   Disable compatibility mode\n");
+  printf("  -fi   Fail immediately on errors\n");
+  printf("  -fd   Deferred fail on errors, but parse completely\n");
+  printf("  -fn   No fail on errors\n");
+  printf("  -dg   Debug setting: only libgedcom debug messages\n");
+  printf("  -da   Debug setting: libgedcom + yacc debug messages\n");
+}
 
 int main(int argc, char* argv[])
 {
   MECHANISM mech = IMMED_FAIL;
   int compat_enabled = 1;
+  int debug_level = 0;
+  char* file_name = NULL;
+
   if (argc > 1) {
     int i;
     for (i=1; i<argc; i++) {
-      if (!strncmp(argv[i], "-d", 2))
-	gedcom_enable_debug();
-      else if (!strncmp(argv[i], "-fi", 3))
+      if (!strncmp(argv[i], "-da", 4))
+	debug_level = 2;
+      else if (!strncmp(argv[i], "-dg", 4))
+	debug_level = 1;
+      else if (!strncmp(argv[i], "-fi", 4))
 	mech = IMMED_FAIL;
-      else if (!strncmp(argv[i], "-fd", 3))
+      else if (!strncmp(argv[i], "-fd", 4))
 	mech = DEFER_FAIL;
-      else if (!strncmp(argv[i], "-fn", 3))
+      else if (!strncmp(argv[i], "-fn", 4))
 	mech = IGNORE_ERRORS;
-      else if (!strncmp(argv[i], "-nc", 3))
+      else if (!strncmp(argv[i], "-nc", 4))
 	compat_enabled = 0;
+      else if (!strncmp(argv[i], "-h", 3)) {
+	show_help();
+	exit(1);
+      }
+      else if (strncmp(argv[i], "-", 1)) {
+	file_name = argv[i];
+	break;
+      }
       else {
 	printf ("Unrecognized option: %s\n", argv[i]);
+	show_help();
 	exit(1);
       }
     }
   }
+  
+  if (!file_name) {
+    printf("No file name given\n");
+    show_help();
+    exit(1);
+  }
+
+  gedcom_set_debug_level(debug_level);
   gedcom_set_compat_handling(compat_enabled);
   gedcom_set_error_handling(mech);
-  if (gedcom_parse() == 0) {
+  
+  if (gedcom_parse_file(file_name) == 0) {
     printf("Parse succeeded\n");
     return 0;
   }
   else {
     printf("Parse failed\n");
     return 1;
-  }
-}
-
-int gedcom_debug_print(char* s, ...)
-{
-  int res;
-#if YYDEBUG != 0
-  if (gedcom_debug) {
-    va_list ap;
-    va_start(ap, s);
-    res = vfprintf(stderr, s, ap);
-    va_end(ap);
-  }
-#endif
-  return(res);
-}
-
-int gedcom_warning(char* s, ...)
-{
-  int res;
-  va_list ap;
-
-  va_start(ap, s);
-  fprintf(stderr, "Warning on line %d: ", line_no);
-  res = vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-  
-  return res;
-}
-
-int gedcom_error(char* s, ...)
-{
-  int res;
-  va_list ap;
-
-  va_start(ap, s);
-  fprintf(stderr, "Error on line %d: ", line_no);
-  res = vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-  
-  return res;
+  }  
 }