ferret 0.10.8 → 0.10.9

data/ext/index.c

@@ -4809,7 +4809,7 @@ static int sm_append_postings(SegmentMerger *sm, SegmentMergeInfo **matches,
             }
 
             /* copy position deltas */
-            is2os_copy_bytes(STDE(tde)->prx_in, sm->prx_out, freq);
+            is2os_copy_vints(STDE(tde)->prx_in, sm->prx_out, freq);
         }
     }
     return df;

data/ext/q_parser.c

@@ -349,18 +349,18 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  38
+#define YYFINAL  39
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   98
+#define YYLAST   126
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  26
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  16
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  50
+#define YYNRULES  51
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  79
+#define YYNSTATES  80
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -407,11 +407,11 @@ static const unsigned char yytranslate[] =
 static const unsigned char yyprhs[] =
 {
        0,     0,     3,     4,     6,     8,    12,    16,    19,    22,
-      25,    27,    29,    33,    35,    39,    41,    43,    45,    47,
-      49,    53,    56,    58,    59,    64,    65,    66,    72,    74,
-      78,    82,    88,    91,    96,    98,   101,   104,   108,   112,
-     117,   122,   127,   132,   136,   140,   144,   148,   151,   155,
-     159
+      25,    27,    29,    33,    35,    38,    42,    44,    46,    48,
+      50,    52,    56,    59,    61,    62,    67,    68,    69,    75,
+      77,    81,    85,    91,    94,    99,   101,   104,   107,   111,
+     115,   120,   125,   130,   135,   139,   143,   147,   151,   154,
+     158,   162
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -420,31 +420,31 @@ static const yysigned_char yyrhs[] =
       27,     0,    -1,    -1,    28,    -1,    29,    -1,    28,     7,
       29,    -1,    28,     6,    29,    -1,    28,    29,    -1,     9,
       30,    -1,     8,    30,    -1,    30,    -1,    31,    -1,    31,
-      12,     3,    -1,    32,    -1,    13,    28,    14,    -1,    34,
-      -1,    39,    -1,    41,    -1,    33,    -1,     3,    -1,     3,
-      15,     3,    -1,     3,    15,    -1,     4,    -1,    -1,    38,
-      10,    31,    35,    -1,    -1,    -1,    16,    36,    10,    31,
-      37,    -1,     3,    -1,    38,    17,     3,    -1,    18,    40,
-      18,    -1,    18,    40,    18,    15,     3,    -1,    18,    18,
-      -1,    18,    18,    15,     3,    -1,     3,    -1,    19,    20,
-      -1,    40,     3,    -1,    40,    19,    20,    -1,    40,    17,
-       3,    -1,    21,     3,     3,    22,    -1,    21,     3,     3,
-      23,    -1,    24,     3,     3,    22,    -1,    24,     3,     3,
-      23,    -1,    19,     3,    23,    -1,    19,     3,    22,    -1,
-      21,     3,    20,    -1,    24,     3,    20,    -1,    19,     3,
-      -1,    19,    25,     3,    -1,    20,    25,     3,    -1,    20,
-       3,    -1
+      12,     3,    -1,    32,    -1,    13,    14,    -1,    13,    28,
+      14,    -1,    34,    -1,    39,    -1,    41,    -1,    33,    -1,
+       3,    -1,     3,    15,     3,    -1,     3,    15,    -1,     4,
+      -1,    -1,    38,    10,    31,    35,    -1,    -1,    -1,    16,
+      36,    10,    31,    37,    -1,     3,    -1,    38,    17,     3,
+      -1,    18,    40,    18,    -1,    18,    40,    18,    15,     3,
+      -1,    18,    18,    -1,    18,    18,    15,     3,    -1,     3,
+      -1,    19,    20,    -1,    40,     3,    -1,    40,    19,    20,
+      -1,    40,    17,     3,    -1,    21,     3,     3,    22,    -1,
+      21,     3,     3,    23,    -1,    24,     3,     3,    22,    -1,
+      24,     3,     3,    23,    -1,    19,     3,    23,    -1,    19,
+       3,    22,    -1,    21,     3,    20,    -1,    24,     3,    20,
+      -1,    19,     3,    -1,    19,    25,     3,    -1,    20,    25,
+       3,    -1,    20,     3,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned char yyrline[] =
 {
        0,   102,   102,   103,   105,   106,   107,   108,   110,   111,
-     112,   114,   115,   117,   118,   119,   120,   121,   122,   124,
-     125,   126,   128,   130,   130,   132,   132,   132,   135,   136,
-     138,   139,   140,   141,   143,   144,   145,   146,   147,   149,
+     112,   114,   115,   117,   118,   119,   120,   121,   122,   123,
+     125,   126,   127,   129,   131,   131,   133,   133,   133,   136,
+     137,   139,   140,   141,   142,   144,   145,   146,   147,   148,
      150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160
+     160,   161
 };
 #endif
 
@@ -476,22 +476,22 @@ static const unsigned short int yytoknum[] =
 static const unsigned char yyr1[] =
 {
        0,    26,    27,    27,    28,    28,    28,    28,    29,    29,
-      29,    30,    30,    31,    31,    31,    31,    31,    31,    32,
-      32,    32,    33,    35,    34,    36,    37,    34,    38,    38,
-      39,    39,    39,    39,    40,    40,    40,    40,    40,    41,
+      29,    30,    30,    31,    31,    31,    31,    31,    31,    31,
+      32,    32,    32,    33,    35,    34,    36,    37,    34,    38,
+      38,    39,    39,    39,    39,    40,    40,    40,    40,    40,
       41,    41,    41,    41,    41,    41,    41,    41,    41,    41,
-      41
+      41,    41
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
        0,     2,     0,     1,     1,     3,     3,     2,     2,     2,
-       1,     1,     3,     1,     3,     1,     1,     1,     1,     1,
-       3,     2,     1,     0,     4,     0,     0,     5,     1,     3,
-       3,     5,     2,     4,     1,     2,     2,     3,     3,     4,
-       4,     4,     4,     3,     3,     3,     3,     2,     3,     3,
-       2
+       1,     1,     3,     1,     2,     3,     1,     1,     1,     1,
+       1,     3,     2,     1,     0,     4,     0,     0,     5,     1,
+       3,     3,     5,     2,     4,     1,     2,     2,     3,     3,
+       4,     4,     4,     4,     3,     3,     3,     3,     2,     3,
+       3,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -499,76 +499,82 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-       2,    19,    22,     0,     0,     0,    25,     0,     0,     0,
-       0,     0,     0,     3,     4,    10,    11,    13,    18,    15,
-       0,    16,    17,    21,     9,     8,     0,     0,    34,    32,
-       0,     0,    47,     0,    50,     0,     0,     0,     1,     0,
-       0,     7,     0,     0,     0,    20,    14,     0,     0,    35,
-      36,     0,    30,     0,    44,    43,    48,    49,     0,    45,
-       0,    46,     6,     5,    12,    23,    29,    26,    33,    38,
-       0,    37,    39,    40,    41,    42,    24,    27,    31
+       2,    20,    23,     0,     0,     0,    26,     0,     0,     0,
+       0,     0,     0,     3,     4,    10,    11,    13,    19,    16,
+       0,    17,    18,    22,     9,     8,    14,     0,     0,    35,
+      33,     0,     0,    48,     0,    51,     0,     0,     0,     1,
+       0,     0,     7,     0,     0,     0,    21,    15,     0,     0,
+      36,    37,     0,    31,     0,    45,    44,    49,    50,     0,
+      46,     0,    47,     6,     5,    12,    24,    30,    27,    34,
+      39,     0,    38,    40,    41,    42,    43,    25,    28,    32
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const yysigned_char yydefgoto[] =
 {
-      -1,    12,    13,    14,    15,    16,    17,    18,    19,    76,
-      27,    77,    20,    21,    31,    22
+      -1,    12,    13,    14,    15,    16,    17,    18,    19,    77,
+      28,    78,    20,    21,    32,    22
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -32
+#define YYPACT_NINF -30
 static const yysigned_char yypact[] =
 {
-      44,    75,   -32,    63,    63,    44,   -32,    55,    -2,    -1,
-       0,     3,    11,    25,   -32,   -32,    18,   -32,   -32,   -32,
-      76,   -32,   -32,    33,   -32,   -32,     1,    32,   -32,    41,
-      39,    52,    17,    58,   -32,    69,    15,    34,   -32,    44,
-      44,   -32,    72,    63,    77,   -32,   -32,    63,    88,   -32,
-     -32,    91,    80,    78,   -32,   -32,   -32,   -32,    28,   -32,
-      66,   -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
-      93,   -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32
+      83,    -4,   -30,   102,   102,    64,   -30,     7,    -2,    -1,
+       6,    15,    31,    45,   -30,   -30,    29,   -30,   -30,   -30,
+      -5,   -30,   -30,    40,   -30,   -30,   -30,    26,    47,   -30,
+      55,    42,    19,   -15,    68,   -30,    71,     0,     1,   -30,
+      83,    83,   -30,    72,   102,    73,   -30,   -30,   102,    76,
+     -30,   -30,    78,    74,    70,   -30,   -30,   -30,   -30,    -6,
+     -30,    33,   -30,   -30,   -30,   -30,   -30,   -30,   -30,   -30,
+     -30,    90,   -30,   -30,   -30,   -30,   -30,   -30,   -30,   -30
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yysigned_char yypgoto[] =
 {
-     -32,   -32,    92,   -13,    74,   -31,   -32,   -32,   -32,   -32,
-     -32,   -32,   -32,   -32,   -32,   -32
+     -30,   -30,    89,   -13,    56,   -29,   -30,   -30,   -30,   -30,
+     -30,   -30,   -30,   -30,   -30,   -30
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -29
+#define YYTABLE_NINF -30
 static const yysigned_char yytable[] =
 {
-      41,    32,    34,    36,     1,     2,    37,    39,    40,     3,
-       4,    38,    65,    41,     5,    46,    67,     6,    58,     7,
-       8,     9,    10,    33,    35,    11,    62,    63,     1,     2,
-      42,    39,    40,     3,     4,    59,    45,    60,     5,    54,
-      55,     6,    47,     7,     8,     9,    10,     1,     2,    11,
-      72,    73,     3,     4,    61,    50,    48,     5,    28,    49,
-       6,    56,     7,     8,     9,    10,     1,     2,    11,    51,
-      52,    53,    57,    29,    30,    64,     5,    24,    25,     6,
-      66,     7,     8,     9,    10,   -28,    43,    11,    74,    75,
-      23,    68,   -28,    44,    69,    70,    78,    26,    71
+      42,    33,    35,    59,    61,    44,   -29,    55,    56,    37,
+      29,    23,    45,   -29,    42,    66,    73,    74,    38,    68,
+      60,    62,    51,    34,    36,    30,    31,    63,    64,     1,
+       2,    39,    40,    41,     3,     4,    52,    53,    54,     5,
+      47,    43,     6,    46,     7,     8,     9,    10,     1,     2,
+      11,    40,    41,     3,     4,    75,    76,    48,     5,    24,
+      25,     6,    50,     7,     8,     9,    10,     1,     2,    11,
+      49,    57,     3,     4,    58,    65,    67,     5,    26,    69,
+       6,    70,     7,     8,     9,    10,     1,     2,    11,    71,
+      72,     3,     4,    79,    27,     0,     5,     0,     0,     6,
+       0,     7,     8,     9,    10,     1,     2,    11,     0,     0,
+       0,     0,     0,     0,     0,     5,     0,     0,     6,     0,
+       7,     8,     9,    10,     0,     0,    11
 };
 
-static const unsigned char yycheck[] =
+static const yysigned_char yycheck[] =
 {
-      13,     3,     3,     3,     3,     4,     3,     6,     7,     8,
-       9,     0,    43,    26,    13,    14,    47,    16,     3,    18,
-      19,    20,    21,    25,    25,    24,    39,    40,     3,     4,
-      12,     6,     7,     8,     9,    20,     3,     3,    13,    22,
-      23,    16,    10,    18,    19,    20,    21,     3,     4,    24,
-      22,    23,     8,     9,    20,     3,    15,    13,     3,    20,
-      16,     3,    18,    19,    20,    21,     3,     4,    24,    17,
-      18,    19,     3,    18,    19,     3,    13,     3,     4,    16,
-       3,    18,    19,    20,    21,    10,    10,    24,    22,    23,
-      15,     3,    17,    17,     3,    15,     3,     5,    20
+      13,     3,     3,     3,     3,    10,    10,    22,    23,     3,
+       3,    15,    17,    17,    27,    44,    22,    23,     3,    48,
+      20,    20,     3,    25,    25,    18,    19,    40,    41,     3,
+       4,     0,     6,     7,     8,     9,    17,    18,    19,    13,
+      14,    12,    16,     3,    18,    19,    20,    21,     3,     4,
+      24,     6,     7,     8,     9,    22,    23,    10,    13,     3,
+       4,    16,    20,    18,    19,    20,    21,     3,     4,    24,
+      15,     3,     8,     9,     3,     3,     3,    13,    14,     3,
+      16,     3,    18,    19,    20,    21,     3,     4,    24,    15,
+      20,     8,     9,     3,     5,    -1,    13,    -1,    -1,    16,
+      -1,    18,    19,    20,    21,     3,     4,    24,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    13,    -1,    -1,    16,    -1,
+      18,    19,    20,    21,    -1,    -1,    24
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -577,12 +583,12 @@ static const unsigned char yystos[] =
 {
        0,     3,     4,     8,     9,    13,    16,    18,    19,    20,
       21,    24,    27,    28,    29,    30,    31,    32,    33,    34,
-      38,    39,    41,    15,    30,    30,    28,    36,     3,    18,
-      19,    40,     3,    25,     3,    25,     3,     3,     0,     6,
-       7,    29,    12,    10,    17,     3,    14,    10,    15,    20,
-       3,    17,    18,    19,    22,    23,     3,     3,     3,    20,
-       3,    20,    29,    29,     3,    31,     3,    31,     3,     3,
-      15,    20,    22,    23,    22,    23,    35,    37,     3
+      38,    39,    41,    15,    30,    30,    14,    28,    36,     3,
+      18,    19,    40,     3,    25,     3,    25,     3,     3,     0,
+       6,     7,    29,    12,    10,    17,     3,    14,    10,    15,
+      20,     3,    17,    18,    19,    22,    23,     3,     3,     3,
+      20,     3,    20,    29,    29,     3,    31,     3,    31,     3,
+       3,    15,    20,    22,    23,    22,    23,    35,    37,     3
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1303,77 +1309,77 @@ yyreduce:
 
   case 14:
 #line 118 "src/q_parser.y"
-    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); }
+    { (yyval.query) = bq_new(true); }
     break;
 
-  case 19:
-#line 124 "src/q_parser.y"
-    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); }
+  case 15:
+#line 119 "src/q_parser.y"
+    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); }
     break;
 
   case 20:
 #line 125 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-2].str), (yyvsp[0].str))); }
+    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); }
     break;
 
   case 21:
 #line 126 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-1].str), NULL)); }
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-2].str), (yyvsp[0].str))); }
     break;
 
   case 22:
