diff --git a/app/TODO b/app/TODO index 7b96d73..819ebe4 100644 --- a/app/TODO +++ b/app/TODO @@ -1,16 +1,16 @@ BARDZO WAZNE: -* zawieszanie sie lema dla wyrazow z pola -I (np. kor) -* komunikaty o nieznalezieniu slownika (lem) [TO] +* zawieszanie sie lema dla wyrazow z pola -I (np. kor) [ZROBIONE,TO] +* komunikaty o nieznalezieniu slownika (lem) [ZROBIONE, TO] WAZNE: * zamienic kota na lepszego (Kubis) [TO] * sen - unikać dwukrotnego wstawiania BOSów i EOSów * polaczyc sen'y [TO] -* programy z atrybutyem input-field: funkcja process_seg zwraca false, gdy nie ma pola podanego po -I +* programy z atrybutyem input-field: funkcja process_seg zwraca false, gdy nie ma pola podanego po -I [ZROBIONE,TO] * generowanie i sprawdzanie zaleznosci dla tarballa [PK] * przygotowanie dystrybujcji slownikow [PK] -* (zrobione dla ser?) Nazwy pmdb2re -> pmdb.tag2re (grp, ser). +* (zrobione dla ser?) Nazwy pmdb2re -> pmdb.tag2re (grp, ser). [ZROBIONE,TO] * Zadania zwiazane z rozbudowa ser (src/ser/TODO). * Nowa funkcjonalność dla kot? con? - każde zdanie w nowym wierszu * opcja info w dgp powinna miec domyslna wartosc d lub h @@ -18,4 +18,6 @@ WAZNE: find: /home/to/work/utt/lang/dist/tarball/utt-0.9.2/share/utt/pl_PL.UTF-8/.svn: Nie ma takiego pliku ani katalogu find: /home/to/work/utt/lang/dist/tarball/utt-0.9.2/share/utt/pl_PL.ISO-8859-2/.svn: Nie ma takiego pliku ani katalogu * przyspieszyć process_seg() -> obliczanie prefiksów pól z opcji -s i -S raz na poczatku programu, a nie w kolko +* kor: nie dziala opcja distance +* zunifikowac opcje cor i kor diff --git a/app/src/common/common.cc b/app/src/common/common.cc index fe697f3..9f34c90 100644 --- a/app/src/common/common.cc +++ b/app/src/common/common.cc @@ -194,7 +194,7 @@ void process_common_options(gengetopt_args_info* args, char* argv0) // sprawdza istnienie pliku int file_accessible(const char* path) { - return access(path, R_OK); + return access(path, R_OK); } // sprawdza istnienie pliku konfiguracyjnego diff --git a/app/src/cor/common_cor.cc b/app/src/cor/common_cor.cc index c87a95b..fc20905 100644 --- a/app/src/cor/common_cor.cc +++ b/app/src/cor/common_cor.cc @@ -9,11 +9,21 @@ void process_cor_options(gengetopt_args_info* args) if(args->dictionary_given) { expand_path(args->dictionary_arg,dictionary); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } else if (args->dictionary_home_given && args->language_given) { char buf[255]; expand_path(args->dictionary_home_arg, buf); sprintf(dictionary,"%s/%s/cor.bin",buf,args->language_arg); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } } diff --git a/app/src/gue/common_guess.cc b/app/src/gue/common_guess.cc index 955792d..d04f24f 100644 --- a/app/src/gue/common_guess.cc +++ b/app/src/gue/common_guess.cc @@ -15,12 +15,22 @@ void process_guess_options(gengetopt_args_info* args) if(args->dictionary_given) { expand_path(args->dictionary_arg,dictionary); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } else if (args->dictionary_home_given && args->language_given) { char buf[255]; expand_path(args->dictionary_home_arg, buf); sprintf(dictionary,"%s/%s/lem.bin",buf,args->language_arg); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } if(args->guess_count_given) diff --git a/app/src/kor/common_cor.cc b/app/src/kor/common_cor.cc index a302135..59e8b3c 100755 --- a/app/src/kor/common_cor.cc +++ b/app/src/kor/common_cor.cc @@ -15,12 +15,22 @@ void process_cor_options(gengetopt_args_info* args) if(args->dictionary_given) { expand_path(args->dictionary_arg,dictionary); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } else if (args->dictionary_home_given && args->language_given) { char buf[MAX_PATH_LENGTH]; expand_path(args->dictionary_home_arg, buf); sprintf(dictionary,"%s/%s/cor.bin",buf,args->language_arg); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } expand_path(args->weights_arg, file_weights); diff --git a/app/src/lem/common_lem.cc b/app/src/lem/common_lem.cc index f81c07b..610e309 100644 --- a/app/src/lem/common_lem.cc +++ b/app/src/lem/common_lem.cc @@ -10,12 +10,22 @@ void process_lem_options(gengetopt_args_info* args) if(args->dictionary_given) { expand_path(args->dictionary_arg,dictionary); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } else if (args->dictionary_home_given && args->language_given) { char buf[255]; expand_path(args->dictionary_home_arg, buf); sprintf(dictionary,"%s/%s/lem.bin",buf,args->language_arg); + if(file_accessible(dictionary)!=0) + { + fprintf(stderr,"Cannot open the dictionary file: %s\nAborting.\n",dictionary); + exit(1); + } } }