[lightlang] r936 committed - Рефакторинг

[ligh...@googlecode.com]

Revision: 936
Author: mdevaev
Date: Sun Feb 14 04:02:07 2010
Log: Рефакторинг
http://code.google.com/p/lightlang/source/detail?r=936

Modified:
/trunk/lightlang/apps/sl/src/search.c

=======================================
--- /trunk/lightlang/apps/sl/src/search.c Sun Feb 14 02:45:01 2010
+++ /trunk/lightlang/apps/sl/src/search.c Sun Feb 14 04:02:07 2010
@@ -65,7 +65,6 @@
long pos; // Smeshenie v file (index)
int translate_count = 0; // Schetchik kolichestva sovpadeniy
bool break_end_flag = false; // Flag propuska konca fila
- bool first_translate_flag = true; // Flag pervogo perevoda v file
extern settings_t settings; // Nastroyki sistemy
//////////////////////////////////////////////////

@@ -113,10 +112,11 @@
{
++translate_count;

- if ( first_translate_flag )
+ if ( translate_count == 1 )
{
print_separator();
print_header(dict_name);
+ print_separator();

if ( settings.output_format == html_output_format )
printf("\t<font
class=\"word_header_font\">&nbsp;&nbsp;&nbsp;%ls</font>\n", word_wc);
@@ -124,9 +124,10 @@
printf("\n\t<< %ls >>\n", word_wc);
// native format pass

- first_translate_flag = false;
+ print_separator();
}
print_translate(str, translate_count);
+ print_separator();

if ( translate_count >= settings.max_translate_count ) break;
}
@@ -171,10 +172,11 @@
{
++translate_count;

- if ( first_translate_flag )
+ if ( translate_count == 1 )
{
print_separator();
print_header(dict_name);
+ print_separator();

if ( settings.output_format == html_output_format )
printf("\t<font
class=\"word_header_font\">&nbsp;&nbsp;&nbsp;%ls</font>\n", word_wc);
@@ -182,9 +184,10 @@
printf("\n\t<< %ls >>\n", word_wc);
// native format pass

- first_translate_flag = false;
+ print_separator();
}
print_translate(str, translate_count);
+ print_separator();

break;
}
@@ -210,10 +213,11 @@
{
++translate_count;

- if ( first_translate_flag )
+ if ( translate_count == 1 )
{
print_separator();
print_header(dict_name);
+ print_separator();

if ( settings.output_format == html_output_format )
printf("\t<font
class=\"word_header_font\">&nbsp;&nbsp;&nbsp;%ls</font>\n", word_wc);
@@ -221,9 +225,10 @@
printf("\n\t<< %ls >>\n", word_wc);
// native format pass

- first_translate_flag = false;
+ print_separator();
}
print_translate(str, translate_count);
+ print_separator();

if ( translate_count >= settings.max_translate_count ) goto
external_loop_break_label;

@@ -273,7 +278,7 @@
{
++translate_count;

- if ( first_translate_flag )
+ if ( translate_count == 1 )
{
print_separator();
print_header(dict_name);
@@ -285,7 +290,7 @@
printf("\n\t<< %ls >>\n", word_wc);
// native format pass

- first_translate_flag = false;
+ print_separator();
}
print_list_item(str_wc, translate_count);

@@ -312,7 +317,7 @@
{
++translate_count;

- if ( first_translate_flag )
+ if ( translate_count == 1 )
{
print_separator();
print_header(dict_name);
@@ -324,7 +329,7 @@
printf("\n\t<< %ls >>\n", word_wc);
// native format pass

- first_translate_flag = false;
+ print_separator();
}
print_list_item(str_wc, translate_count);

@@ -412,8 +417,8 @@
return -1;
}

- sprintf(play_command, "%s %s/%ls/%lc/%ls%s", AUDIO_PLAYER_PROG,
ALL_SOUNDS_DIR, lang_wc, token_word_wc[0],
- token_word_wc, AUDIO_POSTFIX);
+ sprintf(play_command, "%s %s/%ls/%lc/%ls%s", AUDIO_PLAYER_PROG,
ALL_SOUNDS_DIR, lang_wc,
+ token_word_wc[0], token_word_wc, AUDIO_POSTFIX);

system(play_command);

@@ -560,7 +565,7 @@

if ( settings.output_format == html_output_format )
{
- fputs("\t<hr>\n", stdout);
+ puts("\t<hr>");
}
else if ( settings.output_format == text_output_format )
{
@@ -687,9 +692,6 @@
//////////////////////////////////////////////////


- if ( word_number == 1 )
- print_separator();
-
if ( settings.output_format == html_output_format )
{
printf("\t<dl><dd>\n\t\t(<font
class=\"article_number_font\">%d</font>) ", word_number);
@@ -997,7 +999,6 @@
}

putchar('\n');
- print_separator();
}


/********************************************************************************