From ea3f8c5d050192b06cab9eaf70e19b544c09b8c5 Mon Sep 17 00:00:00 2001 From: horchi Date: Thu, 23 Mar 2017 18:43:07 +0100 Subject: 2017-03-22 version 1.1.53 (horchi)\n - change: Removed old patches for vdr < 2.2.0\n - added: Patch to extend cEvent with aux field like cTimer\n - change: Moved user defines from Makefile to Make.config\n\n --- lib/Makefile | 6 ++++-- lib/test.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile index 789bf93..5e4f4b3 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -12,7 +12,7 @@ HLIB = -L. -lhorchi DEMO = demo TEST = tst -LIBOBJS = common.o config.o db.o epgservice.o dbdict.o json.o +LIBOBJS = common.o config.o db.o epgservice.o dbdict.o json.o xml.o ifdef USEJPEG LIBOBJS += imgtools.o @@ -29,6 +29,7 @@ BASELIBS = -lrt BASELIBS += $(shell mysql_config --libs_r) BASELIBS += $(shell pkg-config --libs uuid) BASELIBS += $(shell pkg-config --libs zlib) +BASELIBS += $(shell pkg-config --libs tinyxml2) ifdef USECURL BASELIBS += -lcurl @@ -105,7 +106,8 @@ db.o : db.c $(HEADER) db.h epgservice.o : epgservice.c $(HEADER) epgservice.h dbdict.o : dbdict.c $(HEADER) dbdict.h json.o : json.c $(HEADER) json.h -python.o : python.c $(HEADER) python.h +xml.o : xml.c $(HEADER) xml.h +python.o : python.c $(HEADER) python.h searchtimer.o : searchtimer.c $(HEADER) searchtimer.h demo.o : demo.c $(HEADER) diff --git a/lib/test.c b/lib/test.c index 11e305a..6de7fdb 100644 --- a/lib/test.c +++ b/lib/test.c @@ -17,6 +17,7 @@ #include "db.h" #include "epgservice.h" #include "dbdict.h" +#include "xml.h" //#include "wol.h" cDbConnection* connection = 0; @@ -643,6 +644,17 @@ int main(int argc, char** argv) cEpgConfig::logstdout = yes; cEpgConfig::loglevel = 2; + + cXml xml; + + xml.set("32559742017SerieDThillerFranzi HörischCheryl Shepard (Sydney), Mickey Hardt (Mathis), David C. Bunners (Holger), Constantin Lücke (Patrick), Gerry Hungbauer (Thomas), Brigitte Antonius (Johanna), Hermann Toelcke (Gunter), Anja Franke (Merle), Claus Dieter Clausnitzer (Hannes), Maria Fuchs (Carla), Joachim Kretzer (Torben), Madeleine Lierck-Wien (Erika), Jelena Mitschke (Britta), Hakim-Michael Meziani (Ben)DVB/TVSPKiller ...Verbundenheit mit der Familie seines Vaters."); + + for (XMLElement* e = xml.getFirst(); e; e = xml.getNext(e)) + printf("%s [%s]\n", e->Name(), e->GetText()); + + printf("[%s]\n", xml.toText()); + return 0; + tell(0, "'%s' - '%s'", getIpOf("enp3s0"), getMacOf("enp3s0")); return 0; -- cgit v1.2.3