fix the review data of the step 2 and fixed a bug with filter in data…

… validation
CIAT-DAPA · Jun 26, 2015 · d094f55 · d094f55
1 parent fcc9578
commit d094f55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/OccurrencesValidation/src/Controllers/Occurrences/CTempOccurrences.java b/OccurrencesValidation/src/Controllers/Occurrences/CTempOccurrences.java
@@ -314,8 +314,10 @@ else if(p.getTypePolicy()==TypePolicy.TNRS_QUERY)
                         tnrs=RepositoryTNRS.get(name, true);
                         if(tnrs==null)
                             tnrs=RepositoryTNRS.get(name, false);
-                        if(tnrs==null)
+                        if(tnrs==null){
+                            review_data +="||||||||||||||||||||||||||||||||";
                             throw new Exception("Taxon not found in TNRS: " + name);
+                        }
                         for(TNRS t:tnrs)
                         {
                             if(t.finalTaxon!=null && !t.finalTaxon.equals(""))
@@ -336,8 +338,10 @@ else if(p.getTypePolicy()==TypePolicy.TAXONDSTAND_QUERY)
                     {
                         name=generateName(entity," ");
                         taxonstand=RepositoryTaxonstand.get(name);
-                        if(taxonstand==null)
+                        if(taxonstand==null){
+                            review_data +="|||||||||||||||||";
                             throw new Exception("Taxon not found in taxonstand: " + name);
+                        }
                         else
                         {
                             review_data+=taxonstand.toString();

diff --git a/OccurrencesValidation/src/Models/Occurrences/Repository/RepositoryTempOccurrences.java b/OccurrencesValidation/src/Models/Occurrences/Repository/RepositoryTempOccurrences.java
@@ -67,7 +67,7 @@ public void listCrossCheck(String condition) throws SQLException{
                     "comments, " +
                     "grin_final_taxon " +
                     "From " + super.getTable() + " " +
-                    condition != null && !condition.equals("") ? "Where " + condition : "");
+                    (condition != null && !condition.equals("") ? "Where " + condition : ""));
     }
 
     /**