ref #9932 implement reference import (1st version) for Mexico Eflora import
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 10 Feb 2022 22:35:56 +0000 (23:35 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 10 Feb 2022 22:35:56 +0000 (23:35 +0100)
14 files changed:
app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameRefImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionRefImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefArticlesImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefSerialsImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefWebSitesImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraReferenceImportBase.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonRelationImport.java

index f1e4a20805131ee81407d90c43aca12e216ec3ee..49c6cd7004f62b4976d3477e709b0861f57afa50 100644 (file)
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2022 EDIT
 * European Distributed Institute of Taxonomy
@@ -38,8 +37,8 @@ public class MexicoEfloraActivator {
     //database validation status (create, update, validate ...)
     static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;
 
-//    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_cdmtest_mysql();
-    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_test1();
+    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_cdmtest_mysql();
+//    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_test1();
 
     //feature tree uuid
     public static final UUID featureTreeUuid = UUID.fromString("dd2070ef-e75b-494b-bc6a-4a370271866b");
index bc9bb671387b5fccbb51bd40111460be250cd7c5..0799ad78e70a35720e3e2c707e901abc4f273791 100644 (file)
@@ -128,7 +128,7 @@ public class MexicoEfloraCommonNameImport extends MexicoEfloraImportBase {
 
                                //create TaxonName element
                                String idCombi = rs.getString("IdCombinado");
-                           String idNomComun = rs.getString("IdNomComun");
+//                         String idNomComun = rs.getString("IdNomComun");
                            String taxonUuid = rs.getString("taxonUuid");
 
                            String nomComunStr = rs.getString("NomComun");
@@ -158,6 +158,8 @@ public class MexicoEfloraCommonNameImport extends MexicoEfloraImportBase {
                                        false, true);
                                description.addElement(commonName);
 
+                               state.getCommonNameMap().put(idCombi, commonName);
+
                                        partitioner.startDoSave();
                                        taxaToSave.add(taxonBase);
                                } catch (Exception e) {
index 9dd4924de456c3dd5e83ed9eb825654b5fd234c7..77d7a73bf58b26b73c7c3a84b5e3334f0e2eb6c2 100644 (file)
@@ -70,7 +70,7 @@ public class MexicoEfloraCommonNameRefImport extends MexicoEfloraImportBase {
            boolean success = true ;
 
            @SuppressWarnings("unchecked")
-        Map<String, CommonTaxonName> distributionMap = partitioner.getObjectMap(MexicoEfloraCommonNameImport.NAMESPACE);
+        Map<String, CommonTaxonName> commonNameMap = partitioner.getObjectMap(MexicoEfloraCommonNameImport.NAMESPACE);
 
            @SuppressWarnings("unchecked")
            //TODO
@@ -83,28 +83,25 @@ public class MexicoEfloraCommonNameRefImport extends MexicoEfloraImportBase {
                        //      if ((i++ % modCount) == 0 && i!= 1 ){ logger.info("PTaxa handled: " + (i-1));}
 
                                //create TaxonName element
-                               String idCombi = rs.getString("IdDist");
-
+                               String idCombi = rs.getString("IdCombinado");
+                               int idBibliografia = rs.getInt("IdBibliografia");
+                               String observaciones = rs.getString("Observaciones");
                                //needed?
-                               String idNomComun = rs.getString("IdNomComun");
-
-                               String idBibliografia = rs.getString("IdBibliografia");
-                           String observaciones = rs.getString("Observaciones");
+//                             String idNomComun = rs.getString("IdNomComun");
 
                            try {
-                               CommonTaxonName distribution = distributionMap.get(idCombi);
+                               CommonTaxonName commonName = commonNameMap.get(idCombi);
 
-                               Reference ref = referenceMap.get(idBibliografia);
-                               //TODO
-                               String detail = null;
-                               DescriptionElementSource source = distribution.addPrimaryTaxonomicSource(ref, detail);
+                               Reference ref = referenceMap.get(String.valueOf(idBibliografia));
+                               String detail = state.getRefDetailMap().get(idBibliografia);
+
+                               DescriptionElementSource source = commonName.addPrimaryTaxonomicSource(ref, detail);
                                //TODO
                                TaxonName nameUsedInSource = getNameUsedInSource(state, observaciones);
                                source.setNameUsedInSource(nameUsedInSource);
                                //TODO other observaciones
 
                                        partitioner.startDoSave();
-//                                     taxaToSave.add(taxonBase);
                                } catch (Exception e) {
                                        logger.warn("An exception (" +e.getMessage()+") occurred when trying to create common name for id " + idCombi + ".");
                                        success = false;
@@ -115,7 +112,8 @@ public class MexicoEfloraCommonNameRefImport extends MexicoEfloraImportBase {
                        return false;
                }
 
-//             getTaxonService().save(taxaToSave);
+               logger.warn("Finished partition");
+
                return success;
        }
 
index 2c675e74b496276ee151f27dc713f1121432154e..e0ab3c37192126f43889e27bbe8ce0b5da332df7 100644 (file)
@@ -121,14 +121,18 @@ public class MexicoEfloraDistributionImport extends MexicoEfloraImportBase {
                                        false, true);
                                description.addElement(distribution);
 
+                               state.getDistributionMap().put(idCombi, distribution);
+
                                        partitioner.startDoSave();
                                        taxaToSave.add(taxonBase);
                                } catch (Exception e) {
+                                   e.printStackTrace();
                                        logger.warn("An exception (" +e.getMessage()+") occurred when trying to create common name for id " + idCombi + ".");
                                        success = false;
                                }
                        }
                } catch (Exception e) {
+                   e.printStackTrace();
                        logger.error("SQLException:" +  e);
                        return false;
                }
index 993b266e2b201b9b849c8c95a09bd4ce91a452ec..b71892e36b35ec171a1c8ead432e348ac65d0cf8 100644 (file)
@@ -73,8 +73,7 @@ public class MexicoEfloraDistributionRefImport extends MexicoEfloraImportBase {
         Map<String, Distribution> distributionMap = partitioner.getObjectMap(MexicoEfloraDistributionImport.NAMESPACE);
 
            @SuppressWarnings("unchecked")
-           //TODO
-        Map<String, Reference> referenceMap = partitioner.getObjectMap(MexicoEfloraRefArticlesImport.NAMESPACE);
+        Map<String, Reference> referenceMap = partitioner.getObjectMap(MexicoEfloraReferenceImportBase.NAMESPACE);
 
                ResultSet rs = partitioner.getResultSet();
                try{
@@ -84,19 +83,20 @@ public class MexicoEfloraDistributionRefImport extends MexicoEfloraImportBase {
 
                                //create TaxonName element
                                String idCombi = rs.getString("IdDist");
-                               String idBibliografia = rs.getString("IdBibliografia");
+                               int idBibliografia = rs.getInt("IdBibliografia");
                            String observaciones = rs.getString("Observaciones");
 
                            try {
                                Distribution distribution = distributionMap.get(idCombi);
 
-                               Reference ref = referenceMap.get(idBibliografia);
-                               //TODO
-                               String detail = null;
+                               Reference ref = referenceMap.get(String.valueOf(idBibliografia));
+                               String detail = state.getRefDetailMap().get(idBibliografia);
+
                                DescriptionElementSource source = distribution.addPrimaryTaxonomicSource(ref, detail);
                                //TODO
                                TaxonName nameUsedInSource = getNameUsedInSource(state, observaciones);
                                source.setNameUsedInSource(nameUsedInSource);
+
                                //TODO other observaciones
 
                                        partitioner.startDoSave();
@@ -111,15 +111,10 @@ public class MexicoEfloraDistributionRefImport extends MexicoEfloraImportBase {
                        return false;
                }
 
-//             getTaxonService().save(taxaToSave);
+               logger.warn("Partition finished");
                return success;
        }
 
-    /**
-     * @param state
-     * @param observaciones
-     * @return
-     */
     private TaxonName getNameUsedInSource(MexicoEfloraImportState state, String observaciones) {
         // TODO Auto-generated method stub
         return null;
index d8c8abfe9d60b6f724abb1ea15b0803321eaa533..d7638f3bd675faa2c55ce89dc1fba8b6d03a4608 100644 (file)
@@ -44,7 +44,6 @@ public class MexicoEfloraImportConfigurator
        private boolean doOccurrence = true;
        private boolean doOccurrenceSources = true;
        private boolean doFacts = true;
-       private boolean doAuthors = true;
        private boolean doReferences = true;
        private boolean doNamedAreas = true;
 
@@ -62,10 +61,10 @@ public class MexicoEfloraImportConfigurator
     @Override
     protected void makeIoClassList(){
                ioClassList = new Class[]{
-//                     MexicoEfloraRefArticlesImport.class,
-//                     MexicoEfloraRefSerialsImport.class,
-//                     MexicoEfloraRefOtherBooksImport.class,
-//                     MexicoEfloraRefWebSitesImport.class,
+                       MexicoEfloraRefArticlesImport.class,
+                       MexicoEfloraRefSerialsImport.class,
+                       MexicoEfloraRefOtherBooksImport.class,
+                       MexicoEfloraRefWebSitesImport.class,
                        MexicoEfloraRegionImport.class,
                        MexicoEfloraTaxonImport.class,
                        MexicoEfloraTaxonRelationImport.class,
@@ -119,15 +118,6 @@ public class MexicoEfloraImportConfigurator
         this.doOccurrenceSources = doOccurrenceSources;
        }
 
-
-
-       public boolean isDoAuthors() {
-               return doAuthors;
-       }
-       public void setDoAuthors(boolean doAuthors) {
-               this.doAuthors = doAuthors;
-       }
-
        public boolean isDoReferences() {
                return doReferences;
        }
index df2e2cd8f96589a6090d84560bb4b8a837825b83..3ee232674f2f09f8836ad03b85b4e56b39520d24 100644 (file)
@@ -11,10 +11,13 @@ package eu.etaxonomy.cdm.io.mexico;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.io.common.DbImportStateBase;
+import eu.etaxonomy.cdm.model.description.CommonTaxonName;
+import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.location.NamedArea;
@@ -37,11 +40,16 @@ public class MexicoEfloraImportState
 
        private Map<Integer,Feature> featureMap = new HashMap<>();
        private Map<Integer,State> stateMap = new HashMap<>();
-          private Map<Integer,NamedArea> areaMap = new HashMap<>();
+       private Map<Integer,NamedArea> areaMap = new HashMap<>();
 
-       private boolean isReferenceSecondPath = false;
+       private Map<Integer,UUID> referenceUuidMap = new HashMap<>();
+       private Map<Integer,String> refDetailMap = new HashMap<>();
 
-               public MexicoEfloraImportState(MexicoEfloraImportConfigurator config) {
+       private Map<String,CommonTaxonName> commonNameMap = new HashMap<>();
+    private Map<String,Distribution> distributionMap = new HashMap<>();
+
+
+       public MexicoEfloraImportState(MexicoEfloraImportConfigurator config) {
                super(config);
        }
 
@@ -57,14 +65,6 @@ public class MexicoEfloraImportState
                putDefinedTermToMap(tableName, String.valueOf(id), term);
        }
 
-       public boolean isReferenceSecondPath() {
-               return isReferenceSecondPath;
-       }
-
-       public void setReferenceSecondPath(boolean isReferenceSecondPath) {
-               this.isReferenceSecondPath = isReferenceSecondPath;
-       }
-
     public Map<Integer,Feature> getFeatureMap() {
         return featureMap;
     }
@@ -76,4 +76,19 @@ public class MexicoEfloraImportState
     public Map<Integer,NamedArea> getAreaMap() {
         return areaMap;
     }
+
+    public Map<Integer,UUID> getReferenceUuidMap() {
+        return referenceUuidMap;
+    }
+    public Map<Integer,String> getRefDetailMap() {
+        return refDetailMap;
+    }
+
+    public Map<String,CommonTaxonName> getCommonNameMap() {
+        return commonNameMap;
+    }
+    public Map<String,Distribution> getDistributionMap() {
+        return distributionMap;
+    }
+
 }
index 808d1c48e1a9ec8a2cecfeae1b2723b4a02aa4e8..88528f281393f03c65e395d65b5b5890bd21fbd0 100644 (file)
@@ -103,13 +103,14 @@ public class MexicoEfloraRefArticlesImport extends MexicoEfloraReferenceImportBa
                     }
 
                     //concat
+                    String detail = null;
                     if (isNotBlank(concat)) {
                         //TODO split
                         String[] split = concat.split(":");
                         String volume = split[0];
                         if (split.length > 1) {
                             //TODO
-                            String detail = split[1];
+                            detail = split[1];
                         }
                         ref.setVolume(volume);
                     }else {
@@ -132,6 +133,9 @@ public class MexicoEfloraRefArticlesImport extends MexicoEfloraReferenceImportBa
                         ref.getInJournal().setIssn(issnStr);
                     }
 
+                    //register id and make import source
+                    handleId(state, refId, ref, detail);
+
                                        partitioner.startDoSave();
                                        refsToSave.add(ref);
                                } catch (Exception e) {
@@ -148,6 +152,7 @@ public class MexicoEfloraRefArticlesImport extends MexicoEfloraReferenceImportBa
                return success;
        }
 
+
     @Override
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, MexicoEfloraImportState state) {
 
index 5b22c1a06d6059c661e30621f6fbd8dc7169e60c..dc475512979f5962e530b7e1339f826e76d2d154 100644 (file)
@@ -112,6 +112,9 @@ public class MexicoEfloraRefOtherBooksImport extends MexicoEfloraReferenceImport
                         ref.setIsbn(isbnStr);
                     }
 
+                    //register id and make import source
+                    handleId(state, refId, ref, null);
+
                                        partitioner.startDoSave();
                                        refsToSave.add(ref);
                                } catch (Exception e) {
index 5b3f47960e29d9dca8e7e37547140dff34ec7573..4d354da3b1a55b7158ecd83b16a550b3160ff4bc 100644 (file)
@@ -113,6 +113,9 @@ public class MexicoEfloraRefSerialsImport extends MexicoEfloraReferenceImportBas
                         ref.setIsbn(isbnStr);
                     }
 
+                    //register id and make import source
+                    handleId(state, refId, ref, null);
+
                                        partitioner.startDoSave();
                                        refsToSave.add(ref);
                                } catch (Exception e) {
index 9808be316aa78a02e6f2f4cd586d43e1cd604d82..7164a82a7bbf96a1be318318aa8734cbc5cbfd5b 100644 (file)
@@ -106,6 +106,9 @@ public class MexicoEfloraRefWebSitesImport extends MexicoEfloraReferenceImportBa
                         ref.setIssn(issnStr);
                     }
 
+                    //register id and make import source
+                    handleId(state, refId, ref, null);
+
                                        partitioner.startDoSave();
                                        refsToSave.add(ref);
                                } catch (Exception e) {
index d06748b7f73cbe31a2ecd74c7e2be34f95ea6652..ad9d582de5f41b8a61015601579a497c77c98997 100644 (file)
@@ -8,9 +8,6 @@
 */
 package eu.etaxonomy.cdm.io.mexico;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -28,6 +25,8 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 @Component
 public abstract class MexicoEfloraReferenceImportBase  extends MexicoEfloraImportBase {
 
+    public static final String NAMESPACE = "References";
+
     private static final long serialVersionUID = -5161951752826380728L;
     private static final Logger logger = Logger.getLogger(MexicoEfloraReferenceImportBase.class);
 
@@ -121,10 +120,12 @@ public abstract class MexicoEfloraReferenceImportBase  extends MexicoEfloraImpor
         }
     }
 
