Offline-l

offline-l@lists.wikimedia.org

5 participants
691 discussions

[openZIM dev-l] Windows portability feedback
by Emmanuel Engelhart 03 Aug '09

03 Aug '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I have achieved to compile a first version of a zimlib.lib (static library under Windows). I do not really know if I can use it... but at least it compiles. I want to give you here the modifications I have done to achieve that. Tommi, it would be great to include them (or others with the same purpose) into the SVN. Index: include/zim/zim.h =================================================================== - --- include/zim/zim.h (revision 236) +++ include/zim/zim.h (working copy) @@ -22,6 +22,12 @@ #include <stdint.h> +#ifdef _WIN32 +typedef unsigned __int64 uint64_t; +typedef signed __int8 int8_t; +typedef signed __int32 int32_t; +#endif + namespace zim { typedef uint32_t size_type; Index: src/search.cpp =================================================================== - --- src/search.cpp (revision 236) +++ src/search.cpp (working copy) @@ -106,7 +106,7 @@ // weight position of words in the document if (Search::getWeightPos()) for (itp = posList.begin(); itp != posList.end(); ++itp) - - priority += Search::getWeightPos() / pow(1.01, itp->first); + priority += Search::getWeightPos() / pow((double)1.01, (double)itp->first); // here is a ambiguity between to pow() functions (pow(double, int) or pow(double, double)) if (Search::getWeightPosRel()) for (itp = posList.begin(); itp != posList.end(); ++itp) Index: src/bunzip2stream.cpp =================================================================== - --- src/bunzip2stream.cpp (revision 236) +++ src/bunzip2stream.cpp (working copy) @@ -113,7 +113,8 @@ // there is data already available // read compressed data from source into ibuffer log_debug("in_avail=" << sinksource->in_avail()); - - stream.avail_in = sinksource->sgetn(ibuffer(), std::min(sinksource->in_avail(), ibuffer_size())); + + stream.avail_in = sinksource->sgetn(ibuffer(), min(sinksource->in_avail(), ibuffer_size())); // compile genereates an error if you have the "std::", do not know exactly why. } else { Index: src/uuid.cpp =================================================================== - --- src/uuid.cpp (revision 236) +++ src/uuid.cpp (working copy) @@ -20,12 +20,31 @@ #include <zim/uuid.h> #include <iostream> #include <time.h> - -#include <sys/time.h> +#include <zim/zim.h> // necessary to have the new types #include "log.h" #ifdef WITH_CXXTOOLS #include <cxxtools/md5stream.h> #endif +#if defined(_MSC_VER) || defined(__MINGW32__) +# include <time.h> +# include <Windows.h> +#else +# include <sys/time.h> +#endif + +#if defined(_MSC_VER) || defined(__MINGW32__) +int gettimeofday(struct timeval* tp, void* tzp) { + DWORD t; + t = timeGetTime(); + tp->tv_sec = t / 1000; + tp->tv_usec = t % 1000; + /* 0 indicates that the call succeeded. */ + return 0; +} +#endif // time related function/headers are differents und win32 + + log_define("zim.uuid") namespace zim @@ -62,7 +81,12 @@ *reinterpret_cast<int32_t*>(ret.data) = reinterpret_cast<int32_t>(&ret); *reinterpret_cast<int32_t*>(ret.data + 4) = static_cast<int32_t>(tv.tv_sec); *reinterpret_cast<int32_t*>(ret.data + 8) = static_cast<int32_t>(tv.tv_usec); + + #if defined(_MSC_VER) + *reinterpret_cast<int32_t*>(ret.data + 12) = static_cast<int32_t>(GetCurrentProcessId()); + #else *reinterpret_cast<int32_t*>(ret.data + 12) = static_cast<int32_t>(getpid()); // getpid() is GetCurrentProcessId() under win32 + #endif #endif Index: src/qunicode.cpp =================================================================== - --- src/qunicode.cpp (revision 236) +++ src/qunicode.cpp (working copy) @@ -18,6 +18,7 @@ */ #include <zim/qunicode.h> +#include <zim/zim.h> // for the types compatibilty #include "log.h" #include <iostream> #include <sstream> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpwmusACgkQn3IpJRpNWtN4YQCfaYy9rGS5nrWyYqb5Nk8bs6eo hgsAoKTPFo/75jY1GhUZM+iWGbGDP2dg =goMa -----END PGP SIGNATURE-----

