- rpn = ccl_find_str (bibset, buf, &error, &pos);
+ CCL_parser cclp = ccl_parser_create ();
+ struct ccl_token *list;
+
+ cclp->bibset = bibset;
+
+ list = ccl_parser_tokenize (cclp, buf);
+ rpn = ccl_parser_find (cclp, list);
+
+ error = cclp->error_code;
+ if (error)
+ pos = cclp->error_pos - buf;
+