-    @Override
-    protected String getIdInSource(MexicoEfloraImportState state, ResultSet rs) throws SQLException {
-        String id = rs.getString("idInSource");
-        return id;
+    protected void handleId(MexicoEfloraImportState state, int refId, Reference ref, String detail) {
+        state.getReferenceUuidMap().put(refId, ref.getUuid());
+        state.getRefDetailMap().put(refId, detail);
+
+        ref.addImportSource(String.valueOf(refId), MexicoEfloraReferenceImportBase.NAMESPACE,
+                ref, null);
     }
 
        @Override
index 2cf16024c9df9d193ad1e372add7f32afe71a14e..726f1c840c35210172d62719f0231d2acea8524b 100644 (file)
@@ -20,13 +20,8 @@ import java.util.UUID;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelReferenceImport;
 import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -86,7 +81,7 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
         Set<TaxonBase> taxaToSave = new HashSet<>();
 
            @SuppressWarnings("unchecked")
-        Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE);
+        Map<String, Reference> refMap = partitioner.getObjectMap(MexicoEfloraReferenceImportBase.NAMESPACE);
 
                ResultSet rs = partitioner.getResultSet();
                try{
@@ -107,7 +102,7 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
                            String year = rs.getString("Anio");
                            String uuidStr = rs.getString("uuid");
                            UUID uuid = UUID.fromString(uuidStr);
-                               int secFk = rs.getInt("IdBibliografiaSec");
+                               Integer secFk = nullSafeInt(rs, "IdBibliografiaSec");
 
                                Rank rank = getRank(rankStr);
                                NonViralNameParserImpl parser = NonViralNameParserImpl.NewInstance();
@@ -118,9 +113,17 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
                                nomRef.setDatePublished(TimePeriodParser.parseStringVerbatim(year));
                                taxonName.setNomenclaturalReference(nomRef);
 
-                               String refFkStr = String.valueOf(secFk);
-                               Reference sec = refMap.get(refFkStr);
+                               //sec
+                               Reference sec = null;
+                               if (secFk != null) {
+                                   String refFkStr = String.valueOf(secFk);
+                                   sec = refMap.get(refFkStr);
+                                   if (sec == null) {
+                                       logger.warn("Sec not found for taxonId " +  taxonId +" and secId " + refFkStr);
+                                   }
+                               }
 
+                               //taxon
                                TaxonBase<?> taxonBase;
                                Synonym synonym;
                                Taxon taxon;
@@ -206,21 +209,6 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
         return result;
     }
 
