From 6dc3847675d6861c8542427fbd4b021c81989364 Mon Sep 17 00:00:00 2001 From: randomdan Date: Wed, 14 Dec 2011 21:42:31 +0000 Subject: Pluggable script engines XML script parser moved to XML module Script parsing object multiple instantiation bug fix Scripts changed to match new standardized format and layout --- p2pvr/cron/importSchedume.xml | 52 +++++++++++++++++++++---------------------- p2pvr/cron/importServices.xml | 12 +++++----- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/p2pvr/cron/importSchedume.xml b/p2pvr/cron/importSchedume.xml index 946cc9b..fd065eb 100644 --- a/p2pvr/cron/importSchedume.xml +++ b/p2pvr/cron/importSchedume.xml @@ -36,32 +36,32 @@ - title - titleLang - subtitle - serviceID - eventID - descLang - desc1 - desc2 - desc3 - videoAspect - videoFrameRate - videoHD - audioChannels - language - teletextSubtitleLang - category - dvbRating - contentItemID - contentRecommendation - contentSeriesID - startTime - stopTime - episode - episodes - year - flags + + <titleLang /> + <subtitle /> + <serviceID key="true" /> + <eventID key="true" /> + <descLang /> + <desc1 /> + <desc2 /> + <desc3 /> + <videoAspect /> + <videoFrameRate /> + <videoHD /> + <audioChannels /> + <language /> + <teletextSubtitleLang /> + <category /> + <dvbRating /> + <contentItemID /> + <contentRecommendation /> + <contentSeriesID /> + <startTime /> + <stopTime /> + <episode /> + <episodes /> + <year /> + <flags /> </columns> </p2:sqlmerge> </block> diff --git a/p2pvr/cron/importServices.xml b/p2pvr/cron/importServices.xml index 1d2b740..d914d15 100644 --- a/p2pvr/cron/importServices.xml +++ b/p2pvr/cron/importServices.xml @@ -16,12 +16,12 @@ </p2:sqlmergeinsert> </p2:iterate> <columns> - <column key="true">serviceID</column> - <column>name</column> - <column>providerName</column> - <column>transportID</column> - <column>type</column> - <column>defaultAuthority</column> + <serviceID key="true" /> + <name /> + <providerName /> + <transportID /> + <type /> + <defaultAuthority /> </columns> </p2:sqlmerge> </block> -- cgit v1.2.3