-#line 128 "src/q_parser.y"
-    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); }
+#line 127 "src/q_parser.y"
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-1].str), NULL)); }
     break;
 
   case 23:
-#line 130 "src/q_parser.y"
-    { qp->fields = qp->def_fields; }
+#line 129 "src/q_parser.y"
+    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); }
     break;
 
   case 24:
 #line 131 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+    { qp->fields = qp->def_fields; }
     break;
 
   case 25:
 #line 132 "src/q_parser.y"
-    { qp->fields = qp->all_fields; }
+    { (yyval.query) = (yyvsp[-1].query); }
     break;
 
   case 26:
-#line 132 "src/q_parser.y"
-    {qp->fields = qp->def_fields;}
+#line 133 "src/q_parser.y"
+    { qp->fields = qp->all_fields; }
     break;
 
   case 27:
 #line 133 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+    {qp->fields = qp->def_fields;}
     break;
 
   case 28:
-#line 135 "src/q_parser.y"
-    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); }
+#line 134 "src/q_parser.y"
+    { (yyval.query) = (yyvsp[-1].query); }
     break;
 
   case 29:
 #line 136 "src/q_parser.y"
-    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));}
+    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); }
     break;
 
   case 30:
-#line 138 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); }
+#line 137 "src/q_parser.y"
+    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));}
     break;
 
   case 31:
 #line 139 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); }
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); }
     break;
 
   case 32:
 #line 140 "src/q_parser.y"
