groonga/gcs [master] Fix handling of index field options (Groonga-commit) - Groonga - fulltext search engine.

SHIMODA Hiroshi	2012-08-13 17:38:27 +0900 (Mon, 13 Aug 2012)

  New Revision: 1b2aa9de7873183f2040752730c448781e38a403
  https://github.com/groonga/gcs/commit/1b2aa9de7873183f2040752730c448781e38a403

  Log:
    Fix handling of index field options

  Modified files:
    lib/api/2011-02-01/configuration.js

  Modified: lib/api/2011-02-01/configuration.js (+21 -14)
===================================================================

--- lib/api/2011-02-01/configuration.js    2012-08-13 17:33:26 +0900 (57a6c29)
+++ lib/api/2011-02-01/configuration.js    2012-08-13 17:38:27 +0900 (97f9c28)
@@ -15,7 +15,7 @@ function createCommonErrorResponse(errorCode, error) {
     .element('Errors')
       .element('Error')
         .element('Code').text(errorCode).up()
-        .element('Message').text(error.message || error).up()
+        .element('Message').text((error.message || error).toString()).up()
       .up()
     .up()
     .element('RequestID').up();
@@ -113,7 +113,8 @@ handlers.DeleteDomain = function(context, request, response) {
       deleted: true
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -164,7 +165,8 @@ handlers.DescribeDomains = function(context, request, response) {
       hostname: getBaseDomain(request.headers.host)
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -240,22 +242,22 @@ handlers.DefineIndexField = function(context, request, response) {
                          request.query['TextOptions.FacetEnabled'] :
                        fieldType == 'literal' ?
                          request.query['LiteralOptions.FacetEnabled'] :
-                         null ;
-    if (facetEnabled !== null)
+                         undefined ;
+    if (facetEnabled !== undefined)
       field.facetEnabled = facetEnabled.toLowerCase() == 'true';
 
     var resultEnabled = fieldType == 'text' ?
                           request.query['TextOptions.ResultEnabled'] :
                         fieldType == 'literal' ?
                           request.query['LiteralOptions.ResultEnabled'] :
-                          null ;
-    if (resultEnabled !== null)
+                          undefined ;
+    if (resultEnabled !== undefined)
       field.resultEnabled = resultEnabled.toLowerCase() == 'true';
 
     var searchEnabled = fieldType == 'literal' ?
                           request.query['LiteralOptions.SearchEnabled'] :
-                          null ;
-    if (searchEnabled !== null)
+                          undefined ;
+    if (searchEnabled !== undefined)
       field.searchEnabled = searchEnabled.toLowerCase() == 'true';
 
     if (!field.exists()) {
@@ -271,7 +273,8 @@ handlers.DefineIndexField = function(context, request, response) {
       updatedAt: createdAt
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -298,7 +301,8 @@ handlers.DeleteIndexField = function(context, request, response) {
     response.contentType('application/xml');
     response.send(createDeleteIndexFieldResponse({}));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -349,7 +353,8 @@ handlers.DescribeIndexFields = function(context, request, response) {
       fields: fields
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -389,7 +394,8 @@ handlers.IndexDocuments = function(context, request, response) {
       domain: domain
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
@@ -435,7 +441,8 @@ handlers.UpdateSynonymOptions = function(context, request, response) {
       createdAt: updatedAt
     }));
   } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure',
+                                         (error.message || error).toString());
     response.contentType('application/xml');
     response.send(body, 400);
   }
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs [master] Fix handling of index field options