add localization gateway
Allan Cornet [Tue, 30 Jan 2007 19:14:52 +0000 (19:14 +0000)]
add getlanguage & setlanguage ISO 609.1
(2 characters)
Example :
fr --> french
en --> english
with getlanguage() LANGUAGE will be obsolete and removed

scilab/modules/core/src/c/callinterf.h
scilab/modules/fftw/sci_gateway/fftw
scilab/modules/localization/Makefile.am
scilab/modules/localization/includes/setgetlanguage.h
scilab/modules/localization/sci_gateway/sci_getlanguage.c
scilab/modules/localization/sci_gateway/sci_setlanguage.c
scilab/modules/localization/src/localization.vcproj
scilab/modules/localization/src/setgetlanguage.c
scilab/modules/time/sci_gateway/gw_time.c

index ea36e78..2a6e2bc 100644 (file)
@@ -82,8 +82,10 @@ extern void    /* 44  */ C2F(gw_linear_algebra2)();
 extern void    /* 47  */ C2F(gw_wintools)();
 extern void    /* 48  */ C2F(gw_time)();
 extern void    /* 49  */ C2F(gw_sound)();
+extern void    /* 50  */ C2F(gw_localization)();
+
 #if _MSC_VER
-extern void    /* 50  */ C2F(gw_fftw)();
+extern void    /* 51  */ C2F(gw_fftw)();
 #endif
 
 static OpTab Interfaces[] ={
@@ -135,10 +137,11 @@ static OpTab Interfaces[] ={
     /* 46  */ {SCICOSINTERF2},
        /* 47  */ {C2F(gw_wintools)},
        /* 48  */ {C2F(gw_time)},
-       /* 49  */ {C2F(gw_sound)}
+       /* 49  */ {C2F(gw_sound)},
+       /* 50  */ {C2F(gw_localization)}
 #if _MSC_VER
        ,
-       /* 50  */ {C2F(gw_fftw)}
+       /* 51  */ {C2F(gw_fftw)}
 #endif
 };
 
index 9a71f8f..ec07462 100644 (file)
@@ -6,13 +6,13 @@
 ; fftw module primitives            
 ; Don't edit if you aren't sure         
 ; --------------------------            
-50 1 loadfftwlibrary
-50 2 disposefftwlibrary
-50 3 fftwlibraryisloaded
-50 4 fftw
-50 5 fftw_flags
-50 6 fftw_inplace
-50 7 fftw_norm
-50 8 pushfftw_plan
-50 9 freefftw_plan
+51 1 loadfftwlibrary
+51 2 disposefftwlibrary
+51 3 fftwlibraryisloaded
+51 4 fftw
+51 5 fftw_flags
+51 6 fftw_inplace
+51 7 fftw_norm
+51 8 pushfftw_plan
+51 9 freefftw_plan
 ; --------------------------            
index 74f4604..c395ae6 100644 (file)
@@ -4,7 +4,12 @@
 ##########
 
 LOCALIZATION_C_SOURCES = src/hashtable_localization.c \
-src/localization.c
+src/localization.c\
+src/setlanguage.c
+
+GATEWAY_C_SOURCES = sci_gateway/c/gw_localization.c \
+sci_gateway/c/sci_setlanguage.c \
+sci_gateway/c/sci_getlanguage.c
 
 libscilocalization_la_CFLAGS=  -Iincludes/ -Isrc/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/libs/hashtable/ $(XML_FLAGS)
 
@@ -20,6 +25,7 @@ $(top_builddir)/libs/hashtable/libscihashtable.la
 
 
 
+
 #### Target ######
 target=$(datadir)/localization
 
@@ -41,6 +47,7 @@ libscilocalization_la_etc_DATA = etc/localization.quit etc/localization.start
 
 #### localization : include files ####
 libscilocalization_la_includedir=$(sciincludedir)/localization
-libscilocalization_la_include_HEADERS = includes/localization.h
+libscilocalization_la_include_HEADERS = includes/localization.h \
+includes/gw_localization.h
 
 include $(top_srcdir)/Makefile.incl.am
index e69de29..f0650d4 100644 (file)
@@ -0,0 +1,16 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#ifndef __SETGETLANGUAGE_H__\r
+#define __SETGETLANGUAGE_H__\r
+\r
+#include "machine.h"\r
+\r
+\r
+BOOL setlanguage(char *lang);\r
+char *getlanguage(void);\r
+int getcurrentlanguagecode(void);\r
+\r
+#endif /* __SETGETLANGUAGE_H__ */\r
+/*-----------------------------------------------------------------------------------*/ 
\ No newline at end of file
index 6d26e90..ccce2dd 100644 (file)
@@ -3,9 +3,25 @@
 /* Allan CORNET */\r
 /*-----------------------------------------------------------------------------------*/ \r
 #include "sci_getlanguage.h"\r
+#include "setgetlanguage.h"\r
+#include "MALLOC.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
 int C2F(sci_getlanguage) _PARAMS((char *fname,unsigned long fname_len))\r
 {\r
+       static int l1,n1,m1;\r
+       char *Output=NULL;\r
+\r
+       CheckRhs(0,0);\r
+       CheckLhs(0,1);\r
+\r
+       Output=getlanguage();\r
+\r
+       n1=1;\r
+       CreateVarFromPtr( 1, "c",(m1=(int)strlen(Output), &m1),&n1,&Output);\r
+       LhsVar(1) = 1;\r
+       C2F(putlhsvar)();       \r
+       if (Output) {FREE(Output);Output=NULL;}\r
+\r
        return 0;\r
 }\r
 /*-----------------------------------------------------------------------------------*/ \r
index e375a21..154fb74 100644 (file)
@@ -3,9 +3,43 @@
 /* Allan CORNET */\r
 /*-----------------------------------------------------------------------------------*/ \r
 #include "sci_setlanguage.h"\r
+#include "setgetlanguage.h"\r
+#include "Scierror.h"\r
+#include "sciprint.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
 int C2F(sci_setlanguage) _PARAMS((char *fname,unsigned long fname_len))\r
 {\r
+       static int l1,n1,m1;\r
+\r
+       CheckRhs(0,1);\r
+       CheckLhs(1,1);\r
+\r
+       if (GetType(1) == sci_strings)\r
+       {\r
+               char *param=NULL;\r
+\r
+               GetRhsVar(1,"c",&m1,&n1,&l1);\r
+               param=cstk(l1);\r
+               if (!setlanguage(param))\r
+               {\r
+                       sciprint("%s is a invalid language. see 'help setlanguage'.\n\n");\r
+                       CreateVar(Rhs+1, "b", &n1,&n1,&l1);\r
+                       *istk(l1)=(int)(FALSE);\r
+               }\r
+               else\r
+               {\r
+                       CreateVar(Rhs+1, "b", &n1,&n1,&l1);\r
+                       *istk(l1)=(int)(TRUE);\r
+               }\r
+               LhsVar(1)=Rhs+1;\r
+               C2F(putlhsvar)();\r
+       }\r
+       else\r
+       {\r
+               Scierror(999,"parameter incorrect: see 'help setlanguage'");\r
+               return 0;\r
+       }\r
+\r
        return 0;\r
 }\r
 /*-----------------------------------------------------------------------------------*/ \r
index 6b145fc..177296d 100644 (file)
@@ -43,7 +43,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../includes;../../core/includes;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml"
-                               PreprocessorDefinitions="_DLL;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE;EXPORT_LOCALIZATION_DLL"
+                               PreprocessorDefinitions="FORDLL;_DLL;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE;EXPORT_LOCALIZATION_DLL"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                AdditionalIncludeDirectories="../includes;../../core/includes;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml"
-                               PreprocessorDefinitions="EXPORT_LOCALIZATION_DLL;STRICT;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="FORDLL;EXPORT_LOCALIZATION_DLL;STRICT;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                >
                        </File>
                        <File
+                               RelativePath="..\sci_gateway\sci_getlanguage.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\sci_gateway\sci_setlanguage.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\includes\setgetlanguage.h"
                                >
                        </File>
index e69de29..b1f4761 100644 (file)
@@ -0,0 +1,311 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include <string.h>\r
+#include "setgetlanguage.h"\r
+#include "MALLOC.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+#define LengthAlpha2code 3\r
+typedef struct languages_struct \r
+{\r
+       int code;\r
+       char alpha2code[LengthAlpha2code];\r
+       char languagename[96];      /** its name **/\r
+} LanguagesTable;\r
+/*-----------------------------------------------------------------------------------*/ \r
+#define NumberLanguages 204\r
+static LanguagesTable TabLanguages[NumberLanguages]=\r
+/**\r
+*  ISO 639-1 Code\r
+*   http://www.loc.gov/standards/iso639-2/php/code_list.php \r
+*/\r
+{\r
+       {  1,   "aa",   "Afar"},\r
+       {  2,   "ab",   "Abkhazian"},\r
+       {  3,   "af",   "Afrikaans"},\r
+       {  4,   "ak",   "Akan"},\r
+       {  5,   "sq",   "Albanian"},\r
+       {  6,   "am",   "Amharic"},\r
+       {  7,   "ar",   "Arabic"},\r
+       {  8,   "an",   "Aragonese"},\r
+       {  9,   "hy",   "Armenian"},\r
+       { 10,   "as",   "Assamese"},\r
+       { 11,   "av",   "Avaric"},\r
+       { 12,   "ae",   "Avestan"},\r
+       { 13,   "ay",   "Aymara"},\r
+       { 14,   "az",   "Azerbaijani"},\r
+       { 15,   "ba",   "Bashkir"},\r
+       { 16,   "bm",   "Bambara"},\r
+       { 17,   "eu",   "Basque"},\r
+       { 18,   "be",   "Belarusian"},\r
+       { 19,   "bn",   "Bengali"},\r
+       { 20,   "bh",   "Bihari"},\r
+       { 21,   "bi",   "Bislama"},\r
+       { 22,   "bo",   "Tibetan"},\r
+       { 23,   "bs",   "Bosnian"},\r
+       { 24,   "br",   "Breton"},\r
+       { 25,   "bg",   "Bulgarian"},\r
+       { 26,   "my",   "Burmese"},\r
+       { 27,   "ca",   "Catalan; Valencian"},\r
+       { 28,   "cs",   "Czech"},\r
+       { 29,   "ch",   "Chamorro"},\r
+       { 30,   "ce",   "Chechen"},\r
+       { 31,   "zh",   "Chinese"},\r
+       { 32,   "cu",   "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic"},\r
+       { 33,   "cv",   "Chuvash"},\r
+       { 34,   "kw",   "Cornish"},\r
+       { 35,   "co",   "Corsican"},\r
+       { 36,   "cr",   "Cree"},\r
+       { 37,   "cy",   "Welsh"},\r
+       { 38,   "cs",   "Czech"},\r
+       { 39,   "da",   "Danish"},\r
+       { 40,   "de",   "German"},\r
+       { 41,   "dv",   "Divehi; Dhivehi; Maldivian"},\r
+       { 42,   "nl",   "Dutch; Flemish"},\r
+       { 43,   "dz",   "Dzongkha"},\r
+       { 44,   "el",   "Greek, Modern (1453-)"},\r
+       { 45,   "en",   "English"},\r
+       { 46,   "eo",   "Esperanto"},\r
+       { 47,   "et",   "Estonian "},\r
+       { 48,   "eu",   "Basque"},\r
+       { 49,   "ee",   "Ewe"},\r
+       { 50,   "fo",   "Faroese"},\r
+       { 51,   "fa",   "Persian"},\r
+       { 52,   "fj",   "Fijian"},\r
+       { 53,   "fi",   "Finnish"},\r
+       { 54,   "fr",   "French"},\r
+       { 55,   "fy",   "Western Frisian"},\r
+       { 56,   "ff",   "Fulah"},\r
+       { 57,   "ka",   "Georgian"},\r
+       { 58,   "de",   "German"},\r
+       { 59,   "gd",   "Gaelic; Scottish Gaelic"},\r
+       { 60,   "ga",   "Irish"},\r
+       { 61,   "gl",   "Galician"},\r
+       { 62,   "gv",   "Manx"},\r
+       { 63,   "el",   "Greek, Modern (1453-)"},\r
+       { 64,   "gn",   "Guarani"},\r
+       { 65,   "gu",   "Gujarati"},\r
+       { 66,   "ht",   "Haitian; Haitian Creole"},\r
+       { 67,   "ha",   "Hausa"},\r
+       { 68,   "he",   "Hebrew"},\r
+       { 69,   "hz",   "Herero"},\r
+       { 70,   "hi",   "Hindi"},\r
+       { 71,   "ho",   "Hiri Motu"},\r
+       { 72,   "hr",   "Croatian"},\r
+       { 73,   "hu",   "Hungarian"},\r
+       { 74,   "hy",   "Armenian"},\r
+       { 75,   "ig",   "Igbo"},\r
+       { 76,   "is",   "Icelandic"},\r
+       { 77,   "io",   "Ido"},\r
+       { 78,   "ii",   "Sichuan Yi"},\r
+       { 79,   "iu",   "Inuktitut"},\r
+       { 80,   "ie",   "Interlingue"},\r
+       { 81,   "ia",   "Interlingua (International Auxiliary Language Association)"},\r
+       { 82,   "id",   "Indonesian"},\r
+       { 83,   "ik",   "Inupiaq"},\r
+       { 84,   "is",   "Icelandic"},\r
+       { 85,   "it",   "Italian"},\r
+       { 86,   "jv",   "Javanese"},\r
+       { 87,   "ja",   "Japanese"},\r
+       { 88,   "kl",   "Kalaallisut; Greenlandic"},\r
+       { 89,   "kn",   "Kannada"},\r
+       { 90,   "ks",   "Kashmiri"},\r
+       { 91,   "ka",   "Georgian"},\r
+       { 92,   "kr",   "Kanuri"},\r
+       { 93,   "kk",   "Kazakh"},\r
+       { 94,   "km",   "Central Khmer"},\r
+       { 95,   "ki",   "Kikuyu; Gikuyu"},\r
+       { 96,   "rw",   "Kinyarwanda"},\r
+       { 97,   "ky",   "Kirghiz; Kyrgyz"},\r
+       { 98,   "kv",   "Komi"},\r
+       { 99,   "kg",   "Kongo"},\r
+       {100,   "ko",   "Korean"},\r
+       {101,   "kj",   "Kuanyama; Kwanyama"},\r
+       {102,   "ku",   "Kurdish"},\r
+       {103,   "lo",   "Lao"},\r
+       {104,   "la",   "Latin"},\r
+       {105,   "lv",   "Latvian"},\r
+       {106,   "li",   "Limburgan; Limburger; Limburgish"},\r
+       {107,   "ln",   "Lingala"},\r
+       {108,   "lt",   "Lithuanian"},\r
+       {109,   "lb",   "Luxembourgish; Letzeburgesch"},\r
+       {110,   "lu",   "Luba-Katanga"},\r
+       {111,   "lg",   "Ganda"},\r
+       {112,   "mk",   "Macedonian"},\r
+       {113,   "mh",   "Marshallese"},\r
+       {114,   "ml",   "Malayalam"},\r
+       {115,   "mi",   "Maori"},\r
+       {116,   "mr",   "Marathi"},\r
+       {117,   "ms",   "Malay"},\r
+       {118,   "mk",   "Macedonian"},\r
+       {119,   "mg",   "Malagasy"},\r
+       {120,   "mt",   "Maltese"},\r
+       {121,   "mo",   "Moldavian"},\r
+       {122,   "mn",   "Mongolian"},\r
+       {123,   "mi",   "Maori"},\r
+       {124,   "ms",   "Malay"},\r
+       {125,   "my",   "Burmese"},\r
+       {126,   "na",   "Nauru"},\r
+       {127,   "nv",   "Navajo; Navaho"},\r
+       {128,   "nr",   "Ndebele, South; South Ndebele"},\r
+       {129,   "nd",   "Ndebele, North; North Ndebele"},\r
+       {130,   "ng",   "Ndonga"},\r
+       {131,   "ne",   "Nepali"},\r
+       {132,   "nl",   "Dutch; Flemish"},\r
+       {133,   "nn",   "Norwegian Nynorsk; Nynorsk, Norwegian"},\r
+       {134,   "nb",   "Bokmål, Norwegian; Norwegian Bokmål"},\r
+       {135,   "no",   "Norwegian"},\r
+       {136,   "ny",   "Chichewa; Chewa; Nyanja"},\r
+       {137,   "oc",   "Occitan (post 1500); Provençal"},\r
+       {138,   "oj",   "Ojibwa"},\r
+       {139,   "or",   "Oriya"},\r
+       {140,   "om",   "Oromo"},\r
+       {141,   "os",   "Ossetian; Ossetic"},\r
+       {142,   "pa",   "Panjabi; Punjabi"},\r
+       {143,   "fa",   "Persian"},\r
+       {144,   "pi",   "Pali"},\r
+       {145,   "pl",   "Polish"},\r
+       {146,   "pt",   "Portuguese"},\r
+       {147,   "ps",   "Pushto"},\r
+       {148,   "qu",   "Quechua"},\r
+       {149,   "rm",   "Romansh"},\r
+       {150,   "ro",   "Romanian"},\r
+       {151,   "rn",   "Rundi"},\r
+       {152,   "ru",   "Russian"},\r
+       {153,   "sg",   "Sango"},\r
+       {154,   "sa",   "Sanskrit"},\r
+       {155,   "sr",   "Serbian"},\r
+       {156,   "hr",   "Croatian"},\r
+       {157,   "si",   "Sinhala; Sinhalese"},\r
+       {158,   "sk",   "Slovak"},\r
+       {159,   "sl",   "Slovenian"},\r
+       {160,   "se",   "Northern Sami"},\r
+       {161,   "sm",   "Samoan"},\r
+       {162,   "sn",   "Shona"},\r
+       {163,   "sd",   "Sindhi"},\r
+       {164,   "so",   "Somali"},\r
+       {165,   "st",   "Sotho, Southern"},\r
+       {166,   "es",   "Spanish; Castilian"},\r
+       {167,   "sq",   "Albanian"},\r
+       {168,   "sc",   "Sardinian"},\r
+       {169,   "sr",   "Serbian"},\r
+       {170,   "ss",   "Swati"},\r
+       {171,   "su",   "Sundanese"},\r
+       {172,   "sw",   "Swahili"},\r
+       {173,   "sv",   "Swedish"},\r
+       {174,   "ty",   "Tahitian"},\r
+       {175,   "ta",   "Tamil"},\r
+       {176,   "tt",   "Tatar"},\r
+       {177,   "te",   "Telugu"},\r
+       {178,   "tg",   "Tajik"},\r
+       {179,   "tl",   "Tagalog"},\r
+       {180,   "th",   "Thai"},\r
+       {181,   "bo",   "Tibetan"},\r
+       {182,   "ti",   "Tigrinya"},\r
+       {183,   "to",   "Tonga (Tonga Islands)"},\r
+       {184,   "tn",   "Tswana"},\r
+       {185,   "ts",   "Tsonga"},\r
+       {186,   "tk",   "Turkmen"},\r
+       {187,   "tr",   "Turkish"},\r
+       {188,   "tw",   "Twi"},\r
+       {189,   "ug",   "Uighur; Uyghur"},\r
+       {190,   "uk",   "Ukrainian"},\r
+       {191,   "ur",   "Urdu"},\r
+       {192,   "uz",   "Uzbek"},\r
+       {193,   "ve",   "Venda"},\r
+       {194,   "vi",   "Vietnamese"},\r
+       {195,   "vo",   "Volapük"},\r
+       {196,   "cy",   "Welsh"},\r
+       {197,   "wa",   "Walloon"},\r
+       {198,   "wo",   "Wolof"},\r
+       {199,   "xh",   "Xhosa"},\r
+       {200,   "yi",   "Yiddish"},\r
+       {201,   "yo",   "Yoruba"},\r
+       {202,   "za",   "Zhuang; Chuang"},\r
+       {203,   "zh",   "Chinese"},\r
+       {204,   "zu",   "Zulu"}\r
+       };\r
+/*-----------------------------------------------------------------------------------*/ \r
+static char CURRENTLANGUAGESTRING[LengthAlpha2code]="en";\r
+static int  CURRENTLANGUAGECODE=45;\r
+/*-----------------------------------------------------------------------------------*/ \r
+static BOOL LanguageIsOK(char *lang);\r
+static int FindLanguageCode(char *lang);\r
+static BOOL setlanguagecode(char *lang);\r
+/*-----------------------------------------------------------------------------------*/ \r
+BOOL setlanguage(char *lang)\r
+{\r
+       BOOL bOK=FALSE;\r
+       if (lang)\r
+       {\r
+               if ( LanguageIsOK(lang) )\r
+               {\r
+                       strcpy(CURRENTLANGUAGESTRING,lang);\r
+                       setlanguagecode(lang);\r
+                       bOK=TRUE;\r
+               }\r
+       }\r
+       return bOK;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+char *getlanguage(void)\r
+{\r
+       char *RetLanguage=NULL;\r
+\r
+       RetLanguage=(char*)MALLOC(sizeof(char)*(strlen(CURRENTLANGUAGESTRING)+1));\r
+       strcpy(RetLanguage,CURRENTLANGUAGESTRING);\r
+\r
+       return RetLanguage;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int getcurrentlanguagecode(void)\r
+{\r
+       return CURRENTLANGUAGECODE;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+static BOOL LanguageIsOK(char *lang)\r
+{\r
+       BOOL bOK=FALSE;\r
+       int i=0;\r
+\r
+       for (i=0;i<NumberLanguages;i++)\r
+       {\r
+               if (strcmp(lang,TabLanguages[i].alpha2code)==0)\r
+               {\r
+                       bOK=TRUE;\r
+                       return bOK;\r
+               }\r
+       }\r
+       return bOK;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+static int FindLanguageCode(char *lang)\r
+{\r
+       int Code=-1;\r
+       int i=0;\r
+\r
+       for (i=0;i<NumberLanguages;i++)\r
+       {\r
+               if (strcmp(lang,TabLanguages[i].alpha2code)==0)\r
+               {\r
+                       Code=TabLanguages[i].code;\r
+                       return Code;\r
+               }\r
+       }\r
+       return Code;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+static BOOL setlanguagecode(char *lang)\r
+{\r
+       BOOL bOK=FALSE;\r
+       int tmpCode=FindLanguageCode(lang);\r
+       \r
+       if (tmpCode>0) \r
+       {\r
+               CURRENTLANGUAGECODE=tmpCode;\r
+               bOK=TRUE;\r
+       }\r
+       return bOK;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
index 5a9e826..e5f7ad2 100644 (file)
@@ -9,7 +9,6 @@
 #endif
 #include "gw_time.h"
 /*-----------------------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------------------*/ 
 static intTimeTable Tab[]={
     {C2F(sci_getdate),"getdate"},
        {C2F(sci_calendar),"Calendar"},