yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

log messages

Browse source
This commit is contained in:
Jean-Francois Dockes 2016-07-14 10:14:01 +02:00
parent 6d683d4ecd
commit 000623b7a5
1 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/utils/conftree.cpp
View file

@ -42,14 +42,15 @@
#include "pathut.h" #include "pathut.h"
#include "smallut.h" #include "smallut.h"
#include "log.h"
using namespace std; using namespace std;
#undef DEBUG #undef DEBUG_CONFTREE
#ifdef DEBUG #ifdef DEBUG_CONFTREE
#define LOGDEB(X) fprintf X #define CONFDEB LOGDEB
#else #else
#define LOGDEB(X) #define CONFDEB LOGDEB2
#endif #endif
static const SimpleRegexp varcomment_rx("[ \t]*#[ \t]*([a-zA-Z0-9]+)[ \t]*=", static const SimpleRegexp varcomment_rx("[ \t]*#[ \t]*([a-zA-Z0-9]+)[ \t]*=",
@ -66,15 +67,14 @@ void ConfSimple::parseinput(istream& input)
for (;;) { for (;;) {
cline.clear(); cline.clear();
std::getline(input, cline); std::getline(input, cline);
LOGDEB((stderr, "Parse:line: [%s] status %d\n", CONFDEB("Parse:line: [" << cline << "] status " << status << "\n");
cline.c_str(), int(status)));
if (!input.good()) { if (!input.good()) {
if (input.bad()) { if (input.bad()) {
LOGDEB((stderr, "Parse: input.bad()\n")); CONFDEB("Parse: input.bad()\n");
status = STATUS_ERROR; status = STATUS_ERROR;
return; return;
} }
LOGDEB((stderr, "Parse: eof\n")); CONFDEB("Parse: eof\n");
// Must be eof ? But maybe we have a partial line which // Must be eof ? But maybe we have a partial line which
// must be processed. This happens if the last line before // must be processed. This happens if the last line before
// eof ends with a backslash, or there is no final \n // eof ends with a backslash, or there is no final \n
@ -338,8 +338,7 @@ int ConfSimple::set(const std::string& nm, const std::string& value,
if (status != STATUS_RW) { if (status != STATUS_RW) {
return 0; return 0;
} }
LOGDEB((stderr, "ConfSimple::set [%s]:[%s] -> [%s]\n", sk.c_str(), CONFDEB("ConfSimple::set ["<<sk<< "]:[" << nm << "] -> [" << value << "]\n");
nm.c_str(), value.c_str()));
if (!i_set(nm, value, sk)) { if (!i_set(nm, value, sk)) {
return 0; return 0;
} }
@ -358,18 +357,18 @@ int ConfSimple::set(const string& nm, long long val,
int ConfSimple::i_set(const std::string& nm, const std::string& value, int ConfSimple::i_set(const std::string& nm, const std::string& value,
const string& sk, bool init) const string& sk, bool init)
{ {
LOGDEB((stderr, "ConfSimple::i_set: nm[%s] val[%s] key[%s], init %d\n", CONFDEB("ConfSimple::i_set: nm[" << nm << "] val[" << value <<
nm.c_str(), value.c_str(), sk.c_str(), init)); "] key[" << sk << "], init " << init << "\n");
// Values must not have embedded newlines // Values must not have embedded newlines
if (value.find_first_of("\n\r") != string::npos) { if (value.find_first_of("\n\r") != string::npos) {
LOGDEB((stderr, "ConfSimple::i_set: LF in value\n")); CONFDEB("ConfSimple::i_set: LF in value\n");
return 0; return 0;
} }
bool existing = false; bool existing = false;
map<string, map<string, string> >::iterator ss; map<string, map<string, string> >::iterator ss;
// Test if submap already exists, else create it, and insert variable: // Test if submap already exists, else create it, and insert variable:
if ((ss = m_submaps.find(sk)) == m_submaps.end()) { if ((ss = m_submaps.find(sk)) == m_submaps.end()) {
LOGDEB((stderr, "ConfSimple::i_set: new submap\n")); CONFDEB("ConfSimple::i_set: new submap\n");
map<string, string> submap; map<string, string> submap;
submap[nm] = value; submap[nm] = value;
m_submaps[sk] = submap; m_submaps[sk] = submap;
@ -398,7 +397,7 @@ int ConfSimple::i_set(const std::string& nm, const std::string& value,
// If the variable already existed, no need to change the m_order data // If the variable already existed, no need to change the m_order data
if (existing) { if (existing) {
LOGDEB((stderr, "ConfSimple::i_set: existing var: no order update\n")); CONFDEB("ConfSimple::i_set: existing var: no order update\n");
return 1; return 1;
} }
@ -406,7 +405,7 @@ int ConfSimple::i_set(const std::string& nm, const std::string& value,
if (init) { if (init) {
// During the initial construction, just append: // During the initial construction, just append:
LOGDEB((stderr, "ConfSimple::i_set: init true: append\n")); CONFDEB("ConfSimple::i_set: init true: append\n");
m_order.push_back(ConfLine(ConfLine::CFL_VAR, nm)); m_order.push_back(ConfLine(ConfLine::CFL_VAR, nm));
return 1; return 1;
} }
@ -418,7 +417,7 @@ int ConfSimple::i_set(const std::string& nm, const std::string& value,
vector<ConfLine>::iterator start, fin; vector<ConfLine>::iterator start, fin;
if (sk.empty()) { if (sk.empty()) {
start = m_order.begin(); start = m_order.begin();
LOGDEB((stderr, "ConfSimple::i_set: null sk, start at top of order\n")); CONFDEB("ConfSimple::i_set: null sk, start at top of order\n");
} else { } else {
start = find(m_order.begin(), m_order.end(), start = find(m_order.begin(), m_order.end(),
ConfLine(ConfLine::CFL_SK, sk)); ConfLine(ConfLine::CFL_SK, sk));
@ -572,7 +571,7 @@ bool ConfSimple::write(ostream& out) const
break; break;
case ConfLine::CFL_SK: case ConfLine::CFL_SK:
sk = it->m_data; sk = it->m_data;
LOGDEB((stderr, "ConfSimple::write: SK [%s]\n", sk.c_str())); CONFDEB("ConfSimple::write: SK [" << sk << "]\n");
// Check that the submap still exists, and only output it if it // Check that the submap still exists, and only output it if it
// does // does
if (m_submaps.find(sk) != m_submaps.end()) { if (m_submaps.find(sk) != m_submaps.end()) {
@ -584,8 +583,7 @@ bool ConfSimple::write(ostream& out) const
break; break;
case ConfLine::CFL_VAR: case ConfLine::CFL_VAR:
string nm = it->m_data; string nm = it->m_data;
LOGDEB((stderr, "ConfSimple::write: VAR [%s], sk [%s]\n", CONFDEB("ConfSimple::write: VAR [" << nm << "], sk [" <<sk<< "]\n");
nm.c_str(), sk.c_str()));
// As erase() doesnt update m_order we can find unexisting // As erase() doesnt update m_order we can find unexisting
// variables, and must not output anything for them. Have // variables, and must not output anything for them. Have
// to use a ConfSimple::get() to check here, because // to use a ConfSimple::get() to check here, because
@ -599,8 +597,7 @@ bool ConfSimple::write(ostream& out) const
} }
break; break;
} }
LOGDEB((stderr, "ConfSimple::write: no value: nm[%s] sk[%s]\n", CONFDEB("ConfSimple::write: no value: nm["<<nm<<"] sk["<<sk<< "]\n");
nm.c_str(), sk.c_str()));
break; break;
} }
} }
@ -700,8 +697,8 @@ int ConfTree::get(const std::string& name, string& value, const string& sk)
const const
{ {
if (sk.empty() || !path_isabsolute(sk)) { if (sk.empty() || !path_isabsolute(sk)) {
// LOGDEB((stderr, "ConfTree::get: looking in global space for [%s]\n", LOGDEB2("ConfTree::get: looking in global space for [" <<
// sk.c_str())); sk << "]\n");
return ConfSimple::get(name, value, sk); return ConfSimple::get(name, value, sk);
} }
@ -714,8 +711,8 @@ const
// Look in subkey and up its parents until root ('') // Look in subkey and up its parents until root ('')
for (;;) { for (;;) {
// LOGDEB((stderr,"ConfTree::get: looking for '%s' in '%s'\n", LOGDEB2("ConfTree::get: looking for [" << name << "] in [" <<
// name.c_str(), msk.c_str())); msk << "]\n");
if (ConfSimple::get(name, value, msk)) { if (ConfSimple::get(name, value, msk)) {
return 1; return 1;
} }
@ -733,3 +730,4 @@ const
} }
return 0; return 0;
} }