boost_mirror/auto_index
1
0
Fork 0
mirror of https://github.com/boostorg/auto_index.git synced 2025-05-09 23:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test of ID constraint should use regex_match and not regex_search.

Browse Source 
Update tests accordingly and change Jamfile.v2 to match current Trunk.

[SVN r71977]
This commit is contained in:
John Maddock 2011-05-16 11:20:27 +00:00
parent b1325e59ac
commit 8c4fce697e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auto_index.cpp
View File

@ -349,7 +349,7 @@ void process_node(boost::tiny_xml::element_ptr node, node_id* prev, title_info*
// //
std::pair<std::string, std::string> item_index(*pid, i->term); std::pair<std::string, std::string> item_index(*pid, i->term);
if(((no_duplicates == false) || (0 == found_terms.count(item_index))) if(((no_duplicates == false) || (0 == found_terms.count(item_index)))
&& (i->search_id.empty() || regex_search(*pid, i->search_id))) && (i->search_id.empty() || regex_match(*pid, i->search_id)))
{ {
// We have something to index! // We have something to index!
found_terms.insert(item_index); found_terms.insert(item_index);

3
test/Jamfile.v2
View File

@ -10,7 +10,7 @@ import type ;
path-constant local-boost-root : [ modules.peek : BOOST ] ; path-constant local-boost-root : [ modules.peek : BOOST ] ;
alias line_compare_tool : $(local-boost-root)/tools/quickbook/test//line-compare-tool ; alias line_compare_tool : $(local-boost-root)/tools/quickbook/test/src//line-compare-tool ;
rule auto-index-test ( target-name : input-file : output-file ? : options * ) rule auto-index-test ( target-name : input-file : output-file ? : options * )
{ {
@ -68,3 +68,4 @@ auto-index-test test3 : type_traits.docbook : : --internal-index index-type=inde

2
test/index.idx
View File

@ -18,7 +18,9 @@
!rewrite-name "(?:A|An|The)\s+(.*)" "\1" !rewrite-name "(?:A|An|The)\s+(.*)" "\1"
"Constrained Index Term" add_const "boost_typetraits\.reference.*" class_name "Constrained Index Term" add_const "boost_typetraits\.reference.*" class_name
"This term should not appear anywhere because of the ID constraint" strlen "(?!boost_typetraits.background).*" function_name
type-traits "" ".*.intro" test_index_1 type-traits "" ".*.intro" test_index_1
type-traits "" ".*.background" test_index_2 type-traits "" ".*.background" test_index_2