Author: ruchira Date: Mon Aug 3 06:15:09 2009 New Revision: 42458 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=42458
Log: Modified tomatoTube mashup logic Modified: branches/mashup/java/2.0/product/modules/samples/tomatoTube/tomatoTube.js branches/mashup/java/2.0/product/pom.xml Modified: branches/mashup/java/2.0/product/modules/samples/tomatoTube/tomatoTube.js URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/2.0/product/modules/samples/tomatoTube/tomatoTube.js?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/mashup/java/2.0/product/modules/samples/tomatoTube/tomatoTube.js (original) +++ branches/mashup/java/2.0/product/modules/samples/tomatoTube/tomatoTube.js Mon Aug 3 06:15:09 2009 @@ -39,6 +39,7 @@ function readTomatoTubeFeed(mode) { + var taskName = session.get("taskName"); //Checking for supported input types if (!((mode == "theater") | (mode == "dvd"))) { return new XML("Invalid input. Currently supported modes are 'theater' and 'dvd'."); @@ -55,12 +56,13 @@ liveFeedFile.close(); mashedUpFeed = mashedUpFeed.substring(mashedUpFeed.indexOf("?>") + 2); - //Check whether a scheduler exists for this feed mode - var schedulerState = session.get("schedulerStarted_" + mode); + //Check whether the task is active + var state = system.isTaskActive(taskName); + - logMessage("Current scheduler active status for " + mode + " is '" + schedulerState + "'"); + logMessage("Current scheduler active status for " + mode + " is '" + state + "'"); - if (!(schedulerState == "true")) { + if (!state) { startPeriodicRefresh(mode, true); } @@ -241,19 +243,21 @@ try { var functionString = "createTomatoeTubeFeed('" + mode + "');"; - var scheduler_id = ""; + var taskName = ""; if (startNow) { - scheduler_id = system.setInterval(functionString, 1000 * 60 * 60); + taskName = system.setInterval(functionString, 1000 * 60 * 60); } else { //Setting start time to 60 minutes from now var startTime = new Date(); startTime.setMinutes(startTime.getMinutes() + 60); - scheduler_id = system.setInterval(functionString, 1000 * 60 * 60, null, startTime); + taskName = system.setInterval(functionString, 1000 * 60 * 60, null, startTime); } //Flagging scheduler state in session session.put("schedulerStarted_" + mode, new String("true")); + //Store task name to get the task state + session.put("taskName", taskName); } catch(err) { logMessage(err, "error"); Modified: branches/mashup/java/2.0/product/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/2.0/product/pom.xml?rev=42458&r1=42457&r2=42458&view=diff ============================================================================== --- branches/mashup/java/2.0/product/pom.xml (original) +++ branches/mashup/java/2.0/product/pom.xml Mon Aug 3 06:15:09 2009 @@ -118,7 +118,7 @@ <properties> <carbon.version>2.0.0</carbon.version> - <mashup.components.version>2.0.0.SNAPSHOT</mashup.components.version> + <mashup.components.version>2.1.0-SNAPSHOT</mashup.components.version> <axis2.json.version>1.5.0.wso2v1</axis2.json.version> <axiom-e4x.version>2.0.0.SNAPSHOT</axiom-e4x.version> <mashup.version>2.0.0.SNAPSHOT</mashup.version> _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
