Author: bpoussin Date: 2010-12-03 18:58:41 +0100 (Fri, 03 Dec 2010) New Revision: 564 Url: http://nuiton.org/repositories/revision/wikitty/564 Log: refactor: use WikittyTreeNodeHelper to simplify code Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-03 17:13:30 UTC (rev 563) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-03 17:58:41 UTC (rev 564) @@ -71,6 +71,7 @@ import java.io.File; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; /** * @@ -255,7 +256,7 @@ return null; } parentId = (String) doc.getFieldValue(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); - parents.put(nodeId, parentId); + putParent(nodeId, parentId); } Collection<String> deletedDocIds = solrResource.getDeletedDocs(); @@ -543,7 +544,7 @@ if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - Set<String> attachments = w.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); + Set<String> attachments = WikittyTreeNodeHelper.getAttachment(w); reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children @@ -566,7 +567,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); + String parentId = WikittyTreeNodeHelper.getParent(w); reindexChildTreeNode.putParent(id, parentId); }