Changeset 33009

Timestamp:

05/02/09 00:57:51 (4 years ago)

Author:

kawa0117

Message:

Tokyo Dystopia tdserver HEAD method updated

Location:

lang/c/tdserver/trunk

Files:

• Makefile (modified) (1 diff)
• tdserver.c (modified) (5 diffs)

lang/c/tdserver/trunk/Makefile

@@ -1 +1 @@
 # tdserver
 
+TD=../tokyodystopia-0.9.11
+TT=../tokyotyrant-1.1.23
+TC=../tokyocabinet-1.4.17
+
 CC = gcc
-LDENV = LD_RUN_PATH=../tokyodystopia-0.9.11:../tokyotyrant-1.1.23:../tokyocabinet-1.4.17
-CPPFLAGS = -DNDEBUG -D_GNU_SOURCE=1 -I../tokyodystopia-0.9.11 -I../tokyotyrant-1.1.23 -I../tokyocabinet-1.4.17
+LDENV = LD_RUN_PATH=$(TD):$(TT):$(TC)
+CPPFLAGS = -DNDEBUG -D_GNU_SOURCE=1 -I$(TD) -I$(TT) -I$(TC)
 CFLAGS = -g -O2 -std=c99 -Wall -fPIC -fsigned-char -O2
-LDFLAGS = -L../tokyodystopia-0.9.11 -L../tokyotyrant-1.1.23 -L../tokyocabinet-1.4.17
+LDFLAGS = -L$(TD) -L$(TT) -L$(TC)
 LIBS = -ltokyodystopia -ltokyotyrant -ltokyocabinet -lbz2 -lz -lpthread -lm -lc 
 

lang/c/tdserver/trunk/tdserver.c

@@ -469 +469 @@
           int len = strlen(val);
           tcxstrprintf(xstr, "HTTP/1.1 200 OK\r\n");
-          tcxstrprintf(xstr, "Content-Type: text/plain\r\n");
+          tcxstrprintf(xstr, "Content-Type: application/octet-stream\r\n");
           tcxstrprintf(xstr, "Content-Length: %d\r\n", len);
           tcxstrprintf(xstr, "\r\n");
@@ -500 +500 @@
           TCXSTR *bstr = tcxstrnew();
           pthread_cleanup_push((void (*)(void *))tcxstrdel, bstr);
-          tcxstrprintf(bstr, "[");
           for(i = 0; i < rnum; i++){
             if (i>0) tcxstrprintf(bstr, ",");
             tcxstrprintf(bstr, "%d", (int)result[i]);
           }
-          tcxstrprintf(bstr, "]\n");
+          tcxstrprintf(bstr, "\n");
           int len = tcxstrsize(bstr);
 
@@ -566 +565 @@
     }
   }
-  if(*uri == '/') uri++;
-  int ksiz;
-  char *kbuf = tcurldecode(uri, &ksiz);
-  pthread_cleanup_push(free, kbuf);
   TCXSTR *xstr = tcxstrnew();
   pthread_cleanup_push((void (*)(void *))tcxstrdel, xstr);
@@ -577 +572 @@
     ttservlog(g_serv, TTLOGINFO, "do_http_head: forbidden");
   } else {
-
-    int rnum;
-    uint64_t *result = tcidbsearch2(idb, kbuf, &rnum);
-
-    if(result){
-      if(rnum){
-        tcxstrprintf(xstr, "HTTP/1.1 200 OK\r\n");
-        tcxstrprintf(xstr, "Content-Type: application/octet-stream\r\n");
+    if(*uri == '/') uri++;
+    char *query = strstr(uri, "?q=");
+    if(!query) query = strstr(uri, "&q=");
+    if(!query) {
+
+      int ksiz;
+      char *kbuf = tcurldecode(uri, &ksiz);
+      pthread_cleanup_push(free, kbuf);
+      int key = tcatoi(kbuf);
+
+      if(key < 1){
+        tcxstrprintf(xstr, "HTTP/1.1 403 Forbidden\r\n");
         tcxstrprintf(xstr, "\r\n");
       } else {
-        tcxstrprintf(xstr, "HTTP/1.1 404 Not Found\r\n");
+        char *val = tcidbget(idb, key);
+        if(val){
+          tcxstrprintf(xstr, "HTTP/1.1 200 OK\r\n");
+          tcxstrprintf(xstr, "Content-Type: application/octet-stream\r\n");
+          tcxstrprintf(xstr, "\r\n");
+          free(val);
+        } else {
+          tcxstrprintf(xstr, "HTTP/1.1 404 Not Found\r\n");
+          tcxstrprintf(xstr, "\r\n");
+        }
+      }
+      pthread_cleanup_pop(1); // kbuf
+
+    } else {
+      query += strlen("?q=");
+      char *qend = strchr(query, '&');
+      if(qend) *qend = '\0';
+
+      int ksiz;
+      char *kbuf = tcurldecode(query, &ksiz);
+      pthread_cleanup_push(free, kbuf);
+      int rnum;
+      uint64_t *result = tcidbsearch2(idb, kbuf, &rnum);
+
+      if(result){
+        if(rnum){
+          tcxstrprintf(xstr, "HTTP/1.1 200 OK\r\n");
+          tcxstrprintf(xstr, "Content-Type: application/octet-stream\r\n");
+          tcxstrprintf(xstr, "\r\n");
+        } else {
+          tcxstrprintf(xstr, "HTTP/1.1 404 Not Found\r\n");
+          tcxstrprintf(xstr, "\r\n");
+        }
+        free(result);
+      } else {
+        tcxstrprintf(xstr, "HTTP/1.1 500 Internal Server Error\r\n");
         tcxstrprintf(xstr, "\r\n");
       }
-      free(result);
-    } else {
-      tcxstrprintf(xstr, "HTTP/1.1 500 Internal Server Error\r\n");
-      tcxstrprintf(xstr, "\r\n");
+      pthread_cleanup_pop(1); // kbuf
     }
   }
@@ -601 +632 @@
     ttservlog(g_serv, TTLOGINFO, "do_http_head: response failed");
   }
-  pthread_cleanup_pop(1);
-  pthread_cleanup_pop(1);
+  pthread_cleanup_pop(1); // xstr
 }