-    { (yyval.query) = NULL; }
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); }
     break;
 
   case 33:
@@ -1382,87 +1388,92 @@ yyreduce:
     break;
 
   case 34:
-#line 143 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); }
+#line 142 "src/q_parser.y"
+    { (yyval.query) = NULL; }
     break;
 
   case 35:
 #line 144 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word(NULL); }
+    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); }
     break;
 
   case 36:
 #line 145 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); }
+    { (yyval.phrase) = ph_first_word(NULL); }
     break;
 
   case 37:
 #line 146 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); }
+    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); }
     break;
 
   case 38:
 #line 147 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  }
+    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); }
     break;
 
   case 39:
-#line 149 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); }
+#line 148 "src/q_parser.y"
+    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  }
     break;
 
   case 40:
 #line 150 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); }
     break;
 
   case 41:
 #line 151 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); }
     break;
 
   case 42:
 #line 152 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); }
     break;
 
   case 43:
 #line 153 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); }
     break;
 
   case 44:
 #line 154 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, false)); }
     break;
 
   case 45:
 #line 155 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, true)); }
     break;
 
   case 46:
 #line 156 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,true,  false)); }
     break;
 
   case 47:
 #line 157 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,false, false)); }
     break;
 
   case 48:
 #line 158 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, false)); }
     break;
 
   case 49:
 #line 159 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[0].str),  NULL,true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, true)); }
     break;
 
   case 50:
 #line 160 "src/q_parser.y"
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[0].str),  NULL,true,  false)); }
+    break;
+
+  case 51:
+#line 161 "src/q_parser.y"
     { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[0].str),  NULL,false, false)); }
     break;
 
