ref #7525 restoring all previously removed Criteria methods

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / specimen / abcd206 / in / AbcdParseUtility.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdParseUtility.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdParseUtility.java
index f19a070324c45265b26f9159a93d62458a8a4303..2fa0adf027612d33a3ce1b4e0a2b467efb264971 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdParseUtility.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdParseUtility.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
@@ -31,7 +31,7 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
 
 /**
  * @author pplitzner
- * @date 16.06.2015
+ * @since 16.06.2015
  *
  */
 public class AbcdParseUtility {
@@ -60,7 +60,7 @@ public class AbcdParseUtility {
 
     public static String parseFirstTextContent(NodeList nodeList, boolean cleanUpWhiteSpaces){
         String string = null;
-        if(nodeList.getLength()>0){
+        if(nodeList!=null && nodeList.getLength()>0){
             string = nodeList.item(0).getTextContent();
             if(cleanUpWhiteSpaces){
                 string = string.replace("\n", "").replaceAll("( )+", " ").trim();
@@ -120,10 +120,10 @@ public class AbcdParseUtility {
         return date;
     }
 
-    public static Reference parseFirstReference(NodeList referenceNodeList, ICdmApplicationConfiguration cdmAppController){
+    public static Reference parseFirstReference(NodeList referenceNodeList, ICdmRepository cdmAppController){
         String referenceCitation = AbcdParseUtility.parseFirstTextContent(referenceNodeList);
         //check if reference already exists
-        List<Reference> matchingReferences = cdmAppController.getReferenceService().findByTitle(Reference.class, referenceCitation, MatchMode.EXACT, null, null, null, null, null).getRecords();
+        List<Reference> matchingReferences = cdmAppController.getReferenceService().findByTitleWithRestrictions(Reference.class, referenceCitation, MatchMode.EXACT, null, null, null, null, null).getRecords();
         Reference reference;
         if(matchingReferences.size()==1){
             reference = matchingReferences.iterator().next();