3 5

Re: [openZIM dev-l] Windows portability feedback
by Tommi Mäkitalo 03 Aug '09

03 Aug '09

> > Unfortunately, the issue seems to be worth now: > ..\src\bunzip2stream.cpp(47) : error C2226: Syntaxfehler: Typ 'T' nicht > erwartet ..\src\bunzip2stream.cpp(47) : error C2988: Unerkannte > Vorlagendeklaration/-definition ..\src\bunzip2stream.cpp(47) : error C2059: > Syntaxfehler: '<cv-qualifer>' ..\src\bunzip2stream.cpp(47) : error C2059: > Syntaxfehler: ')' > ..\src\bunzip2stream.cpp(49) : error C2143: Syntaxfehler: Es fehlt ';' vor > '}' ..\src\bunzip2stream.cpp(85) : error C2065: 'ret': nichtdeklarierter > Bezeichner ..\src\bunzip2stream.cpp(86) : error C2065: 'ret': > nichtdeklarierter Bezeichner ..\src\bunzip2stream.cpp(94) : error C2065: > 'ret': nichtdeklarierter Bezeichner ..\src\bunzip2stream.cpp(122) : error > C2589: '(': Ungültiges Token auf der rechten Seite von '::' > ..\src\bunzip2stream.cpp(122) : error C2988: Unerkannte > Vorlagendeklaration/-definition ..\src\bunzip2stream.cpp(122) : error > C2059: Syntaxfehler: '::' > > Emmanuel Strange. I tried to solve the issue by defining my own min template function. The problem is, that min is defined as a macro somewhere in windows.h I think. This can be prevented by #define NOMINMAX. But I wonder, where windows.h is included. Maybe in bzlib.h. I renamed my min-function now. Tommi

2 1

Re: [openZIM dev-l] Windows portability feedback
by emmanuel＠engelhart.org 02 Aug '09

02 Aug '09

