* Fixed Bug.

[modchxj/mod_chxj.git] / src / chxj_specified_device.c

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index ad9cdba..68a97a7 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005-2011 Atsushi Konno All rights reserved.
  * Copyright (C) 2005 QSDN,Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 #include "mod_chxj.h"
+#include "chxj_add_device_env.h"
 
 static device_table  UNKNOWN_DEVICE      = {
   .next = NULL,
@@ -71,52 +72,76 @@ chxj_specified_device(request_rec *r, const char *user_agent)
   ap_regmatch_t        match[10];
   device_table         *returnType = &UNKNOWN_DEVICE;
   device_table_list    *dtl;
-  device_table         *dt;
   mod_chxj_config      *conf; 
+  mod_chxj_req_config  *request_conf; 
   char                 *device_id;
 
-  if (! user_agent) 
+  DBG(r,"REQ[%x] start %s()", TO_ADDR(r), __func__ );
+
+  if (! user_agent) {
+    DBG(r,"REQ[%x] end %s() (User-Agent is NULL)", TO_ADDR(r),__func__);
     return returnType;
-            
+  }
 
-  DBG(r, "REQ[%x] start chxj_specified_device()", (unsigned int)(apr_size_t)r);
+  /*
+   * Get per request config.
+   */
+  request_conf = (mod_chxj_req_config *)chxj_get_module_config(r->request_config, &chxj_module);
+  if (!request_conf) {
+    request_conf = apr_pcalloc(r->pool, sizeof(mod_chxj_req_config));
+    request_conf->spec = NULL;
+    request_conf->user_agent = NULL;
+    request_conf->f = NULL;
+    request_conf->entryp = NULL;
+    chxj_set_module_config(r->request_config, &chxj_module, request_conf);
+  }
+  if (user_agent) {
+    request_conf->user_agent = apr_pstrdup(r->pool, user_agent);
+  }
+  else {
+    request_conf->user_agent = "";
+  }
 
   conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
   if (! conf->devices) {
-    DBG(r, "device_data.xml load failure");
+    ERR(r,"REQ[%X] device_data.xml load failure", TO_ADDR(r));
+    DBG(r,"REQ[%x] end %s()", TO_ADDR(r),__func__);
     return returnType;
   }
 
   for (dtl = conf->devices; dtl; dtl = dtl->next) {
     if (! dtl->pattern) {
-      DBG(r, "pattern is null");
+      /* DBG(r, "REQ[%X] pattern is null", TO_ADDR(r)); */
       continue;
     }
 
-    /* DBG(r, "pattern is [%s]", dtl->pattern); */
+    /* DBG(r, "REQ[%X] pattern is [%s]", TO_ADDR(r), dtl->pattern); */
     if (! dtl->regexp) {
-      DBG(r,"compile failed.");
+      ERR(r,"REQ[%X] compile failed.", TO_ADDR(r));
+      DBG(r,"REQ[%x] end %s()", TO_ADDR(r),__func__);
       return returnType;
     }
 
     if (ap_regexec((const ap_regex_t *)dtl->regexp, user_agent, (apr_size_t)dtl->regexp->re_nsub + 1, match, 0) == 0) {
       device_id = ap_pregsub(r->pool, "$1", user_agent, dtl->regexp->re_nsub + 1, match);
-      DBG(r, "device_id:[%s]", device_id);
+      DBG(r,"REQ[%X] device_id:[%s]", TO_ADDR(r), device_id);
       returnType = s_get_device_data(r, device_id, dtl);
-      DBG(r, "device_id:[%s] is NOT FOUND", device_id);
-
       if (! returnType) {
-        returnType = dtl->tail;
+        if (dtl->tail) {
+          returnType = dtl->tail;
+        }
+        else {
+          returnType = &UNKNOWN_DEVICE;
+        }
       }
-    }
-
-    if (returnType) {
-      DBG(r,"end chxj_specified_device()");
+      request_conf->spec = returnType;
+      DBG(r,"REQ[%X] end %s() (Found User-Agent Type)", TO_ADDR(r),__func__);
       return returnType;
     }
   }
 
-  DBG(r,"end chxj_specified_device()");
+  request_conf->spec = &UNKNOWN_DEVICE;
+  DBG(r,"REQ[%X] end %s() (Not Found User-Agent Type) [%s]",TO_ADDR(r), __func__,user_agent);
 
   return &UNKNOWN_DEVICE;
 }
@@ -128,21 +153,12 @@ s_compar(const void *a, const void *b)
 {
   device_table *aa = *(device_table **)a;
   device_table *bb = *(device_table **)b;
-  return strcasecmp(aa->device_id, bb->device_id);
+  /* Not strcasecmp. for LOAD */
+  return strcmp(aa->device_id, bb->device_id);
 }
 static device_table *
 s_get_device_data(request_rec *r, const char *device_id, device_table_list *dtl)
 {
-#if 0
-  device_table *dt;
-  for (dt = dtl->table; dt; dt = dt->next) {
-    if (strcasecmp(device_id, dt->device_id) == 0) {
-      DBG(r, "device_name:[%s]", dt->device_name);
-      return dt;
-    }
-  }
-  return NULL;
-#else
   device_table dt;
   device_table *_dt;
   dt.device_id = device_id;
@@ -152,7 +168,6 @@ s_get_device_data(request_rec *r, const char *device_id, device_table_list *dtl)
     return *ret;
   }
   return NULL;
-#endif
 }
 /*
  * vim:ts=2 et