-x- option suppresses use of xoptions

Author: BartJongejan

Changelog

@@ -1,3 +1,10 @@
+version 3.8 - 2017.02.13 
+Option -x- suppresses the use of the 'xoptions' file. (Use -x- together with
+-p and -n options.)
+
+version 3.7 - 2016.11.09 
+Enlarged scope of tag_hash.
+
 2016.05.17
 
 Start of changelog.
@@ -16,5 +23,3 @@ The program was not stable if #define STREAM 1 (in defines.h). This is solved.
 A lot of commented code and useless comments were removed. There is still a
 lot left.
 
-version 3.7 - 2016.11.09 
-Enlarged scope of tag_hash.

src/main.cpp

@@ -3,8 +3,8 @@ Version 1: Brill's tagger
 Version 2: CST's adaptation (standard C, removal of language dependent code, introduction of xoptions, handling of capitals in headlines
 Version 3: handling of XML (Previously called version 1, because Brill had not defined a version.)
 */
-#define CSTTAGGERVERSION "3.7"
-#define CSTTAGGERDATE "2016.11.09"
+#define CSTTAGGERVERSION "3.8"
+#define CSTTAGGERDATE "2017.02.13"
 #define CSTTAGGERCOPYRIGHT "MIT, University of Pennsylvania and Center for Sprogteknologi"
 
 #include "useful.h" // dupl

src/option.cpp

@@ -114,6 +114,8 @@ optionStruct::optionStruct():
                 printf("    -r   About redistribution (GNU)\n");
                 printf("    -W   About warranty (GNU)\n");
                 printf("    -x<path> path to file with extra options (deprecated)\n");
+                printf("    -x- do not use xoptions file at all\n");
+                printf("        (Not specifyiing -x makes the tagger look for a file 'xoptions' in the CWD.)\n");
                 printf("    -f ConvertToLowerCaseIfFirstWord (default off)\n");
                 printf("    -a ConvertToLowerCaseIfMostWordsAreCapitalized (default off)\n");
                 printf("    -s ShowIfLowercaseConversionHelped (default off)\n");

src/sst.cpp

@@ -86,30 +86,37 @@ int start_state_tagger
         {
         Verbose = Options->Verbose ? 1 : 0;
         }
-    char * tmp;
-    tmp = coption("Noun");
-    if(tmp)
+
+    if(Options->Noun)
         {
-        strncpy(noun,tmp,sizeof(noun) - 1);
-        noun[sizeof(noun)  - 1] = '\0';
+        strncpy(noun,Options->Noun,sizeof(noun) - 1);
         }
-    else if(Options->Noun)
+    else
         {
-        strncpy(noun,Options->Noun,sizeof(noun) - 1);
+        char * tmp;
+        tmp = coption("Noun");
+        if(tmp)
+            {
+            strncpy(noun,tmp,sizeof(noun) - 1);
+            noun[sizeof(noun)  - 1] = '\0';
+            }
         }
 
-    tmp = coption("Proper");
-    if(tmp)
+    if(Options->Proper)
         {
-        strncpy(proper,tmp,sizeof(proper) - 1);
-        proper[sizeof(proper)  - 1] = '\0';
+        strncpy(proper,Options->Proper,sizeof(noun) - 1);
         }
-    else if(Options->Proper)
+    else 
         {
-        strncpy(proper,Options->Proper,sizeof(noun) - 1);
+        char * tmp;
+        tmp = coption("Proper");
+        if(tmp)
+            {
+            strncpy(proper,tmp,sizeof(proper) - 1);
+            proper[sizeof(proper)  - 1] = '\0';
+            }
         }
 
-    
     /***********************************************************************/
 
 

src/useful.cpp

@@ -88,10 +88,14 @@ int num_words(char *thestr)
     return(returncount);
     }
 
-static char * getBaseDir()
+static char * getXoptionsFile()
     {
     if(xoptions)
+        {
+        if(strcmp(xoptions,"-")) // Bart 20170213 -x- turns off use of xoptions
+            return NULL;
         return xoptions; // Bart 20060321. New option -x <optionfile>
+        }
 
     // loff
     static char basedir[1028];
@@ -118,7 +122,7 @@ static char * getBaseDir()
 
 long option(const char * key) 
     {
-    FILE * fp = fopen(getBaseDir(),"r");
+    FILE * fp = fopen(getXoptionsFile(),"r");
     if(fp)
         {
         char line[256];
@@ -146,7 +150,7 @@ long option(const char * key)
 char * coption(const char * key) 
     {
     //loff FILE * fp = fopen("xoptions","r");
-    FILE * fp = fopen(getBaseDir(),"r");
+    FILE * fp = fopen(getXoptionsFile(),"r");
     if(fp)
         {
         static /*Bart 20030224*/ char line[256];