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

*** empty log message ***

Browse Source
This commit is contained in:
dockes 2005-11-23 10:19:19 +00:00
parent 698fade930
commit 4bea1948ae
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile,v 1.16 2005-11-21 16:04:49 dockes Exp $ (C) 2005 J.F.Dockes # @(#$Id: Makefile,v 1.17 2005-11-23 10:19:09 dockes Exp $ (C) 2005 J.F.Dockes
# Default values. These can be overridden on the command line ie: # Default values. These can be overridden on the command line ie:
# make PREFIX=/usr # make PREFIX=/usr
@ -25,7 +25,7 @@ static:
cd lib; ${MAKE} cd lib; ${MAKE}
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; rm -f recollindex; \ cd index; rm -f recollindex; \
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex
cd qtgui; qmake recoll.pro; rm -f recoll; \ cd qtgui; qmake recoll.pro; rm -f recoll; \
cat ../mk/sysconf ../mk/localdefs Makefile | ${MAKE} -f - \ cat ../mk/sysconf ../mk/localdefs Makefile | ${MAKE} -f - \
BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic

2
src/VERSION
View File

@ -1 +1 @@
1.0.8 1.0.9

4
src/filters/rclrtf
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# @(#$Id: rclrtf,v 1.1 2005-11-21 16:05:07 dockes Exp $ (C) 2004 J.F.Dockes # @(#$Id: rclrtf,v 1.2 2005-11-23 10:17:53 dockes Exp $ (C) 2004 J.F.Dockes
# Some inspiration from estraier # Some inspiration from estraier
#================================================================ #================================================================
# rclrtf # rclrtf
@ -64,7 +64,7 @@ BEGIN {
} }
/<\/head>/{ /<\/head>/{
if (gothead == 0) { if (gothead == 0) {
printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO8859-1\">\n") printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n")
gothead = 1 gothead = 1
} }
} }

2
src/index/Makefile
View File

@ -21,7 +21,7 @@ trcsguess.o : csguess.cpp
MIMETYPE_OBJS= trmimetype.o $(BIGLIB) MIMETYPE_OBJS= trmimetype.o $(BIGLIB)
mimetype : $(MIMETYPE_OBJS) mimetype : $(MIMETYPE_OBJS)
$(CXX) $(CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) \ $(CXX) $(CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) \
$(LIBICONV) $(LIBICONV) $(LIBSYS)
trmimetype.o : mimetype.cpp trmimetype.o : mimetype.cpp
$(CXX) $(CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \ $(CXX) $(CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \
mimetype.cpp mimetype.cpp

4
src/index/mimetype.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.12 2005-11-21 17:18:58 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.13 2005-11-23 10:19:00 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
#ifndef TEST_MIMETYPE #ifndef TEST_MIMETYPE
@ -125,7 +125,7 @@ string mimetype(const string &fn, RclConfig *cfg, bool usfc)
#else // TEST-> #else // TEST->
#include <stdio.h>
#include <iostream> #include <iostream>
#include "debuglog.h" #include "debuglog.h"

8
src/utils/debuglog.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.1 2005-11-12 14:24:33 dockes Exp $ (C) 2002 OKYZ"; static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.2 2005-11-23 10:15:18 dockes Exp $ (C) 2002 OKYZ";
#endif #endif
#ifndef TEST_DEBUGLOG #ifndef TEST_DEBUGLOG
@ -173,7 +173,11 @@ DebugLog::prolog(int lev, const char *f, int line)
char buf[100]; char buf[100];
sprintf(buf, ":%d:", lev); sprintf(buf, ":%d:", lev);
writer->put(buf); writer->put(buf);
#if DEBUGLOG_USE_THREADS #if DEBUGLOG_SHOW_PID
sprintf(buf, "%d:", getpid());
writer->put(buf);
#endif
#if DEBUGLOG_SHOW_THREAD
sprintf(buf, "%lx:", (unsigned long)pthread_self()); sprintf(buf, "%lx:", (unsigned long)pthread_self());
writer->put(buf); writer->put(buf);
#endif #endif

6
src/utils/mimeparse.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.6 2005-11-06 11:16:53 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.7 2005-11-23 10:17:15 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
#ifndef TEST_MIMEPARSE #ifndef TEST_MIMEPARSE
@ -318,7 +318,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
// we sometimes find 8-bit chars in // we sometimes find 8-bit chars in
// there. Interpret as Iso8859. // there. Interpret as Iso8859.
if (value.length() > 0) { if (value.length() > 0) {
transcode(value, utf8, "ISO8859-1", "UTF-8"); transcode(value, utf8, "ISO-8859-1", "UTF-8");
out += utf8; out += utf8;
value = ""; value = "";
} }
@ -378,7 +378,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
} }
if (value.length() > 0) { if (value.length() > 0) {
transcode(value, utf8, "ISO8859-1", "UTF-8"); transcode(value, utf8, "ISO-8859-1", "UTF-8");
out += utf8; out += utf8;
value = ""; value = "";
} }