LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
pb 2009-04-19 18:43:32 +00:00
parent 380a76bb15
commit 76d247bc96
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
View File

@ -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");

8
ccm-ldn-exporter/src/com/arsdigita/london/exporter/ItemExportTool.java
View File

@ -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;
}