Moved api path to /d.

groonga · Oct 23, 2009 · c944e5b · c944e5b
1 parent e1d24b5
commit c944e5b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/lib/ctx.c b/lib/ctx.c
@@ -684,18 +684,15 @@ grn_get_ctype(grn_obj *var)
 
 static void
 get_content_type(grn_ctx *ctx, const char *p, const char *pe,
-                 grn_content_type *ct, const char **name, unsigned int *name_len)
+                 grn_content_type *ct)
 {
   const char *pd = NULL;
-  for (*name = p; p < pe && *p != '?'; p++) {
+  for (; p < pe && *p != '?'; p++) {
     if (*p == '.') {
       pd = p;
-    } else if (*p == '/') {
-      *name = p + 1;
     }
   }
   if (pd && pd < p) {
-    *name_len = pd - *name;
     switch (*++pd) {
     case 'c' :
       if (pd + 3 == p && !memcmp(pd, "css", 3)) {
@@ -745,7 +742,6 @@ get_content_type(grn_ctx *ctx, const char *p, const char *pe,
       break;
     }
   } else {
-    *name_len = p - *name;
     *ct = GRN_CONTENT_JSON;
   }
 }
@@ -771,19 +767,16 @@ grn_ctx_qe_exec_uri(grn_ctx *ctx, const char *str, uint32_t str_size)
     grn_expr_clear_vars(ctx, expr);
   } else {
     grn_obj key;
-    const char *g, *name;
-    unsigned int name_len;
+    const char *g;
     grn_content_type ot;
     GRN_TEXT_INIT(&key, 0);
     p = str;
     e = p + str_size;
     g = grn_text_urldec(ctx, &key, p, e, '?');
-    get_content_type(ctx, GRN_TEXT_VALUE(&key), GRN_BULK_CURR(&key), &ot, &name, &name_len);
-    /* todo :
-    if ((name_len > 2 && name[0] == 'd' && name[1] == '/') &&
-        (expr = grn_ctx_get(ctx, name + 2, name_len - 2)))
-    */
-    if ((expr = grn_ctx_get(ctx, name, name_len))) {
+    get_content_type(ctx, GRN_TEXT_VALUE(&key), GRN_BULK_CURR(&key), &ot);
+    if ((GRN_TEXT_LEN(&key) >= 2 &&
+         GRN_TEXT_VALUE(&key)[0] == 'd' && GRN_TEXT_VALUE(&key)[1] == '/') &&
+        (expr = grn_ctx_get(ctx, GRN_TEXT_VALUE(&key) + 2, GRN_TEXT_LEN(&key) - 2))) {
       while (g < e) {
         GRN_BULK_REWIND(&key);
         g = grn_text_cgidec(ctx, &key, g, e, '=');

diff --git a/resource/admin_html/index.html b/resource/admin_html/index.html
@@ -434,7 +434,7 @@
       if (s.length > 0) {
         cs.empty().removeAttr('disabled');
         $.ajax({
-          url: '/column_list',
+          url: '/d/column_list',
           data: {'table': s.val()},
           dataType: 'json',
           success: function(d) {
@@ -505,7 +505,7 @@
   },
   status: function() {
     $.ajax({
-      url: '/status',
+      url: '/d/status',
       data: {},
       dataType: 'json',
       success: function(d) {
@@ -516,7 +516,7 @@
   },
   update_tablelist: function() {
     $.ajax({
-      url: '/table_list',
+      url: '/d/table_list',
       data: {},
       dataType: 'json',
       success: function(d) {
@@ -564,7 +564,7 @@
   },
   tablelist: function() {
     $.ajax({
-      url: '/table_list',
+      url: '/d/table_list',
       data: {},
       dataType: 'json',
       success: function(d) {
@@ -625,7 +625,7 @@
       d[query_type] = query;
     }
     $.ajax({
-      url: '/select',
+      url: '/d/select',
       data: d,
       dataType: 'json',
       success: function(d) {
@@ -660,7 +660,7 @@
   },
   columnlist: function(table_name) {
     $.ajax({
-      url: '/column_list',
+      url: '/d/column_list',
       data: {'table': table_name},
       dataType: 'json',
       success: function(d) {
@@ -683,7 +683,7 @@
     });
     flags |= Groonga[$('#createtable-key-index').val()];
     $.ajax({
-      url: '/table_create',
+      url: '/d/table_create',
       data: {
         name: $('#createtable-name').val(),
         'flags': flags,
@@ -722,7 +722,7 @@
       d['source'] = $('#createcolumn-source').val();
     }
     $.ajax({
-      url: '/column_create',
+      url: '/d/column_create',
       data: d,
       dataType: 'json',
       success: function(d) {