@@ -1471,7 +1482,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1475 "y.tab.c"
+#line 1486 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1739,7 +1750,7 @@ yyreturn:
 }
 
 
-#line 162 "src/q_parser.y"
+#line 163 "src/q_parser.y"
 
 
 const char *special_char = "&:()[]{}!\"~^|<>=*?+-";

data/ext/r_index.c

@@ -1233,6 +1233,14 @@ frt_iw_get_doc_count(VALUE self)
     return INT2FIX(iw_doc_count(iw));
 }
 
+static char *
+nstrdup(const char *str, int len)
+{
+    char *new = ALLOC_N(char, len + 1);
+    memcpy(new, str, len + 1);
+    return new;
+}
+
 static int
 frt_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
 {
@@ -1266,17 +1274,25 @@ frt_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
             case T_ARRAY:
                 {
                     int i;
+                    df->destroy_data = true;
                     for (i = 0; i < RARRAY(value)->len; i++) {
                         val = rb_obj_as_string(RARRAY(value)->ptr[i]);
                         df_add_data_len(df,
-                                        RSTRING(val)->ptr,
+                                        nstrdup(RSTRING(val)->ptr,
+                                                RSTRING(val)->len),
                                         RSTRING(val)->len);
                     }
                 }
                 break;
+            case T_STRING:
+                df_add_data_len(df, RSTRING(value)->ptr, RSTRING(value)->len);
+                break;
             default:
                 val = rb_obj_as_string(value);
-                df_add_data_len(df, RSTRING(val)->ptr, RSTRING(val)->len);
+                df->destroy_data = true;
+                df_add_data_len(df,
+                                nstrdup(RSTRING(val)->ptr, RSTRING(val)->len),
+                                RSTRING(val)->len);
                 break;
         }
         doc_add_field(doc, df);
