* Use tokenizer function to completely parse accept-lang header.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e11b1c1e2c141d43aa0d590fcc7ef5ae15f86988..c60eb21bb9b365b641e5e1c0747d924b7fabbc49 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Mon Dec 5 18:40:03 CET 2005 dothebart
+* Use tokenizer function to completely parse accept-lang header.
+
 Mon Dec  5 11:47:20 EST 2005 ajc
 * Added in some of the missing localizations
 

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 0f857c390e2faee6a31a99165a3b7583c7aafa51..e0978b2c059b040645ccb84b328237463c23cf60 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -8,59 +8,84 @@ static const char *AvailLang[] = {
        "de_DE"
 };
 
+typedef struct _lang_pref{
+       char lang[16];
+       char region[16];
+       char *match;
+       double Priority;
+} LangStruct;
+
 /* TODO: we skip the language weightening so far. */
 /* Accept-Language: 'de-de,en-us;q=0.7,en;q=0.3' */
+/* Accept-Language: de,en-ph;q=0.8,en-us;q=0.5,de-at;q=0.3 */
 void httplang_to_locale(const char *LocaleString)
 {
        char *locale = "C";
-       char *wanted_locales[10];
+       LangStruct wanted_locales[20];
        int i = 0;
        int j = 0;
        size_t len = strlen(LocaleString);
        int nFound = 0;
-       int nAvail = 1;
+       int nParts;
+       const int nAvail = 1; /* Number of members in AvailLang */
        char *search = (char *) malloc(len);
-       int done = 0;
-       //      char *mo;
-       //      char *webcitdir = WEBCITDIR;
        locale_t my_Locale;
        locale_t my_Empty_Locale;
 
-       //      len = strlen(LocaleString);
        memcpy(search, LocaleString, len);
        search[len] = '\0';
-       /* the web browser sends '-', we need '_' */
-       for (i = 0; i < len; i++)
-               if (search[i] == '-')
-                       search[i] = '_';
-       i = 0;
-       while ( !done && (nFound < 10)) {
-               if ((search[i] == ',') || (search[i] == ';') || (search[i] == '\0'))
-               {
-                       if ((search[i] == ';') || (search[i] == '\0'))
-                               done = 1;
-                       search[i] = '\0';
-                       wanted_locales[nFound] = (char *) &search[j];
-                       j = i + 1;
-                       nFound++;
-               }
+       nParts=num_tokens(search,',');
+       for (i=0; ((i<nParts)&&(i<10)); i++)
+       {
+               char buf[16];
+               char sbuf[16];
+               int blen;
 
-               i++;
+               extract_token(&buf[0],search, 0,',',16);
+               /* we are searching, if this list item has something like ;q=n*/
+               if (num_tokens(&buf[0],'=')>1) {
+                       extract_token(&sbuf[0],&buf[0], 1,'=',16);
+                       wanted_locales[i].Priority=atof(&sbuf[0]);
+               }
+               else {
+                       wanted_locales[i].Priority=1.0;
+               }
+               /* get the locale part */
+               extract_token(&sbuf[0],&buf[0],0,';',16);
+               /* get the lang part, which should be allways there */
+               extract_token(&wanted_locales[i].lang[0],&sbuf[0],0,'-',16);
+               /* get the area code if any. */
+               if (num_tokens(&sbuf[0],'-')>1) {
+                       extract_token(&wanted_locales[i].region[0],&sbuf[0],1,'-',16);
+               }
+               else { /* no ara code? use lang code */
+                       blen=strlen(&wanted_locales[i].lang[0]);
+                       memcpy(&wanted_locales[i].region[0], wanted_locales[i].lang,blen);
+                       wanted_locales[i].region[blen]='\0';
+               } /* area codes are uppercase */
+               blen=strlen(&wanted_locales[i].region[0]);
+               for (j=0; j<blen; j++)
+                       {
+                               int chars=toupper(wanted_locales[i].region[j]);
+                               wanted_locales[i].region[j]=(char)chars;/*todo ?! */
+                       }
        }
-       /* todo: weight  */
 
-       if (nFound > 0) for (i = 0; i <= nFound; i++) {
-               for (j = 0; j < nAvail; j++) {
-                       int ret = strncasecmp(wanted_locales[i],
-                                             AvailLang[j],
-                                             strlen(wanted_locales[i]));
-                       if (!ret) {
-                               locale = (char *) AvailLang[j]; //wanted_locales[i];
-                               i = nFound + 1;
-                               j = nAvail + 1;
-                               continue;
+       /* todo: weight  */
+       if (nFound > 0) {
+               for (i = 0; i <= nFound; i++) {
+                       for (j = 0; j < nAvail; j++) {
+                               int ret = strncasecmp(&wanted_locales[i].lang[0],
+                                                                         AvailLang[j],
+                                                                         strlen(&wanted_locales[i].lang[0]));
+                               if (!ret) {
+                                       locale = (char *) AvailLang[j]; //wanted_locales[i];
+                                       i = nFound + 1;
+                                       j = nAvail + 1;
+                                       continue;
+                               }
+                               
                        }
-
                }
        }
 
@@ -79,3 +104,41 @@ void httplang_to_locale(const char *LocaleString)
 }
 
 #endif
+
+
+/*
+       // the web browser sends '-', we need '_' 
+
+               for (i = 0; i < len; i++)
+               if (search[i] == '-')
+                       search[i] = '_';
+
+       nFound=i;
+       nParts=num_tokens(search,',');
+       if (nParts>0)
+               {
+                       extract_token(prefers,search, 1,';',len);
+                       extract_token(langs,search, 0,';',len);
+               }
+       else
+               {
+                       free(prefers);
+                       prefers=NULL;
+                       memcpy(search, len);
+                       search[len] = '\0';
+               }
+       i = 0;
+       while ( !done && (nFound < 10)) {
+               if ((search[i] == ',') || (search[i] == ';') || (search[i] == '\0'))
+               {
+                       if ((search[i] == ';') || (search[i] == '\0'))
+                               done = 1;
+                       search[i] = '\0';
+                       wanted_locales[nFound] = (char *) &search[j];
+                       j = i + 1;
+                       nFound++;
+               }
+
+               i++;
+       }
+*/