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

[ligh...@googlecode.com]

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

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

=======================================
--- /trunk/lightlang/apps/sl/src/search.c Sun Feb 14 04:02:07 2010
+++ /trunk/lightlang/apps/sl/src/search.c Tue Feb 16 07:14:38 2010
@@ -113,19 +113,7 @@
++translate_count;

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);
- else if ( settings.output_format == text_output_format )
- printf("\n\t<< %ls >>\n", word_wc);
- // native format pass
-
- print_separator();
- }
+ print_header(dict_name, word_wc);
print_translate(str, translate_count);
print_separator();

@@ -173,19 +161,7 @@
++translate_count;

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);
- else if ( settings.output_format == text_output_format )
- printf("\n\t<< %ls >>\n", word_wc);
- // native format pass
-
- print_separator();
- }
+ print_header(dict_name, word_wc);
print_translate(str, translate_count);
print_separator();

@@ -214,19 +190,7 @@
++translate_count;

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);
- else if ( settings.output_format == text_output_format )
- printf("\n\t<< %ls >>\n", word_wc);
- // native format pass
-
- print_separator();
- }
+ print_header(dict_name, word_wc);
print_translate(str, translate_count);
print_separator();

@@ -279,19 +243,7 @@
++translate_count;

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);
- else if ( settings.output_format == text_output_format )
- printf("\n\t<< %ls >>\n", word_wc);
- // native format pass
-
- print_separator();
- }
+ print_header(dict_name, word_wc);
print_list_item(str_wc, translate_count);

if ( translate_count >= settings.max_translate_count ) break;
@@ -318,19 +270,7 @@
++translate_count;

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);
- else if ( settings.output_format == text_output_format )
- printf("\n\t<< %ls >>\n", word_wc);
- // native format pass
-
- print_separator();
- }
+ print_header(dict_name, word_wc);
print_list_item(str_wc, translate_count);

if ( translate_count >= settings.max_translate_count ) break;
@@ -581,7 +521,7 @@
* print_header() - pechataet vyrovnennyy po centru zagolovok. *
* *

********************************************************************************/
-static void print_header(const char *dict_name)
+static void print_header(const char *dict_name, const wchar_t *word_wc)
{
//////////////////////////////////
int count; // Schetchik
@@ -589,6 +529,8 @@
//////////////////////////////////


+ print_separator();
+
if ( settings.output_format == html_output_format )
{
printf("\t<table border=\"0\" width=\"100%\"><tr><td align=\"center\""
@@ -636,6 +578,16 @@
}
}
// native format pass
+
+ print_separator();
+
+ if ( settings.output_format == html_output_format )
+ printf("\t<font
class=\"word_header_font\">&nbsp;&nbsp;&nbsp;%ls</font>\n", word_wc);
+ else if ( settings.output_format == text_output_format )
+ printf("\n\t<< %ls >>\n", word_wc);
+ // native format pass
+
+ print_separator();
}


/********************************************************************************
=======================================
--- /trunk/lightlang/apps/sl/src/search.h Wed Jan 20 08:11:40 2010
+++ /trunk/lightlang/apps/sl/src/search.h Tue Feb 16 07:14:38 2010
@@ -57,7 +57,7 @@
void print_begin_page(const char *word);
void print_end_page(void);
static void print_separator(void);
-static void print_header(const char *dict_name);
+static void print_header(const char *dict_name, const wchar_t *word_wc);

static void print_list_item(const wchar_t *word_wc, const int word_number);
static void print_translate(const char *str, const int number);