From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Tue, 18 Apr 2006 18:30:57 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: BEFORE_MAVEN_MIGRATION~101
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=de4b9e7cc70d0eba1c9f6e392fe50aa01c870b2b;p=utils
---
diff --git a/build/trailer.xml b/build/trailer.xml
index f5b63efc..92896545 100644
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -226,6 +226,12 @@
</target>
<target name="dist-lite" depends="clean,dist-lite-product,dist-lite-test">
+ <if>
+ <isset property="post-dist-lite"/>
+ <then>
+ <antcall target="post-dist-lite"/>
+ </then>
+ </if>
</target>
<target name="dist-javadoc" depends="javadoc,pdfdoc,testjavadoc">
diff --git a/crawler/kiss/build.xml b/crawler/kiss/build.xml
index 846fd7c1..234ed570 100644
--- a/crawler/kiss/build.xml
+++ b/crawler/kiss/build.xml
@@ -25,6 +25,37 @@
mentioned below again -->
<target name="module.test.deps" depends="wamblee.support.test.d,wamblee.crawler.test.d">
</target>
+
+ <property name="post-dist-lite" value="yes"/>
+
+ <target name="post-dist-lite" depends="init_directory_properties">
+ <property name="module.install.dir" value="${module.build.dir}/kiss-crawler"/>
+
+ <mkdir dir="${module.install.dir}"/>
+ <mkdir dir="${module.install.dir}/bin"/>
+ <copy todir="${module.install.dir}/bin">
+ <fileset dir="conf/kiss">
+ <include name="run.sh"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${module.install.dir}/conf"/>
+ <copy todir="${module.install.dir}/conf">
+ <fileset dir="conf/kiss">
+ <include name="config.xml.example"/>
+ <include name="programs.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${module.install.dir}/lib"/>
+ <copy todir="${module.install.dir}/lib" flatten="yes">
+ <fileset dir="${external.lib.dir}" includes="*.jar"/>
+ <fileset dir="${module.build.dir}" includes="**/*.jar"/>
+ </copy>
+
+ <zip destfile="${module.build.dir}/kiss-crawler.zip"
+ basedir="${module.install.dir}"/>
+ </target>
&trailer;
diff --git a/crawler/kiss/conf/kiss/programs.xml b/crawler/kiss/conf/kiss/programs.xml
index 6f105b82..8c8850d7 100644
--- a/crawler/kiss/conf/kiss/programs.xml
+++ b/crawler/kiss/conf/kiss/programs.xml
@@ -69,12 +69,23 @@
<match>star trek</match>
</program>
+ <program>
+ <priority>9</priority>
+ <match>dr.*who</match>
+ </program>
+
+ <program>
+ <priority>9</priority>
+ <match>the.*x.*files</match>
+ </program>
+
<program>
<priority>9</priority>
<match>buffy.*vampire.*slayer</match>
</program>
<program>
+ <action>notify</action>
<match>de.*wereld.*draait.*door</match>
</program>
diff --git a/crawler/kiss/docs/content/xdocs/index.xml b/crawler/kiss/docs/content/xdocs/index.xml
index 8886d717..4afa8fd5 100644
--- a/crawler/kiss/docs/content/xdocs/index.xml
+++ b/crawler/kiss/docs/content/xdocs/index.xml
@@ -18,7 +18,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Welcome to the KiSS crawler</title>
+ <title>Automatic recording for KiSS hard disk recorders</title>
</header>
<body>
<section id="overview">
diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
index 0c01a9bc..73559310 100644
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
@@ -62,16 +62,6 @@ public class KissCrawler {
*/
private static final String START_URL = "http://epg.kml.kiss-technology.com/login_core.php";
- /**
- * Crawler configuration file.
- */
- private static final String CRAWLER_CONFIG = "config.xml";
-
- /**
- * Configuration file describing interesting programs.
- */
- private static final String PROGRAM_CONFIG = "programs.xml";
-
/**
* Regular expression for matching time interval strings in the retrieved
* pages.
@@ -92,7 +82,9 @@ public class KissCrawler {
* In case of problems.
*/
public static void main(String[] aArgs) throws Exception {
- new KissCrawler(START_URL, CRAWLER_CONFIG, PROGRAM_CONFIG);
+ String crawlerConfig = new File(aArgs[0]).getCanonicalPath();
+ String programConfig = new File(aArgs[1]).getCanonicalPath();
+ new KissCrawler(START_URL, crawlerConfig, programConfig);
}
/**