git://wamblee.org / utils / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6dabf28)
(no commit message)
authorerik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Tue, 18 Apr 2006 18:30:57 +0000 (18:30 +0000)
committererik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Tue, 18 Apr 2006 18:30:57 +0000 (18:30 +0000)
build/trailer.xml patch | blob | history
crawler/kiss/build.xml patch | blob | history
crawler/kiss/conf/kiss/programs.xml patch | blob | history
crawler/kiss/docs/content/xdocs/index.xml patch | blob | history
crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java patch | blob | history

diff --git a/build/trailer.xml b/build/trailer.xml
index f5b63efc525de30f63ae580da051afd905c631bd..92896545fb82328a3288a7b945aa4256cfa9811c 100644 (file)
--- 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 846fd7c1b9217c3869f1bc780902064283a25471..234ed57067e4e5db0117b672af7b29d6dddcfacf 100644 (file)
--- 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 6f105b8250d39338097feb1a68c4f31e04491ffb..8c8850d78d69ab3679136bae7dae7e50e0930d08 100644 (file)
--- 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 8886d717b14d8903228e96465ebd0edfcebf99a8..4afa8fd584e4ab2f76ed26385d5cf4ec8f04f371 100644 (file)
--- 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 0c01a9bcc3e9a712df3a3553a54c265b1e4b7cc0..735593109c20992c77c09106ec6f9ac38be02ed6 100644 (file)
--- 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);
     }
 
     /**
http://utils.wamblee.org