fixing comparing rank terms

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / json / processor / bean / TaxonNodeDaoBeanProcessor.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
index 709520eec9c3e2659e81bd0b3117b3da11fce4a2..bdbbda36c26d26c3e122a25b29266668416a4f34 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
@@ -39,14 +39,22 @@ public class TaxonNodeDaoBeanProcessor implements JsonBeanProcessor {
                List<TaggedText> taggedTitle = TaxonNameBaseBeanProcessor.getTaggedName(node.getTaxon().getName());\r
                json.element("taggedTitle", taggedTitle, jsonConfig);\r
                json.element("taxonUuid", node.getTaxon().getUuid(), jsonConfig);\r
-               json.element("secUuid", node.getTaxon().getSec().getUuid(), jsonConfig);\r
+               //Sec can be null (web services can return null for sec)\r
+               //comparation made for avoding view exceptions\r
+               if (node.getTaxon().getSec() == null){\r
+                       json.element("secUuid", "null");\r
+               }else{\r
+                       json.element("secUuid", node.getTaxon().getSec().getUuid(), jsonConfig);\r
+               }       \r
                json.element("taxonomicChildrenCount", node.getCountChildren(), jsonConfig);\r
+               json.element("unplaced", node.getTaxon().isUnplaced());\r
+               json.element("excluded", node.getTaxon().isExcluded());\r
                String ranklabel = null;\r
                if(node.getTaxon().getName().getRank() != null){\r
                        ranklabel = node.getTaxon().getName().getRank().getLabel();\r
                }\r
                json.element("rankLabel", ranklabel, jsonConfig);\r
-               //json.element("treeUuid", node.getTaxonomicTree().getUuid(), jsonConfig);\r
+               //json.element("treeUuid", node.getClassification().getUuid(), jsonConfig);\r
                \r
                return json;\r
        }\r