Hi Tommi, Thank you to have integrated the diff and clean it a little bite. It works now almost, and only almost because you do not modify the bunzip2stream.cc like indicated in the diff. I give you now the whol log of the compilation, you will see expect the error on bunzip2strea.cc there are alos a few warnings, maybe you will have ideas to avoid them. ------ Neues Erstellen gestartet: Projekt: zimlib, Konfiguration: Debug Win32 ------ Die Zwischen- und Ausgabedateien für das Projekt "zimlib" mit der Konfiguration "Debug|Win32" werden gelöscht. Kompilieren... article.cpp zintstream.cpp ..\src\zintstream.cpp(40) : warning C4554: '<<': Prüfen Sie Operatorrangfolge auf mögliche Fehler; verwenden Sie runde Klammern, um den Vorrang zu verdeutlichen uuid.cpp unicode.cpp c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(33) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(39) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(45) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(51) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(57) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(63) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(68) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(74) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(86) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/unicode.h(92) : warning C4800: 'int': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) template.cpp search.cpp qunicode.cpp ptrstream.cpp inflatestream.cpp ..\src\inflatestream.cpp(123) : warning C4996: 'std::basic_streambuf<_Elem,_Traits>::sgetn': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' with [ _Elem=char, _Traits=std::char_traits<char> ] C:\Programme\Microsoft Visual Studio 9.0\VC\include\streambuf(121): Siehe Deklaration von 'std::basic_streambuf<_Elem,_Traits>::sgetn' with [ _Elem=char, _Traits=std::char_traits<char> ] ..\src\inflatestream.cpp(128) : warning C4996: 'std::basic_streambuf<_Elem,_Traits>::sgetn': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' with [ _Elem=char, _Traits=std::char_traits<char> ] C:\Programme\Microsoft Visual Studio 9.0\VC\include\streambuf(121): Siehe Deklaration von 'std::basic_streambuf<_Elem,_Traits>::sgetn' with [ _Elem=char, _Traits=std::char_traits<char> ] indexarticle.cpp ..\src\indexarticle.cpp(72) : warning C4800: 'void *': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(70) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\indexarticle.cpp(130): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "T fromLittleEndian<zim::size_type>(const T *,bool)". with [ T=zim::size_type ] fileimpl.cpp ..\src\fileimpl.cpp(65) : warning C4996: 'strerror': This function or variable may be unsafe. Consider using strerror_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. C:\Programme\Microsoft Visual Studio 9.0\VC\include\string.h(126): Siehe Deklaration von 'strerror' ..\src\fileimpl.cpp(82) : warning C4244: 'Argument': Konvertierung von 'zim::offset_type' in 'std::streamoff', möglicher Datenverlust ..\src\fileimpl.cpp(97) : warning C4244: 'Argument': Konvertierung von 'zim::offset_type' in 'std::streamoff', möglicher Datenverlust ..\src\fileimpl.cpp(132) : warning C4244: 'Argument': Konvertierung von 'unsigned __int64' in 'std::streamoff', möglicher Datenverlust ..\src\fileimpl.cpp(169) : warning C4244: 'Argument': Konvertierung von 'unsigned __int64' in 'std::streamoff', möglicher Datenverlust c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(70) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\fileimpl.cpp(90): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "T fromLittleEndian<unsigned __int64>(const T *,bool)". with [ T=unsigned __int64 ] fileheader.cpp ..\src\fileheader.cpp(38) : warning C4996: 'std::copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\xutility(2576): Siehe Deklaration von 'std::copy' c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(51) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\fileheader.cpp(36): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "void toLittleEndian<zim::size_type>(const T &,char *,bool)". with [ T=zim::size_type ] c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(58) : warning C4996: 'std::copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\xutility(2576): Siehe Deklaration von 'std::copy' c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(51) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\fileheader.cpp(40): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "void toLittleEndian<zim::offset_type>(const T &,char *,bool)". with [ T=zim::offset_type ] c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(58) : warning C4996: 'std::copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\xutility(2576): Siehe Deklaration von 'std::copy' c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(70) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\fileheader.cpp(63): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "T fromLittleEndian<zim::size_type>(const T *,bool)". with [ T=zim::size_type ] file.cpp dirent.cpp ..\src\dirent.cpp(91) : warning C4800: 'char': Variable wird auf booleschen Wert ('True' oder 'False') gesetzt (Auswirkungen auf Leistungsverhalten möglich) c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(51) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\dirent.cpp(50): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "void toLittleEndian<zim::size_type>(const T &,char *,bool)". with [ T=zim::size_type ] c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(58) : warning C4996: 'std::copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\xutility(2576): Siehe Deklaration von 'std::copy' c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(51) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\dirent.cpp(51): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "void toLittleEndian<uint16_t>(const T &,char *,bool)". with [ T=uint16_t ] c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(58) : warning C4996: 'std::copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\xutility(2576): Siehe Deklaration von 'std::copy' c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(70) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\dirent.cpp(98): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "T fromLittleEndian<zim::size_type>(const T *,bool)". with [ T=zim::size_type ] deflatestream.cpp cluster.cpp c:\code\moulinkiwix\dependences\win\zimlib\include\zim/endian.h(70) : warning C4996: 'std::reverse_copy': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators' C:\Programme\Microsoft Visual Studio 9.0\VC\include\algorithm(1632): Siehe Deklaration von 'std::reverse_copy' ..\src\cluster.cpp(61): Siehe Verweis auf die Instanziierung der gerade kompilierten Funktions-template "T fromLittleEndian<zim::size_type>(const T *,bool)". with [ T=zim::size_type ] bzip2stream.cpp bzip2.cpp bunzip2stream.cpp ..\src\bunzip2stream.cpp(117) : error C2589: '(': Ungültiges Token auf der rechten Seite von '::' ..\src\bunzip2stream.cpp(117) : error C2059: Syntaxfehler: '::' articlesearch.cpp Code wird generiert... Das Buildprotokoll wurde unter "file://c:\code\moulinkiwix\dependences\win\zimlib\zimlib\Debug\BuildLog.htm" gespeichert. zimlib - 2 Fehler, 34 Warnung(en) ========== Alles neu erstellen: 0 erfolgreich, Fehler bei 1, 0 übersprungen ========== Besten Dank Emmanuel Le ven 31/07/09 22:36, "Tommi Mäkitalo" tommi(a)tntnet.org a écrit: > Hi again, > > I was impatient and applied the patch and after some cleanup I checked it > in. Can you please test, if the version in svn still compile on windows? > > Tommi > > On Freitag, 31. Juli 2009 21:54:03 Tommi Mäkitalo wrote: > > Hi Emmanuel, > > > > great to hear. I'm sure it will work if it > compile. > > > Can you please send me the patch as attachement. The > lines are wrapped so > the patch can't be applied easily. > > > > Tommi > > > > On Mittwoch, 29. Juli 2009 20:54:41 Emmanuel > Engelhart wrote: > > Hi, > > > > > > I have achieved to compile a first version of a > zimlib.lib (static > > library under Windows). I do not really know if > I can use it... but at > > least it compiles. > > > > > > I want to give you here the modifications I > have done to achieve that. > > Tommi, it would be great to include them (or > others with the same > > purpose) into the SVN. > > > > > > Index: include/zim/zim.h > > > > =================================================================== > > > --- include/zim/zim.h (revision > 236) > > +++ include/zim/zim.h (working > copy) > > @@ -22,6 +22,12 @@ > > > > > > #include <stdint.h> > > > > > > +#ifdef _WIN32 > > > +typedef unsigned __int64 uint64_t; > > > +typedef signed __int8 int8_t; > > > +typedef signed __int32 int32_t; > > > +#endif > > > + > > > namespace zim > > > { > > > typedef uint32_t size_type; > > > Index: src/search.cpp > > > > =================================================================== > > > --- src/search.cpp (revision 236) > > > +++ src/search.cpp (working copy) > > > @@ -106,7 +106,7 @@ > > > // weight position of words in the > document > > if (Search::getWeightPos()) > > > for (itp = posList.begin(); itp != > posList.end(); ++itp) > > - priority += Search::getWeightPos() / > pow(1.01, itp->first); > > + priority += Search::getWeightPos() / > pow((double)1.01, > > (double)itp->first); // here is a ambiguity > between to pow() functions > > (pow(double, int) or pow(double, > double)) > > > > > if > (Search::getWeightPosRel()) > > for (itp = posList.begin(); itp != > posList.end(); ++itp) > > Index: src/bunzip2stream.cpp > > > > =================================================================== > > > --- src/bunzip2stream.cpp (revision > 236) > > +++ src/bunzip2stream.cpp (working > copy) > > @@ -113,7 +113,8 @@ > > > // there is data already > available > > // read compressed data from source > into ibuffer > > log_debug("in_avail=" << > sinksource->in_avail()); > > - stream.avail_in = > sinksource->sgetn(ibuffer(), > > std::min(sinksource->in_avail(), > ibuffer_size())); > > + > > > + stream.avail_in = > sinksource->sgetn(ibuffer(), > > min(sinksource->in_avail(), > ibuffer_size())); // compile genereates an > > error if you have the "std::", do not know > exactly why. > > } > > > else > > > { > > > Index: src/uuid.cpp > > > > =================================================================== > > > --- src/uuid.cpp (revision 236) > > > +++ src/uuid.cpp (working copy) > > > @@ -20,12 +20,31 @@ > > > #include <zim/uuid.h> > > > #include <iostream> > > > #include <time.h> > > > -#include <sys/time.h> > > > +#include <zim/zim.h> // necessary to > have the new types > > #include "log.h" > > > #ifdef WITH_CXXTOOLS > > > #include > <cxxtools/md5stream.h> > > #endif > > > > > > +#if defined(_MSC_VER) || > defined(__MINGW32__) > > +# include <time.h> > > > +# include <Windows.h> > > > +#else > > > +# include <sys/time.h> > > > +#endif > > > + > > > +#if defined(_MSC_VER) || > defined(__MINGW32__) > > +int gettimeofday(struct timeval* tp, void* > tzp) { > > + DWORD t; > > > + t = timeGetTime(); > > > + tp->tv_sec = t / 1000; > > > + tp->tv_usec = t % 1000; > > > + /* 0 indicates that the call succeeded. > */ > > + return 0; > > > +} > > > +#endif // time related function/headers are > differents und win32 > > + > > > + > > > log_define("zim.uuid") > > > > > > namespace zim > > > @@ -62,7 +81,12 @@ > > > > *reinterpret_cast<int32_t*>(ret.data) = > > > reinterpret_cast<int32_t>(&ret); > > *reinterpret_cast<int32_t*>(ret.data > + 4) = > > > static_cast<int32_t>(tv.tv_sec); > > *reinterpret_cast<int32_t*>(ret.data > + 8) = > > > static_cast<int32_t>(tv.tv_usec); > > + > > > + #if defined(_MSC_VER) > > > + *reinterpret_cast<int32_t*>(ret.data + > 12) = > > > static_cast<int32_t>(GetCurrentProcessId()); > > + #else > > > *reinterpret_cast<int32_t*>(ret.data > + 12) = > > static_cast<int32_t>(getpid()); // > getpid() is GetCurrentProcessId() > > under win32 > > > + #endif > > > > > > #endif > > > > > > Index: src/qunicode.cpp > > > > =================================================================== > > > --- src/qunicode.cpp (revision 236) > > > +++ src/qunicode.cpp (working copy) > > > @@ -18,6 +18,7 @@ > > > */ > > > > > > #include <zim/qunicode.h> > > > +#include <zim/zim.h> // for the types > compatibilty > > #include "log.h" > > > #include <iostream> > > > #include <sstream> > > > > _______________________________________________ > > dev-l mailing list > > > dev-l@openz > im.org > > https://intern.openzim.org/mailman/listinfo/dev-l > >> > > > _______________________________________________ > dev-l mailing list > > dev-l@openz > im.org > https://intern.openzim.org/mailman/listinfo/dev-l > > > _______________________________________________ > dev-l mailing list > dev-l@openz > im.org https://intern.openzim.org/mailman/listinfo/dev-l > >

