diff --git a/src/indexer/kiwix-index.cpp b/src/indexer/kiwix-index.cpp index 90e8271..c106b29 100644 --- a/src/indexer/kiwix-index.cpp +++ b/src/indexer/kiwix-index.cpp @@ -29,7 +29,7 @@ enum supportedBackend { XAPIAN }; void usage() { - cout << "Usage: kiwix-index [--verbose] [--backend=xapian] ZIM_PATH INDEX_PATH" << endl; + cout << "Usage: kiwix-index [--verbose] ZIM_PATH INDEX_PATH" << endl; exit(1); } diff --git a/src/installer/kiwix-install.cpp b/src/installer/kiwix-install.cpp index 1ba16c4..61a14c4 100644 --- a/src/installer/kiwix-install.cpp +++ b/src/installer/kiwix-install.cpp @@ -35,7 +35,7 @@ enum supportedBackend { XAPIAN }; enum supportedAction { NONE, ADDCONTENT }; void usage() { - cout << "Usage: kiwix-install [--verbose] [--backend=xapian] [--buildIndex] addcontent ZIM_PATH KIWIX_PATH" << endl; + cout << "Usage: kiwix-install [--verbose] [--buildIndex] addcontent ZIM_PATH KIWIX_PATH" << endl; exit(1); } diff --git a/src/zimTester/Makefile b/src/zimTester/Makefile deleted file mode 100644 index cc3b922..0000000 --- a/src/zimTester/Makefile +++ /dev/null @@ -1,20 +0,0 @@ - -all: zimCTester zimTester - -zimTester: - g++ zimTester.cpp ../common/kiwix/reader.cpp ../zimAccessor/zimAccessor.cpp -o zimTester -I . -I ../zimAccessor/ -I ../common/ -I ../zimlib/include/ -L ../zimlib/src/.libs/ -lzim ../dependences/xz/src/liblzma/.libs/liblzma.a -I /usr/include/ - -zimCTester: - ln -fs ../zimAccessor/libZimCAccessor.so . - gcc -o zimCTester zimCTester.c -I ../zimAccessor/ -L ../zimAccessor/ -lZimCAccessor - -cleanc: - find . -name 'zimCTester' -delete - -cleancpp: - find . -name 'zimTester' -delete - -clean: cleanc cleancpp - find . -name 'libZimCAccessor.so' -delete - find . -name '*.o' -delete - diff --git a/src/zimTester/zimCTester.c b/src/zimTester/zimCTester.c deleted file mode 100644 index e93e46b..0000000 --- a/src/zimTester/zimCTester.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Renaud Gaudin - * - * 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 3 of the License, or - * any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -#include -#include -#include - - -int main(int argc, char* argv[]) -{ - if (argc < 2) { - printf("Usage: %s zimPath\n", argv[0]); - printf("No ZIM file path provided.\n"); - exit(0); - } - char* zimPath = argv[1]; - printf("Kiwix C Tester.\nLoading %s...\n", zimPath); - - HZIMCLASS zimA = NULL; - zimA = ZimAccessor_Create(); - if (zimA == NULL) { - printf("Error creating ZimAccessor class\n"); - exit(1); - } - ZimAccessor_LoadFile( zimA, zimPath ); - printf("Done.\n"); - const char* hp; - hp = ZimAccessor_GetMainPageUrl( zimA ); - printf("homepage: %s\n", hp); - - char * url = "A/Lugha.html"; - const char* content; - content = ZimAccessor_GetContent( zimA, hp ); - - printf("%s", content); - - ZimAccessor_Destroy( zimA ); - zimA = NULL; - - return 0; -} diff --git a/src/zimTester/zimTester.cpp b/src/zimTester/zimTester.cpp deleted file mode 100644 index eb54451..0000000 --- a/src/zimTester/zimTester.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2011 Renaud Gaudin - * - * 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 3 of the License, or - * any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -#include -#include -#include - - -int main(int argc, char* argv[]) -{ - ZimAccessor zim_acc(0); - ZimAccessor* zima = new ZimAccessor(0); - - if (argc < 2) { - cout << "Usage: " << argv[0] << " zimPath" << endl << endl; - cout << "No ZIM file path provided." << endl; - exit(0); - } - string zimPath = (string) argv[1]; - cout << "Kiwix Tester." << endl << "Loading " << zimPath << "..." << endl; - - if (zima->LoadFile(zimPath)) - cout << "Successfully loaded ZIM file." << endl; - else - cout << "Unable to load ZIM file." << endl; - - unsigned int count = 0; - if (zima->GetArticleCount(count)) { - printf("ZIM file contains %d articles.\n", count); - } else { - cout << "Unable to count articles in ZIM file." << endl; - } - - zima->Reset(); - - string id; - zima->GetId(id); - cout << "Current ID: " << id << endl; - - string title = "Lugha"; - string url; - zima->GetPageUrlFromTitle(title, url); - - cout << "URL for " << title << ": " << url << endl; - - string homepage; - zima->GetMainPageUrl(homepage); - cout << "Homepage is: " << homepage << endl; - - // Untested as it's not used in the code and don't know behavior - //zima->GetMetatag(const string &name, string &value); - - string content; - unsigned int contentLength; - string contentType; - string req = "A/Lugha.html"; - zima->GetContent(homepage, content, contentLength, contentType); - cout << content << endl; - cout << contentType << endl; - cout << contentLength << endl; - - // Untested as it's not used in the code and don't know behavior - const string prefix = "Lug"; - unsigned int sugg_count = 1000; - zima->SearchSuggestions(prefix, sugg_count); - cout << "Suggestions for " << prefix << ": " << sugg_count << endl; - - string next_sugg; - zima->GetNextSuggestion(next_sugg); - cout << "Next Suggestion: " << next_sugg << endl; - - cout << "Can check integrity ? " << zima->CanCheckIntegrity() << endl; - - // commented as it takes a while - //cout << "Is corrupted ? " << zima->IsCorrupted() << endl; - - delete zima; - - return 0; -}