@@ -1303,10 +1319,12 @@ frt_get_doc(VALUE rdoc)
             {
                 int i;
                 df = df_new("content");
+                df->destroy_data = true;
                 for (i = 0; i < RARRAY(rdoc)->len; i++) {
                     val = rb_obj_as_string(RARRAY(rdoc)->ptr[i]);
                     df_add_data_len(df,
-                                    RSTRING(val)->ptr,
+                                    nstrdup(RSTRING(val)->ptr,
+                                            RSTRING(val)->len),
                                     RSTRING(val)->len);
                 }
                 doc_add_field(doc, df);
@@ -1317,11 +1335,17 @@ frt_get_doc(VALUE rdoc)
             doc_add_field(doc, df);
             break;
         case T_STRING:
+            df = df_add_data_len(df_new("content"), RSTRING(rdoc)->ptr,
+                                 RSTRING(rdoc)->len);
+            doc_add_field(doc, df);
+            break;
         default:
             val = rb_obj_as_string(rdoc);
             df = df_add_data_len(df_new("content"),
-                                 RSTRING(val)->ptr,
+                                 nstrdup(RSTRING(val)->ptr,
+                                         RSTRING(val)->len),
                                  RSTRING(val)->len);
+            df->destroy_data = true;
             doc_add_field(doc, df);
             break;
     }
@@ -2247,7 +2271,7 @@ frt_ir_is_latest(VALUE self)
  *     index_reader.term_vector(doc_id, field) -> TermVector
  *
  *  Return the TermVector for the field +field+ in the document at +doc_id+ in
