Don't keep a reused Soup.Message around just for error reporting
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 28 May 2010 18:46:23 +0000 (20:46 +0200)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 28 May 2010 20:18:34 +0000 (22:18 +0200)
src/adac-mitfahrclub.vala

index 516c9af..b192408 100644 (file)
@@ -84,7 +84,6 @@ public class AdacMitfahrclub {
        const string BASE_URI = "http://mitfahrclub.adac.de";
 
        Soup.SessionAsync session;
-       Soup.Message message;
        List<City> city_list = null;
 
        public AdacMitfahrclub () {
@@ -96,7 +95,7 @@ public class AdacMitfahrclub {
        }
 
        private async Html.Doc* get_html_document (string url) {
-               message = new CallbackMessage (url, get_html_document.callback);
+               var message = new CallbackMessage (url, get_html_document.callback);
                session.queue_message (message, message_finished);
 
                yield;
@@ -168,22 +167,19 @@ public class AdacMitfahrclub {
        public async unowned List<City>? download_city_list () {
                var doc = yield get_html_document (BASE_URI);
                if (doc == null) {
-                       print ("Error: parsing failed");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: parsing failed\n");
                        return null;
                }
 
                var form = search_tag_by_id (doc->children, "form", "search_national_form");
                if (form == null) {
-                       print ("Error: does not contain search_national_form");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: does not contain search_national_form\n");
                        return null;
                }
 
                var select = search_tag_by_name (form->children, "select", "city_from");
                if (select == null) {
-                       print ("Error: does not contain city_from");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: does not contain city_from\n");
                        return null;
                }
 
@@ -275,15 +271,13 @@ public class AdacMitfahrclub {
 
                var doc = yield get_html_document (url);
                if (doc == null) {
-                       print ("Error: parsing failed");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: parsing failed\n");
                        return null;
                }
 
                var table = search_tag_by_class (doc->children, "table", "list p_15");
                if (table == null) {
-                       print ("Error: does not contain list p_15 table");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: does not contain list p_15 table\n");
                        return null;
                }
 
@@ -376,15 +370,13 @@ public class AdacMitfahrclub {
 
                var doc = yield get_html_document (url);
                if (doc == null) {
-                       print ("Error: parsing failed");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: parsing failed\n");
                        return false;
                }
 
                var table = search_tag_by_class (doc->children, "table", "lift");
                if (table == null) {
-                       print ("Error: does not contain lift table");
-                       print ("%s\n", (string) message.response_body.data);
+                       stderr.printf ("Error: does not contain lift table\n");
                        return false;
                }