Switch to unified view

a/src/query/wasatorcl.cpp b/src/query/wasatorcl.cpp
...
...
99
        continue;
99
        continue;
100
    }
100
    }
101
101
102
    // Filtering on location
102
    // Filtering on location
103
    if (!stringicmp("dir", (*it)->m_fieldspec)) {
103
    if (!stringicmp("dir", (*it)->m_fieldspec)) {
104
        sdata->setTopdir((*it)->m_value, (*it)->m_op == WasaQuery::OP_EXCL);
104
        sdata->setTopdir((*it)->m_value, (*it)->m_op == WasaQuery::OP_EXCL,
105
               (*it)->m_weight);
105
        continue;
106
        continue;
106
    } 
107
    } 
107
108
108
    // Handle "date" spec
109
    // Handle "date" spec
109
    if (!stringicmp("date", (*it)->m_fieldspec)) {
110
    if (!stringicmp("date", (*it)->m_fieldspec)) {
...
...
172
        return 0;
173
        return 0;
173
        }
174
        }
174
        if (mods & WasaQuery::WQM_NOSTEM) {
175
        if (mods & WasaQuery::WQM_NOSTEM) {
175
        nclause->setModifiers(Rcl::SearchDataClause::SDCM_NOSTEMMING);
176
        nclause->setModifiers(Rcl::SearchDataClause::SDCM_NOSTEMMING);
176
        }
177
        }
178
      if ((*it)->m_weight != 1.0)
179
      nclause->setWeight((*it)->m_weight);
177
        sdata->addClause(nclause);
180
        sdata->addClause(nclause);
178
    }
181
    }
179
        break;
182
        break;
180
        
183
        
181
    case WasaQuery::OP_EXCL:
184
    case WasaQuery::OP_EXCL:
...
...
201
        LOGERR(("wasaQueryToRcl: out of memory\n"));
204
        LOGERR(("wasaQueryToRcl: out of memory\n"));
202
        return 0;
205
        return 0;
203
        }
206
        }
204
        if ((*it)->m_modifiers & WasaQuery::WQM_NOSTEM)
207
        if ((*it)->m_modifiers & WasaQuery::WQM_NOSTEM)
205
        nclause->setModifiers(Rcl::SearchDataClause::SDCM_NOSTEMMING);
208
        nclause->setModifiers(Rcl::SearchDataClause::SDCM_NOSTEMMING);
209
      if ((*it)->m_weight != 1.0)
210
      nclause->setWeight((*it)->m_weight);
206
        sdata->addClause(nclause);
211
        sdata->addClause(nclause);
207
        break;
212
        break;
208
213
209
    case WasaQuery::OP_OR:
214
    case WasaQuery::OP_OR:
210
        LOGDEB2(("wasaQueryToRcl: OR clause [%s]:[%s]\n", 
215
        LOGDEB2(("wasaQueryToRcl: OR clause [%s]:[%s]\n",