X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=crawler%2Fkiss%2Fsrc%2Forg%2Fwamblee%2Fcrawler%2Fkiss%2Fmain%2FProgramConfigurationParser.java;h=fc41cde40aae4340b1f338f523a875433fdcc875;hb=11623a4d8037ad0be9e59d8ce3f7115af717167c;hp=24d7d9b3f93dda8f1e933e08f7dc01c1d925190d;hpb=3477b9963f17a8d32a1b62a80f80bcac9df939cf;p=utils

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
index 24d7d9b3..fc41cde4 100644
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
@@ -30,62 +30,44 @@ import org.wamblee.conditions.AndCondition;
 import org.wamblee.conditions.Condition;
 import org.wamblee.conditions.PropertyRegexCondition;
 import org.wamblee.crawler.kiss.guide.Program;
-import org.wamblee.crawler.kiss.notification.MailNotifier;
-import org.wamblee.crawler.kiss.notification.MailServer;
-import org.wamblee.crawler.kiss.notification.Notifier;
+import org.wamblee.xml.XslTransformer;
 
 /**
  * Parse the configuration of desired programs.
  */
 class ProgramConfigurationParser {
-
-    private static final String ELEM_PASSWORD = "password";
-
-    private static final String ELEM_USERNAME = "username";
-
-    private static final String ELEM_PORT = "port";
-
-    private static final String ELEM_HOST = "host";
+    private static final int DEFAULT_SMTP_PORT = 25;
+    
+    private static final int DEFAULT_PRIORITY = 1; 
 
     // Formatting configuration.
     private static final String ELEM_FORMAT = "format";
-    
+
     private static final String ELEM_TEXT = "text";
 
     private static final String ELEM_HTML = "html";
 
- 
-    // Mail server configuration.
-
-    private static final String ELEM_NOTIFICATION = "notification";
-    
-    private static final String ELEM_SMTP = "smtp";
-
-    private static final String ELEM_SUBJECT = "subject";
-
-    private static final String ELEM_TO = "to";
-
-    private static final String ELEM_FROM = "from";
-
     // Configuration of interesting programs.
 
     private static final String ELEM_PROGRAM = "program";
+    
+    private static final String ELEM_PRIORITY = "priority";
 
     private static final String ELEM_PATTERN = "match";
 
     private static final String ELEM_ACTION = "action";
-    
+
     private static final String ELEM_CATEGORY = "category";
 
     private static final String ACTION_NOTIFY = "notify";
+
+    private List<ProgramFilter> _filters;
     
-    private List<ProgramFilter> _filters; 
-    
-    private Notifier _notifier; 
-    
-    ProgramConfigurationParser() { 
-        _filters = null; 
-        _notifier = null; 
+    private XslTransformer _transformer;
+
+    ProgramConfigurationParser(XslTransformer aTransformer) {
+        _filters = null;
+        _transformer = aTransformer;
     }
 
     /**
@@ -108,95 +90,52 @@ class ProgramConfigurationParser {
 
                 Element categoryElem = program.element(ELEM_CATEGORY);
                 String category = "";
-                if ( categoryElem != null ) { 
-                    category = categoryElem.getText().trim(); 
+                if (categoryElem != null) {
+                    category = categoryElem.getText().trim();
                 }
-                
+
                 Element actionElem = program.element(ELEM_ACTION);
-                ProgramAction action = new RecordProgramAction();
+                int priority = DEFAULT_PRIORITY; 
+                String priorityString = program.elementTextTrim(ELEM_PRIORITY);
+                if ( priorityString != null ) { 
+                    priority = Integer.valueOf(priorityString);
+                }
+                ProgramAction action = new RecordProgramAction(priority);
                 if (actionElem != null) {
                     if (actionElem.getText().equals(ACTION_NOTIFY)) {
                         action = new InterestingProgramAction(category);
                     }
                 }
-              
-                List<Condition<Program>> regexConditions = 
-                    new ArrayList<Condition<Program>>();
-                for (Iterator j = program.elementIterator(ELEM_PATTERN); j.hasNext(); ) {
-                    Element patternElem = (Element)j.next();
-                    String fieldName = "name"; 
-                    Attribute fieldAttribute = patternElem.attribute("field"); 
-                    if ( fieldAttribute != null ) { 
-                        fieldName = fieldAttribute.getText(); 
+
+                List<Condition<Program>> regexConditions = new ArrayList<Condition<Program>>();
+                for (Iterator j = program.elementIterator(ELEM_PATTERN); j
+                        .hasNext();) {
+                    Element patternElem = (Element) j.next();
+                    String fieldName = "name";
+                    Attribute fieldAttribute = patternElem.attribute("field");
+                    if (fieldAttribute != null) {
+                        fieldName = fieldAttribute.getText();
                     }
-                    String pattern = ".*(" + patternElem.getText()
-                    + ").*";
-                    regexConditions.add(new PropertyRegexCondition<Program>(fieldName, pattern, true));
+                    String pattern = ".*(" + patternElem.getText() + ").*";
+                    regexConditions.add(new PropertyRegexCondition<Program>(
+                            fieldName, pattern, true));
                 }
-                Condition<Program> condition = new AndCondition<Program>(regexConditions);
+                Condition<Program> condition = new AndCondition<Program>(
+                        regexConditions);
                 filters.add(new ProgramFilter(condition, action));
             }
             _filters = filters;
-            
-            Element notifier = root.element(ELEM_NOTIFICATION);
-            _notifier = parseNotifier(notifier);
-            
         } catch (DocumentException e) {
             throw new RuntimeException("Error parsing program configuraiton", e);
         }
     }
-    
-    /**
-     * Parses the notifier
-     * @return Notifier
-     */
-    private Notifier parseNotifier(Element aNotifier) { 
-        String from = aNotifier.elementTextTrim(ELEM_FROM);
-        String to = aNotifier.elementTextTrim(ELEM_TO);
-        String subject = aNotifier.elementTextTrim(ELEM_SUBJECT);
-        
-        Element smtp = aNotifier.element(ELEM_SMTP);
-        MailServer server = parseMailServer( smtp );
-        
-        Element format = aNotifier.element(ELEM_FORMAT);
-        String htmlXslt = format.elementTextTrim(ELEM_HTML);
-        String textXslt = format.elementTextTrim(ELEM_TEXT);
-        
-        return new MailNotifier(from, to, subject, htmlXslt, textXslt, server);
-    }
 
-    /**
-     * Parses the mail server from the XML.
-     * @param aSmtp Mail server configuration.
-     * @return Mail server.
-     */
-    private MailServer parseMailServer( Element aSmtp ) {
-        String host = aSmtp.elementTextTrim(ELEM_HOST);
-        Element portElem = aSmtp.element(ELEM_PORT);
-        int port = 25; 
-        if ( portElem != null ) {
-            port = Integer.valueOf(portElem.getTextTrim());
-        }
-        String username = aSmtp.elementTextTrim(ELEM_USERNAME);
-        String password = aSmtp.elementTextTrim(ELEM_PASSWORD);
-        
-        MailServer server = new MailServer(host, port, username, password);
-        return server;
-    }
-    
     /**
      * Returns the list of program filters.
+     * 
      * @return Filter list.
      */
-    public List<ProgramFilter> getFilters() { 
+    public List<ProgramFilter> getFilters() {
         return _filters;
     }
-    
-    /**
-     * Returns the notifier to use. 
-     * @return Notifier.
-     */
-    public Notifier getNotifier() { 
-        return _notifier; 
-    }
 }