tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comments and traces

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-12-02 10:57:48 +01:00
parent 2378c01501
commit bcf5b00897
7 changed files with 84 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/conftree.h
View File

@ -1,4 +1,4 @@
/* /* Copyright (C) 2006 J.F.Dockes
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or

2
src/utils/execmd.cpp
View File

@ -888,7 +888,7 @@ again:
int n = con->getline(buf, BS, timeosecs); int n = con->getline(buf, BS, timeosecs);
if (n < 0) { if (n < 0) {
if (con->timedout()) { if (con->timedout()) {
LOGDEB("ExecCmd::getline: timeout\n"); LOGDEB0("ExecCmd::getline: select timeout, report and retry\n");
if (m->m_advise) { if (m->m_advise) {
m->m_advise->newData(0); m->m_advise->newData(0);
} }

28
src/utils/log.cpp
View File

@ -1,20 +1,20 @@
/* Copyright (C) 2014 J.F.Dockes /* Copyright (C) 2006-2016 J.F.Dockes
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is free software; you can redistribute it and/or
* but WITHOUT ANY WARRANTY; without even the implied warranty of * modify it under the terms of the GNU Lesser General Public
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * License as published by the Free Software Foundation; either
* GNU General Public License for more details. * version 2.1 of the License, or (at your option) any later version.
* *
* You should have received a copy of the GNU General Public License * This library is distributed in the hope that it will be useful,
* along with this program; if not, write to the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Free Software Foundation, Inc., * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/ */
#include "log.h" #include "log.h"
#include <errno.h> #include <errno.h>

17
src/utils/log.h
View File

@ -14,6 +14,23 @@
* Free Software Foundation, Inc., * Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/* Copyright (C) 2006-2016 J.F.Dockes
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
#ifndef _LOG_H_X_INCLUDED_ #ifndef _LOG_H_X_INCLUDED_
#define _LOG_H_X_INCLUDED_ #define _LOG_H_X_INCLUDED_

35
src/utils/smallut.cpp
View File

@ -1,18 +1,19 @@
/* Copyright (C) 2004-2016 J.F.Dockes /* Copyright (C) 2006-2016 J.F.Dockes
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is free software; you can redistribute it and/or
* but WITHOUT ANY WARRANTY; without even the implied warranty of * modify it under the terms of the GNU Lesser General Public
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * License as published by the Free Software Foundation; either
* GNU General Public License for more details. * version 2.1 of the License, or (at your option) any later version.
* *
* You should have received a copy of the GNU General Public License * This library is distributed in the hope that it will be useful,
* along with this program; if not, write to the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Free Software Foundation, Inc., * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -184,6 +185,14 @@ int stringuppercmp(const string& s1, const string& s2)
} }
} }
bool beginswith(const std::string& big, const std::string& small)
{
if (big.compare(0, small.size(), small)) {
return false;
}
return true;
}
// Compare charset names, removing the more common spelling variations // Compare charset names, removing the more common spelling variations
bool samecharset(const string& cs1, const string& cs2) bool samecharset(const string& cs1, const string& cs2)
{ {

28
src/utils/smallut.h
View File

@ -1,18 +1,19 @@
/* Copyright (C) 2004-2016 J.F.Dockes /* Copyright (C) 2006-2016 J.F.Dockes
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is free software; you can redistribute it and/or
* but WITHOUT ANY WARRANTY; without even the implied warranty of * modify it under the terms of the GNU Lesser General Public
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * License as published by the Free Software Foundation; either
* GNU General Public License for more details. * version 2.1 of the License, or (at your option) any later version.
* *
* You should have received a copy of the GNU General Public License * This library is distributed in the hope that it will be useful,
* along with this program; if not, write to the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Free Software Foundation, Inc., * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/ */
#ifndef _SMALLUT_H_INCLUDED_ #ifndef _SMALLUT_H_INCLUDED_
#define _SMALLUT_H_INCLUDED_ #define _SMALLUT_H_INCLUDED_
@ -65,6 +66,7 @@ extern void stringtolower(std::string& io);
extern std::string stringtolower(const std::string& io); extern std::string stringtolower(const std::string& io);
extern void stringtoupper(std::string& io); extern void stringtoupper(std::string& io);
extern std::string stringtoupper(const std::string& io); extern std::string stringtoupper(const std::string& io);
extern bool beginswith(const std::string& big, const std::string& small);
// Is one string the end part of the other ? // Is one string the end part of the other ?
extern int stringisuffcmp(const std::string& s1, const std::string& s2); extern int stringisuffcmp(const std::string& s1, const std::string& s2);

27
src/utils/workqueue.h
View File

@ -1,18 +1,19 @@
/* Copyright (C) 2012-2016 J.F.Dockes /* Copyright (C) 2006-2016 J.F.Dockes
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is free software; you can redistribute it and/or
* but WITHOUT ANY WARRANTY; without even the implied warranty of * modify it under the terms of the GNU Lesser General Public
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * License as published by the Free Software Foundation; either
* GNU General Public License for more details. * version 2.1 of the License, or (at your option) any later version.
* *
* You should have received a copy of the GNU General Public License * This library is distributed in the hope that it will be useful,
* along with this program; if not, write to the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Free Software Foundation, Inc., * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/ */
#ifndef _WORKQUEUE_H_INCLUDED_ #ifndef _WORKQUEUE_H_INCLUDED_
#define _WORKQUEUE_H_INCLUDED_ #define _WORKQUEUE_H_INCLUDED_