Place config display of daily_start within channel section. Always display broadcast section

src/main/java/altk/comm/engine/Broadcast.java

@@ -48,6 +48,7 @@ public abstract class Broadcast
     private static final long SLEEP_BETWEEN_JOBS_DEFAULT = 0;
 	static final String DAILY_STOP_KEY = "daily_stop";
 	static final String DAILY_START_KEY = "daily_start";
+	static final String CHANNEL_KEY = "channel";
 
 	static final String CSV_LOGGER = "csv";
 	
@@ -77,6 +78,7 @@ public abstract class Broadcast
 	private Postback postback;
 	protected String daily_start = ""; 
 	protected String daily_stop = "";
+	public JSONObject channel_json;
 	
 	/**
 	 * Sleep time in milliseconds between consecutive job processing (actualliy batch)
@@ -1022,7 +1024,7 @@ public abstract class Broadcast
 		if (reason == ACTION_BY_CLOCK) {
 			boolean inAcceptqble = false;
 			for (String acceptable  : getPauseModesResumableByClock()) {
-				if (this.reason.equalsIgnoreCase(acceptable)) inAcceptqble = true;
+				if (this.reason.startsWith(acceptable)) inAcceptqble = true;
 			}
 			if (!inAcceptqble) return null;
 		}
@@ -1467,8 +1469,6 @@ public abstract class Broadcast
 	@SuppressWarnings("unchecked")
 	public JSONObject getConfigJSON() {
     	JSONObject dataMap = new JSONObject();
-    	dataMap.put(DAILY_START_KEY, daily_start);
-    	dataMap.put(DAILY_STOP_KEY, daily_stop);
     	childAddConfigJSON(dataMap);
 		return dataMap;
 	}
@@ -1500,5 +1500,9 @@ public abstract class Broadcast
 		job.setErrorText(errorText);
 		return true;
 	}
+	
+	public String getChannelName() {
+		return (String)channel_json.get("name");
+	}
 
 }

src/main/java/altk/comm/engine/CommEngine.java

@@ -469,7 +469,7 @@ public abstract class CommEngine extends HttpServlet
     			broadcastsConfig.put(broadcastId, broadcast.getConfigJSON());
     		}
     	}
-    	if (broadcastsConfig.size() > 0) config.put("broadcasts", broadcastsConfig);
+    	config.put("broadcasts", broadcastsConfig);
     	
     	childAddConfig(config);
     	

src/main/java/altk/comm/engine/XMLSAXBroadcast.java

@@ -11,6 +11,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -104,13 +106,17 @@ public abstract class XMLSAXBroadcast extends Broadcast
             {
                 postbackURL = getTrimmedText();
             }
-            else if (qName.equals(DAILY_STOP_KEY))
+            else if (qName.equals(CHANNEL_KEY))
             {
-            	daily_stop = getTrimmedText();
-            }
-            else if (qName.equals(DAILY_START_KEY))
-            {
-            	daily_start = getTrimmedText();
+	    		String channel_str = getTrimmedText();
+    	    	try {
+    	        	JSONParser jsonParser = new JSONParser();
+					channel_json = (JSONObject) jsonParser.parse(channel_str);
+				} catch (org.json.simple.parser.ParseException e) {
+					throw new RuntimeException(String.format("<%s> is not json string: %s", CHANNEL_KEY, channel_str));
+				}
+    	    	daily_stop = (String)channel_json.get("broadcast_daily_stop");
+    	    	daily_start = (String)channel_json.get("broadcast_daily_start");
             }
             else if (inRecipientProp)
             {