- *  the index. See TermVector.
+ *  the index. Return nil of no such term_vector exists. See TermVector.
  */
 static VALUE
 frt_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
@@ -2256,9 +2280,14 @@ frt_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
     TermVector *tv;
     VALUE rtv;
     tv = ir->term_vector(ir, FIX2INT(rdoc_id), frt_field(rfield));
-    rtv = frt_get_tv(tv);
-    tv_destroy(tv);
-    return rtv;
+    if (tv) {
+        rtv = frt_get_tv(tv);
+        tv_destroy(tv);
+        return rtv;
+    }
+    else {
+        return Qnil;
+    }
 }
 
 static void

data/ext/r_store.c

@@ -21,8 +21,8 @@ frt_unwrap_locks(Store *store)
     for (i = 0; i < store->locks->size; i++) {
         void *lock = store->locks->elems[i];
         VALUE rlock = object_get(lock);
-        object_del(lock);
         if (rlock != Qnil) {
+            object_del(lock);
             Frt_Unwrap_Struct(rlock);
         }
     }

data/lib/ferret/index.rb

@@ -91,7 +91,7 @@ module Ferret::Index
       end
 
       if (fi = options[:field_infos]).is_a?(String)
-        options[:field_infos] = FieldInfos.load(options[:field_infos])
+        options[:field_infos] = FieldInfos.load(fi)
       end
 
       @close_dir = options[:close_dir]
@@ -103,7 +103,8 @@ module Ferret::Index
         begin
           @dir = FSDirectory.new(options[:path], options[:create])
         rescue IOError => io
-          @dir = FSDirectory.new(options[:path], options[:create_if_missing])
+          @dir = FSDirectory.new(options[:path],
+                                 options[:create_if_missing] != false)
         end
       elsif options[:dir]
         @dir = options[:dir]
@@ -220,7 +221,6 @@ module Ferret::Index
       ensure_writer_open()
       return @writer
     end
-    protected :reader, :writer, :searcher
 
     # Adds a document to this index, using the provided analyzer instead of
     # the local analyzer if provided.  If the document contains more than

data/lib/ferret_version.rb

@@ -1,3 +1,3 @@
 module Ferret
-  VERSION = '0.10.8'
+  VERSION = '0.10.9'
 end

data/test/unit/query_parser/tc_query_parser.rb

@@ -195,8 +195,8 @@ class QueryParserTest < Test::Unit::TestCase
 
     pairs = [
       ['::*word', 'word'],
-      ['()*&)(*^&*(', ''],
-      ['()*&one)(*two(*&"', '"one two"~1']
+      ['::*&)(*^&*(', ''],
+      ['::*&one)(*two(*&"', '"one two"~1']
     ]
       
     pairs.each do |query_str, expected|

data/test/unit/utils/tc_number_tools.rb

@@ -95,12 +95,12 @@ class NumberToolsTest < Test::Unit::TestCase
 
   def test_date_time_to_s_lex
     10.times do
-      d1 = DateTime.strptime("#{rand(2200)}-#{rand(12)+1}-#{rand(28)+1} "+
-                             "#{rand(24)}:#{rand(60)}:#{rand(60)}",
-                             "%Y-%m-%d %H:%M:%S")
-      d2 = DateTime.strptime("#{rand(2200)}-#{rand(12)+1}-#{rand(28)+1} "+
-                             "#{rand(24)}:#{rand(60)}:#{rand(60)}",
-                             "%Y-%m-%d %H:%M:%S")
+      d1 = "#{rand(600) + 1600}-#{rand(12)+1}-#{rand(28)+1} " +
+           "#{rand(24)}:#{rand(60)}:#{rand(60)}"
+      d2 = "#{rand(600) + 1600}-#{rand(12)+1}-#{rand(28)+1} " +
+           "#{rand(24)}:#{rand(60)}:#{rand(60)}"
+      d1 = DateTime.strptime(d1, "%Y-%m-%d %H:%M:%S")
+      d2 = DateTime.strptime(d2, "%Y-%m-%d %H:%M:%S")
       assert_equal(d1.to_s, d1.to_s_lex(:second).to_date_time_lex.to_s)
       assert_equal(d2.to_s, d2.to_s_lex(:second).to_date_time_lex.to_s)
       [:year, :month, :day, :hour, :minute, :second].each do |prec|

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.10.8
-date: 2006-09-25 00:00:00 +09:00
+  version: 0.10.9
+date: 2006-09-27 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
 - lib