-    @Override
-    protected String getIdInSource(MexicoEfloraImportState state, ResultSet rs) throws SQLException {
-        String id = rs.getString("idInSource");
-        return id;
-    }
-
-    private void makeTaxonomicNote(MexicoEfloraImportState state, Taxon taxon, String notes) {
-        if (isNotBlank(notes)){
-            TaxonDescription desc = getTaxonDescription(taxon, false, true);
-            desc.setDefault(true);  //hard coded for Salvador, not used elsewhere as far as I can see
-            TextData textData = TextData.NewInstance(Feature.NOTES() , notes, Language.SPANISH_CASTILIAN(), null);
-            desc.addElement(textData);
-        }
-    }
-
     @Override
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, MexicoEfloraImportState state) {
 
@@ -229,14 +217,13 @@ public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
                Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();
 
                try{
-                       Set<String> nameIdSet = new HashSet<>();
                        Set<String> referenceIdSet = new HashSet<>();
                        while (rs.next()){
-//                             handleForeignKey(rs, referenceIdSet, "PTRefFk");
+                               handleForeignKey(rs, referenceIdSet, "IdBibliografiaSec");
                        }
 
                        //reference map
-                       nameSpace = BerlinModelReferenceImport.REFERENCE_NAMESPACE;
+                       nameSpace = MexicoEfloraReferenceImportBase.NAMESPACE;
                        idSet = referenceIdSet;
                        Map<String, Reference> referenceMap = getCommonService().getSourcedObjectsByIdInSourceC(Reference.class, idSet, nameSpace);
                        result.put(nameSpace, referenceMap);
index 335e4c385d438032da9cc2d59b630a42db4e16f2..9477916df5f6da093e5594f3f56cc413ac1fb22d 100644 (file)
@@ -54,8 +54,9 @@ public class MexicoEfloraTaxonRelationImport extends MexicoEfloraImportBase {
        @Override
        protected String getIdQuery(MexicoEfloraImportState state) {
                String sql = " SELECT IdCAT "
-                       + " FROM " + dbTableName
-                       + " ORDER BY IdCAT ";
+                       + " FROM " + dbTableName + " t "
+                       + " LEFT JOIN cv1_Controlled_vocabulary_for_name_Ranks r ON t.CategoriaTaxonomica = r.NombreCategoriaTaxonomica "
+                       + " ORDER BY r.Nivel1, IdCAT ";
                return sql;
        }
 
@@ -66,7 +67,7 @@ public class MexicoEfloraTaxonRelationImport extends MexicoEfloraImportBase {
                        + " LEFT JOIN "+dbTableName+" acc ON acc.IdCat = t.IdCATRel "
                        + " LEFT JOIN "+dbTableName+" p ON p.IdCat = t.IdCAT_AscendenteHerarquico4CDM "
                        + " LEFT JOIN "+dbTableName+" bas ON bas.IdCat = t.IdCAT_BasNomOrig "
-                ;
+                       ;
                String sqlWhere = " WHERE ( t.IdCAT IN (" + ID_LIST_TOKEN + ") )";
 
                String strRecordQuery =sqlSelect + " " + sqlFrom + " " + sqlWhere ;