recoll / Code / Diff of /src/rcldb/searchdata.cpp

Diff of /src/rcldb/searchdata.cpp [4dfbc5] .. [132926]

Switch to unified view


...
        Xapian::Query(Xapian::Query::OP_OR, tq, Xapian::Query(term));
    }
    xq = xq.empty() ? tq : Xapian::Query(Xapian::Query::OP_AND_NOT, xq, tq);
    }

    // Add the directory filtering clauses. Each is a phrase of terms
    // prefixed with the pathelt prefix XP
    for (vector<DirSpec>::const_iterator dit = m_dirspecs.begin();
     dit != m_dirspecs.end(); dit++) {
    vector<string> vpath;
    stringToTokens(dit->dir, vpath, "/");

	a/src/rcldb/searchdata.cpp		b/src/rcldb/searchdata.cpp
	...		...
366	Xapian::Query(Xapian::Query::OP_OR, tq, Xapian::Query(term));	366	Xapian::Query(Xapian::Query::OP_OR, tq, Xapian::Query(term));
367	}	367	}
368	xq = xq.empty() ? tq : Xapian::Query(Xapian::Query::OP_AND_NOT, xq, tq);	368	xq = xq.empty() ? tq : Xapian::Query(Xapian::Query::OP_AND_NOT, xq, tq);
369	}	369	}
370		370
371	// Add the directory filtering clause. This is a phrase of terms	371	// Add the directory filtering clauses. Each is a phrase of terms
372	// prefixed with the pathelt prefix XP	372	// prefixed with the pathelt prefix XP
373	for (vector<DirSpec>::const_iterator dit = m_dirspecs.begin();	373	for (vector<DirSpec>::const_iterator dit = m_dirspecs.begin();
374	dit != m_dirspecs.end(); dit++) {	374	dit != m_dirspecs.end(); dit++) {
375	vector<string> vpath;	375	vector<string> vpath;
376	stringToTokens(dit->dir, vpath, "/");	376	stringToTokens(dit->dir, vpath, "/");