2 1

[openZIM dev-l] For your attention: New Bugs
by Manuel Schneider 20 Jul '09

20 Jul '09

Dear developers team, I am happy to forward you some mails concerning new bugs we have received. It lloks like we have got some more developers looking into the software. Please see the attachments. Cheers, Manuel -- Regards Manuel Schneider Wikimedia CH - Verein zur Förderung Freien Wissens Wikimedia CH - Association for the advancement of free knowledge www.wikimedia.ch

1 0

[openZIM dev-l] [Mediawiki] New bug affecting us
by Emmanuel Engelhart 18 Jul '09

18 Jul '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, a few weeks ago, Frederico reported me a small bug in a special HTML page in a test ZIM file in Italian: https://sourceforge.net/tracker/?func=detail&aid=2798771&group_id=175508&at… The symptom is that references (<references/>) are not always rendered. After auditing a little bit the Mediawiki code, it seems that this is a Mediawiki bug. I have reported it there: https://bugzilla.wikimedia.org/show_bug.cgi?id=19807 I can not fix it, this is too complicated for me... but maybe Mediawiki hackers listening there have ideas ;) Regards Emmanuel -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkphxUEACgkQn3IpJRpNWtPX+ACgtP1QDNuRlZxz8FV2Dh/YChHK FI8An0clv19tJo8leLNQkGSBd2vAIf2V =t4UO -----END PGP SIGNATURE-----

