From 998d33adec5c1d5b71478e0d7a9571b221e9d4dd Mon Sep 17 00:00:00 2001
From: Mohammed Le Doze <mohammed.ledoze@gmail.com>
Date: Wed, 13 Oct 2010 12:56:02 +0000
Subject: [PATCH] updated parseCategories updated buildSearchUrl to handle the
 Genre.getList specific url

---
 .../src/com/moviejukebox/themoviedb/TheMovieDb.java       | 3 ++-
 .../src/com/moviejukebox/themoviedb/tools/DOMParser.java  | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
index 6785076d2..f2ef7bc29 100644
--- a/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
+++ b/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
@@ -410,6 +410,7 @@ public class TheMovieDb {
         List<Category> categories = new ArrayList<Category>();
         Document doc = null;
         String url = this.buildSearchUrl(GENRES_GET_LIST, "", language);
+
         try {
             doc = DOMHelper.getEventDocFromUrl(url);
             categories = DOMParser.parseCategories(doc);
@@ -483,7 +484,7 @@ public class TheMovieDb {
         String searchUrl = apiSite + prefix + "/" + language + "/xml/" + apiKey;
         if (prefix.equals(MOVIE_BROWSE)) {
             searchUrl += "?";
-        } else {
+        } else if (!prefix.equals(GENRES_GET_LIST)) {
             searchUrl += "/";
         }
         searchUrl += searchTerm;
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMParser.java b/themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMParser.java
index 2bb76da98..c764016ae 100644
--- a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMParser.java
+++ b/themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMParser.java
@@ -382,7 +382,7 @@ public class DOMParser {
      */
     public static List<Category> parseCategories(Document doc) {
         List<Category> categories = new ArrayList<Category>();
-        NodeList genres = doc.getElementsByTagName("genres");
+        NodeList genres = doc.getElementsByTagName("genre");
         if( (genres == null) || genres.getLength() == 0) {
             return categories;
         }
@@ -392,10 +392,10 @@ public class DOMParser {
             if (node.getNodeType() == Node.ELEMENT_NODE) {
                 Element element = (Element) node;
                 Category category = new Category();
-                category.setId(element.getAttribute("id"));
-                category.setName(DOMHelper.getValueFromElement(element, "name"));
-                category.setType(DOMHelper.getValueFromElement(element, "type"));
+                category.setName(element.getAttribute("name"));
+                category.setId(DOMHelper.getValueFromElement(element, "id"));
                 category.setUrl(DOMHelper.getValueFromElement(element, "url"));
+                category.setType(""); // there are no type in the XML
                 categories.add(category);
             }
         }