From 21f592bf3c2f09f41cbc3c9c6a34ffe5d70df834 Mon Sep 17 00:00:00 2001
From: thlo <t.lohmar@gmx.de>
Date: Mon, 7 Jan 2013 20:36:08 +0100
Subject: Various fixes.

---
 vdr-smarttvweb/web/Server.js  | 16 +++++++++-------
 vdr-smarttvweb/web/index.html |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'vdr-smarttvweb/web')

diff --git a/vdr-smarttvweb/web/Server.js b/vdr-smarttvweb/web/Server.js
index 9fb39c5..14385df 100755
--- a/vdr-smarttvweb/web/Server.js
+++ b/vdr-smarttvweb/web/Server.js
@@ -32,7 +32,7 @@ Server.fetchVideoList = function(url) {
     if (this.XHRObj) {
         this.XHRObj.onreadystatechange = function()
             {
-            var splashElement = document.getElementById("splashStatus");  
+ //           var splashElement = document.getElementById("splashStatus");  
 
         	if (Server.XHRObj.readyState == 4) {
                     Server.createVideoList();
@@ -53,14 +53,14 @@ Server.fetchVideoList = function(url) {
 
 Server.createVideoList = function() {
 	console.log ("creating Video list now");
-	
+	console.log ("status= " + this.XHRObj.status);
+    
 	if (this.XHRObj.status != 200) {
-        if (this.errorCallback != null) {
-        	this.errorCallback("ServerError");
+            if (this.errorCallback != null) {
+        	this.errorCallback(this.XHRObj.responseText);
         }
     }
-    else
-    {
+    else {
     	var xmlResponse = this.XHRObj.responseXML;
     	if (xmlResponse == null) {
             if (this.errorCallback != null) {
@@ -79,7 +79,8 @@ Server.createVideoList = function() {
             var items = xmlElement.getElementsByTagName("item");          
             if (items.length == 0) {
             	console.log("Something wrong. Response does not contain any item");            	
-            };
+	        	this.errorCallback("Empty Response");
+			};
             
             for (var index = 0; index < items.length; index++) {
             	
@@ -94,6 +95,7 @@ Server.createVideoList = function() {
             	    durVal = parseInt(items[index].getElementsByTagName("duration")[0].firstChild.data);
             	}
             	catch (e) {
+					this.errorCallback("XML Parsing Error: " + e);
             	    console.log("ERROR: "+e);
             	}        
            	
diff --git a/vdr-smarttvweb/web/index.html b/vdr-smarttvweb/web/index.html
index 9e1117b..f134ece 100755
--- a/vdr-smarttvweb/web/index.html
+++ b/vdr-smarttvweb/web/index.html
@@ -21,6 +21,10 @@ $(document).ready(function(){
 		
 		// end of dataReceivedCallBack
 		};
+	Server.errorCallback = function (msg) {
+		alert (msg);
+                buttonHandler('rec');
+	};
 
 	$.mobile.loading('show');
 	Server.setSort(true);
-- 
cgit v1.2.3