1 0

[openZIM dev-l] Wikipedia for Schools ZIM version
by emmanuel＠engelhart.org 13 Jul '09

13 Jul '09

Hi, I have this week end prepared a ZIM file with the last Wikipedia for Schools selection (from SOS children's Villages UK). http://tmp.kiwix.org/zim/schools-wikipedia-full-20081023-rc1.zim Content should be exactly the same as before but the size is 30% smaller. After a few minutes indexing with Kiwix the whole content are available with the search engine. At this occasion, I have implemented the ignore feature for HTML content with the NOINDEX meta tag. This is important to avoid indexing index pages, it would be maybe good to do also that with the zimindexer (if not already done). I have maybe someone who is ready to pay a little bit to help to port Kiwix and libzim under Windows... nothing sure but I hope it will help to find someone to do this job quickly as we ;) I have also made a feature request to add a few fields in the header, please have a look at it: http://bugs.openzim.org/show_bug.cgi?id=4 Regards Emmanuel

1 0

Re: [openZIM dev-l] Kiwix index size
by Asaf Bartov 08 Jul '09

08 Jul '09

Clarification: This last message was by Rotem, a fellow WM-IL member helping me with the embedding of the Hebrew Wikipedia in the One Computer Per Child project. He is reporting issues with Kiwix and the ZIM file I created last week. Regarding size: Size is important, because we intend to add images (the 300MB ZIM file is the complete Hebrew Wikipedia text, but no pictures). We are hoping to have at least 5GB reserved for us in those One Computer Per Child machines we are to install on, but we may be forced to make do with 3GB. So every MB saved from the index, is another MB available for images... Asaf Bartov Wikimedia Israel On Mon, Jul 6, 2009 at 3:58 PM, Rotem Simha <hidroo(a)gmail.com> wrote: > * there are some errors in links of files and special pages > examples > קובץ:Nuvola_apps_important.svg<http://commons.wikimedia.org/wiki/File:Nuvola_apps_important.svg> link > to ויקיפדיה:מיזמי ויקיפדיה/מיזם ערכים ללא תמונות/קטגוריות/ספורטאים איטלקים(wikipedia:wikipedia projects\ articles without images\categories\Sports > people from Italy) > מיוחד:אקראי (Special:Random) > 15 במאי (may 15) > מיוחד:שינויים אחרונים (Special:RecentChanges) > 10_באוגוסט > > * size is important because we intend to add images > > 2009/7/6 <dev-l-request(a)openzim.org> > >> Send dev-l mailing list submissions to >> dev-l(a)openzim.org >> >> To subscribe or unsubscribe via the World Wide Web, visit >> https://intern.openzim.org/mailman/listinfo/dev-l >> or, via email, send a message with subject or body 'help' to >> dev-l-request(a)openzim.org >> >> You can reach the person managing the list at >> dev-l-owner(a)openzim.org >> >> When replying, please edit your Subject line so it is more specific >> than "Re: Contents of dev-l digest..." >> >> >> Today's Topics: >> >> 1. Kiwix index size (Asaf Bartov) >> 2. Re: Kiwix index size (Manuel Schneider) >> 3. Re: Kiwix index size (Emmanuel Engelhart) >> >> >> ---------------------------------------------------------------------- >> >> Message: 1 >> Date: Sun, 5 Jul 2009 19:18:57 +0300 >> From: Asaf Bartov <asaf.bartov(a)gmail.com> >> Subject: [openZIM dev-l] Kiwix index size >> To: dev-l(a)openzim.org >> Message-ID: >> <50a20d900907050918r3fcff23l275c67690ed7fc20(a)mail.gmail.com> >> Content-Type: text/plain; charset="iso-8859-1" >> >> Hi, everyone. >> >> When running Kiwix's indexer on the ZIM file I had created from the Hebrew >> Wikipedia last week, the Kiwix data directory ran up to a total of 31 >> items, >> totalling 2.3 GB. The ZIM file itself is ~300MB. Does this proportion >> make >> sense? >> >> Detailed ls output attached. >> >> Thanks in advance, >> >> Asaf Bartov >> -- >> Asaf Bartov <asaf(a)forum2.org> >>

2 2

Re: [openZIM dev-l] Kiwix index size
by Asaf Bartov 08 Jul '09

08 Jul '09

Hello, Pascal. Thanks for the pointer about OkaWix! I've downloaded it and tried it with the Hebrew Wikipedia. Initial findings: - excellent rendering, including directionality. - categories don't seem to work I'm downloading the pictures now... I note it's using Zeno files. Is it planned to use ZIM files in the future? A. On Mon, Jul 6, 2009 at 7:15 PM, Pascal Martin <pmartin(a)linterweb.fr> wrote: > So do you try okawix with the hebrew contents ? > >

2 3

Re: [openZIM dev-l] dev-l Digest, Vol 5, Issue 2
by emmanuel＠engelhart.org 06 Jul '09

06 Jul '09

About the dead links, few thinks: * Are you sure the problem is not at the source (HTML files) * the zimwriter does not check if all links in all HTML pages are OK * it seems that the libzim returns a bad content if the content does not exist (Tommi can you confirm?). Should returns nothing or an error code IMO. Emmanuel Le lun 06/07/09 14:58, "Rotem Simha" hidroo(a)gmail.com a écrit: > * there are some errors in links of files and special pages > examples > קובץ:Nuvola_apps_important.svg [1] link to > ויקיפדיה:מיזמי ויקיפדיה/מיזם ערכים > ללא תמונות/קטגוריות/ספורטאים איטלקים > (wikipedia:wikipedia projects articles without imagescategoriesSports > people from Italy) > מיוחד:אקראי (Special:Random) > 15 במאי (may 15) > מיוחד:שינויים אחרונים (Special:RecentChanges) > > 10_באוגוסט > > * size is important because we intend to add images > > 2009/7/6 > Send dev-l mailing list submissions to > dev-l(a)openzim.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://intern.openzim.org/mailman/listinfo/dev-l [2] > or, via email, send a message with subject or body help to > dev-l-request(a)openzim.org > > You can reach the person managing the list at > dev-l-owner(a)openzim.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of dev-l digest..." > > Todays Topics: > > 1. Kiwix index size (Asaf Bartov) > 2. Re: Kiwix index size (Manuel Schneider) > 3. Re: Kiwix index size (Emmanuel Engelhart) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sun, 5 Jul 2009 19:18:57 +0300 > From: Asaf Bartov > Subject: [openZIM dev-l] Kiwix index size > To: dev-l(a)openzim.org > Message-ID: > > > Content-Type: text/plain; charset="iso-8859-1" > > Hi, everyone. > > When running Kiwixs indexer on the ZIM file I had created from the > Hebrew > Wikipedia last week, the Kiwix data directory ran up to a total of > 31 items, > totalling 2.3 GB. The ZIM file itself is ~300MB. Does this > proportion make > sense? > > Detailed ls output attached. > > Thanks in advance, > > Asaf Bartov > -- > Asaf Bartov >

2 1

Re: [openZIM dev-l] Kiwix index size
by emmanuel＠engelhart.org 06 Jul '09

06 Jul '09

I have answered to Rotem about the links. I have also open a bug on the Kiwix side: https://sourceforge.net/tracker/?func=detail&aid=2817440&group_id=175508&at… For the search engine index size, we have to search a solution with a smaller index. Starting with the openzim solution should be good. I will have a look during this week. Emmanuel Le lun 06/07/09 15:03, "Asaf Bartov" asaf.bartov(a)gmail.com a écrit: > Clarification: > > This last message was by Rotem, a fellow WM-IL member helping me with > the embedding of the Hebrew Wikipedia in the One Computer Per Child > project. > > He is reporting issues with Kiwix and the ZIM file I created last > week. > > Regarding size: Size is important, because we intend to add images > (the 300MB ZIM file is the complete Hebrew Wikipedia text, but no > pictures). We are hoping to have at least 5GB reserved for us in > those One Computer Per Child machines we are to install on, but we may > be forced to make do with 3GB. So every MB saved from the index, is > another MB available for images... > > Asaf Bartov > Wikimedia Israel > > On Mon, Jul 6, 2009 at 3:58 PM, Rotem Simha wrote: > * there are some errors in links of files and special pages > examples > קובץ:Nuvola_apps_important.svg [1] link to > ויקיפדיה:מיזמי ויקיפדיה/מיזם ערכים > ללא תמונות/קטגוריות/ספורטאים איטלקים > (wikipedia:wikipedia projects articles without imagescategoriesSports > people from Italy) > מיוחד:אקראי (Special:Random) > 15 במאי (may 15) > מיוחד:שינויים אחרונים (Special:RecentChanges) > > 10_באוגוסט > > * size is important because we intend to add images > > 2009/7/6 > Send dev-l mailing list submissions to > dev-l(a)openzim.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://intern.openzim.org/mailman/listinfo/dev-l [2] > or, via email, send a message with subject or body help to > dev-l-request(a)openzim.org > > You can reach the person managing the list at > dev-l-owner(a)openzim.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of dev-l digest..." > > Todays Topics: > > 1. Kiwix index size (Asaf Bartov) > 2. Re: Kiwix index size (Manuel Schneider) > 3. Re: Kiwix index size (Emmanuel Engelhart) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sun, 5 Jul 2009 19:18:57 +0300 > From: Asaf Bartov > Subject: [openZIM dev-l] Kiwix index size > To: dev-l(a)openzim.org > Message-ID: > > > Content-Type: text/plain; charset="iso-8859-1" > > Hi, everyone. > > When running Kiwixs indexer on the ZIM file I had created from the > Hebrew > Wikipedia last week, the Kiwix data directory ran up to a total of > 31 items, > totalling 2.3 GB. The ZIM file itself is ~300MB. Does this > proportion make > sense? > > Detailed ls output attached. > > Thanks in advance, > > Asaf Bartov > -- > Asaf Bartov >

2 1

← Newer
1
...
61
62
63
64
65
66
67
...
70
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Offline-l