From 76d247bc966a5ce34b4cc7da5fecc429fdb8fddb Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 19 Apr 2009 18:43:32 +0000
Subject: [PATCH] Integrate Upstream r 1865/1870: Bug fixes for
 ccm-ldn-exporter

git-svn-id: https://svn.libreccm.org/ccm/trunk@144 8810af33-2d31-482b-a856-94f89814c4df
---
 .../arsdigita/london/exporter/CategoryExporter.java | 13 +++++++++----
 .../arsdigita/london/exporter/ItemExportTool.java   |  8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java b/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
index 368eb9ea8..8b8af907f 100755
--- a/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
+++ b/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
@@ -33,6 +33,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.apache.log4j.Logger;
 
 import com.arsdigita.categorization.Category;
+import com.arsdigita.categorization.CategoryNotFoundException;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.domain.DomainCollection;
@@ -195,10 +196,14 @@ public class CategoryExporter {
         Element dstTerm = dst.newChildElement("terms:term",
                                               TERMS_XML_NS);
         dstTerm.addAttribute("id", idMap.get(dstCat).toString());
-        
-        if (dstCat.getDefaultParentCategory().equals(srcCat)) {
-            dst.addAttribute("isDefault", "true");
-        } else {
+            
+        try {
+            if (dstCat.getDefaultParentCategory().equals(srcCat)) {
+                dst.addAttribute("isDefault", "true");
+            } else {
+                dst.addAttribute("isDefault", "false");
+            }
+        } catch (CategoryNotFoundException e) {
             dst.addAttribute("isDefault", "false");
         }
         dst.addAttribute("isPreferred", "true");
diff --git a/ccm-ldn-exporter/src/com/arsdigita/london/exporter/ItemExportTool.java b/ccm-ldn-exporter/src/com/arsdigita/london/exporter/ItemExportTool.java
index 049ee1c15..1e464b330 100755
--- a/ccm-ldn-exporter/src/com/arsdigita/london/exporter/ItemExportTool.java
+++ b/ccm-ldn-exporter/src/com/arsdigita/london/exporter/ItemExportTool.java
@@ -47,13 +47,13 @@ public class ItemExportTool extends Program {
         }
 
         File itemDir = new File(args[0]);
-        if (!itemDir.exists() && !itemDir.mkdir()) {
-            System.err.println("mkdir " + itemDir + "failed");
+        if (!itemDir.exists() && !itemDir.mkdirs()) {
+            System.err.println("mkdirs " + itemDir + "failed");
             return;
         }
         File assetDir = new File(args[1]);
-        if (!assetDir.exists() && !assetDir.mkdir()) {
-            System.err.println("mkdir " + assetDir + "failed");
+        if (!assetDir.exists() && !assetDir.mkdirs()) {
+            System.err.println("mkdirs " + assetDir + "failed");
             return;
         }