Changeset e0cd003 for src

Timestamp:

01/18/13 22:43:56 (12 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

b97a556

Parents:

243d027

git-author:

Tomasz Obrebski <to@…> (01/18/13 22:43:56)

git-committer:

Tomasz Obrebski <to@…> (01/18/13 22:43:56)

Message:

wsp�lny parametr -e usuni�ty
wyg�adzone teksty help

Location:

src

Files:

• common/cmdline_common.ggo (modified) (3 diffs)
• common/common.cc (modified) (2 diffs)
• cor/main.cc (modified) (2 diffs)
• gue/main.cc (modified) (2 diffs)
• kor/main.cc (modified) (3 diffs)
• lem/common_lem.cc (modified) (1 diff)
• lem/main.cc (modified) (2 diffs)
• lem_utf8/main.cc (modified) (2 diffs)
• tok.l/tok_cmdline.ggo (modified) (1 diff)

src/common/cmdline_common.ggo

@@ -4 +4 @@
 option  "input"         f       "Input file" string no
 
-option  "output"        o       "Output file for succesfully processed segments" string no
-
-option  "fail"          e       "Output file for unsuccesfully processed segments " string no
+option  "output"        o       "Output file" string no
 
 option  "only-fail"     -       "Print only segments the program failed to process" flag off hidden
@@ -12 +10 @@
 option  "no-fail"       -       "Print only segments the program processed" flag off hidden 
 
-option  "copy"          c       "Copy succesfully processed segments to standard output" flag off
+option  "copy"          c       "Copy succesfully processed segments to output" flag off
 
-option  "process"       p       "Process segments with this tag" string no multiple
+option  "process"       p       "Process segments of this type only" string no multiple
 
-option  "select"        s       "Select only segments with this field" string no multiple
+option  "select"        s       "Select only segments containing this field" string no multiple
 
-option  "ignore"        S       "Select only segments without this field" string no multiple
+option  "ignore"        S       "Select only segments, which doesn't contain this field" string no multiple
 
-option  "output-field"  O       "Output field name" string no
+option  "output-field"  O       "Output field name (default: program name)" string no
 
-option  "input-field"   I       "Input field name" string no multiple
+option  "input-field"   I       "Input field name (default: the FORM field)" string no multiple
 
 option  "interactive"   i       "Toggle interactive mode" flag off
@@ -28 +26 @@
 option  "config"        -       "Configuration file" string typestr="FILENAME" no
 
-option  "one-field"     1       "Print all results in one segments (creates ambiguous annotation)" flag off
+option  "one-field"     1       "Print all alternative results in one field (creates compact ambiguous annotation)" flag off
 
-option  "one-line"      -       "Print annotation alternatives as additional fields" flag off
+option  "one-line"      -       "Print annotation alternatives as additional fields in the same segment" flag off
 
 option  "language"      -       "Language." string no

src/common/common.cc

@@ -10 +10 @@
 FILE* inputf=stdin;
 FILE* outputf=stdout;
-FILE* failedf=stdout;
 bool copy_processed=0;
 bool one_field=false;
@@ -172 +171 @@
     }
   
-  if(args->fail_given)
-      if(!(failedf=fopen(args->fail_arg,"w")))
-      {
-        fprintf(stderr,"Cannot open the output file: %s.\n", args->fail_arg);
-        exit(1);
-      }
-
   if(args->input_field_given)
     fieldprefix(args->input_field_arg[0],input_field_prefix);

src/cor/main.cc

@@ -77 +77 @@
           
           if ( tab.count() == 0)
-            fputs(line, failedf);
+            fputs(line, outputf);
           else 
             {
@@ -146 +146 @@
         }
       
-      if(args.interactive_flag)
-        {
-        fflush(outputf);
-        fflush(failedf);
-      }
+      if(args.interactive_flag) fflush(outputf);
     }
   cmdline_parser_free(&args);

src/gue/main.cc

@@ -57 +57 @@
           guess.ana(form, tab);
           
-          if ((tab.count()==0) && (!args.no_fail_flag)) // no guesses - analysis was unsuccessful
-            fputs(line, failedf);
+          if ((tab.count()==0)) // no guesses - analysis was unsuccessful
+            fputs(line, outputf);
           else
             {
@@ -155 +155 @@
             }
         }
-      if(args.interactive_flag) 
-        fflush(outputf), fflush(failedf);
+      if(args.interactive_flag) fflush(outputf);
       
     }

src/kor/main.cc

@@ -22 +22 @@
 
   Corr cor;
-
-  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//  strcpy(dictionary,"cor.bin");
 
   cor.load(dictionary);
@@ -72 +69 @@
           
           if ( tab.count() == 0)
-            fputs(line, failedf);
+            fputs(line, inputf);
           else 
             {
@@ -165 +162 @@
         }
       
-      if(args.interactive_flag)
-        {
-        fflush(outputf);
-        fflush(failedf);
-      }
+      if(args.interactive_flag) fflush(outputf);
     }
   cmdline_parser_free(&args);

src/lem/common_lem.cc

@@ -30 +30 @@
 }
 
-
-// STARE
-//  if(args.dictionary_given)
-//    strcpy(dictionary, args.dictionary_arg);
-//  else {
-//     char path[256];
-//     //sprintf(path, "/etc/utt/data/%s/%s", args.locale_arg, DICT_FILE);
-//     //if (file_accessible(path) == 0)
-//     //  strcpy(dictionary, path);
-//     //else {
-//       sprintf(path, "%s/%s", utt_dir, DICT_FILE);
-//       if (file_accessible(path) == 0)
-//      strcpy(dictionary, path);
-//       else {
-//      fprintf(stderr, "Cannot find dictionary!\n");
-//      exit(1);
-//       }
-//       //}
-//   }
-

src/lem/main.cc

@@ -66 +66 @@
           
           if (tab.count() == 0) 
-            fputs(line, failedf);
+            fputs(line, outputf);
           else 
             { // mamy jakies opisy w slowniku
@@ -124 +124 @@
         }
       
-      if(args.interactive_flag) 
-        fflush(outputf), fflush(failedf);
+      if(args.interactive_flag) fflush(outputf);
       
     }

src/lem_utf8/main.cc

@@ -70 +70 @@
               }
               if (tab.count() == 0) {
-                fputws(line, failedf);
+                fputws(line, outputf);
                  }
       
@@ -133 +133 @@
             }
       
-      if (args.interactive_flag) 
-          fflush(outputf), fflush(failedf);
+      if (args.interactive_flag) fflush(outputf);
       
     }

src/tok.l/tok_cmdline.ggo

@@ -12 +12 @@
 
 tok reads from standard input, identifies tokens on the basis of their orthographic form and writes a sequence of segments in UTT format to
-the standard output. The type of the token is printed as the type field.
+the standard output.
 
 OUTPUT FORMAT
 
-UTT-file with four fields: start, length, type, and form. In the type field five types of tokens are distinguished:
+UTT-file with four fields: START, LENGTH, TYPE, and FORM. In the TYPE field five types of tokens are distinguished:
 
   W (word) - continuous sequence of letters