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

5
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 org.apache.log4j.Logger;
import com.arsdigita.categorization.Category; import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryNotFoundException;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;
@ -196,11 +197,15 @@ public class CategoryExporter {
TERMS_XML_NS); TERMS_XML_NS);
dstTerm.addAttribute("id", idMap.get(dstCat).toString()); dstTerm.addAttribute("id", idMap.get(dstCat).toString());
try {
if (dstCat.getDefaultParentCategory().equals(srcCat)) { if (dstCat.getDefaultParentCategory().equals(srcCat)) {
dst.addAttribute("isDefault", "true"); dst.addAttribute("isDefault", "true");
} else { } else {
dst.addAttribute("isDefault", "false"); dst.addAttribute("isDefault", "false");
} }
} catch (CategoryNotFoundException e) {
dst.addAttribute("isDefault", "false");
}
dst.addAttribute("isPreferred", "true"); 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]); File itemDir = new File(args[0]);
if (!itemDir.exists() && !itemDir.mkdir()) { if (!itemDir.exists() && !itemDir.mkdirs()) {
System.err.println("mkdir " + itemDir + "failed"); System.err.println("mkdirs " + itemDir + "failed");
return; return;
} }
File assetDir = new File(args[1]); File assetDir = new File(args[1]);
if (!assetDir.exists() && !assetDir.mkdir()) { if (!assetDir.exists() && !assetDir.mkdirs()) {
System.err.println("mkdir " + assetDir + "failed"); System.err.println("mkdirs " + assetDir + "failed");
return; return;
} }