[Groonga-commit] groonga/gcs [master] q: don't use default field

Back to archive index

null+****@clear***** null+****@clear*****
2012年 8月 3日 (金) 22:41:18 JST


Kouhei Sutou	2012-08-03 22:41:18 +0900 (Fri, 03 Aug 2012)

  New Revision: 39ecd308a643684ea7fa23c60df28ff4db24e09b
  https://github.com/groonga/gcs/commit/39ecd308a643684ea7fa23c60df28ff4db24e09b

  Log:
    q: don't use default field

  Modified files:
    lib/q-translator.js
    test/q-translator.test.js

  Modified: lib/q-translator.js (+1 -1)
===================================================================
--- lib/q-translator.js    2012-08-03 22:35:47 +0900 (0ed3dcf)
+++ lib/q-translator.js    2012-08-03 22:41:18 +0900 (ae24750)
@@ -32,7 +32,7 @@ QueryTranslator.prototype = {
       }
       term += this.query[this.offset];
     }
-    return this.defaultField + ":'" + escapeTerm(term) + "'";
+    return "'" + escapeTerm(term) + "'";
   },
   translatePhraseTerm: function() {
     if (this.query[this.offset] != '"') {

  Modified: test/q-translator.test.js (+3 -7)
===================================================================
--- test/q-translator.test.js    2012-08-03 22:35:47 +0900 (718ed74)
+++ test/q-translator.test.js    2012-08-03 22:41:18 +0900 (02e075f)
@@ -10,7 +10,6 @@ function testIndividualTerm(label, individualTerm,
   test('individual term: ' + label + ': ' +
        '<' + individualTerm + '> -> <' + expectedBooleanQuery + '>', function() {
     var translator = new QueryTranslator(individualTerm);
-    translator.defaultField = "field";
     var actualBooleanQuery = translator.translateIndividualTerm();
     assert.deepEqual({
                        booleanQuery: actualBooleanQuery,
@@ -28,7 +27,6 @@ function testPhraseTerm(label, phraseTerm,
   test('phrase term: ' + label + ': ' +
        '<' + phraseTerm + '> -> <' + expectedBooleanQuery + '>', function() {
     var translator = new QueryTranslator(phraseTerm);
-    translator.defaultField = "field";
     var actualBooleanQuery = translator.translatePhraseTerm();
     assert.deepEqual({
                        booleanQuery: actualBooleanQuery,
@@ -45,7 +43,6 @@ function testPhraseTermError(label, phraseTerm, context, detail) {
   test('error: phrase term: ' + label + ': ' +
        '<' + phraseTerm + '>', function() {
     var translator = new QueryTranslator(phraseTerm);
-    translator.defaultField = "field";
     var actualError;
     assert.throw(function() {
       try {
@@ -63,7 +60,6 @@ function testTerm(label, term, expectedOffset, expectedBooleanQuery) {
   test('term: ' + label + ': ' +
        '<' + term + '> -> <' + expectedBooleanQuery + '>', function() {
     var translator = new QueryTranslator(term);
-    translator.defaultField = "field";
     var actualBooleanQuery = translator.translateTerm();
     assert.deepEqual({
                        booleanQuery: actualBooleanQuery,
@@ -80,11 +76,11 @@ suite('QueryTranslator', function() {
   testIndividualTerm("an individual term",
                      "star wars",
                      "star".length,
-                     "field:'star'");
+                     "'star'");
   testIndividualTerm("an individual term: single quote",
                      "let's go",
                      "let's".length,
-                     "field:'let\\'s'");
+                     "'let\\'s'");
 
   testPhraseTerm("no special character",
                  '"star wars" luke',
@@ -110,5 +106,5 @@ suite('QueryTranslator', function() {
   testTerm("a term",
            "  star wars",
            "  star".length,
-           "field:'star'");
+           "'star'");
 });
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Back to archive index