(no commit message)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
index cecf58ba3fabf8ccae7b6fb3b7dabe874f37dabd..4af781c0ed0661a49311142da66d2e79bd273e15 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java
@@ -57,8 +57,7 @@ public class BerlinModelImportActivator {
         * @param args\r
         */\r
        public static void main(String[] args) {\r
-               System.out.println("Start import from BerlinModel ...");\r
-               Source source = berlinModelSource;\r
+               System.out.println("Start import from BerlinModel ("+ berlinModelSource.getDatabase() + ") ...");\r
                CdmApplicationController cdmApp;\r
                \r
                //make CdmApplication\r
@@ -67,7 +66,7 @@ public class BerlinModelImportActivator {
 //             dataSourceName = "testSqlServer";       \r
                \r
                //make BerlinModel Source\r
-               source = BerlinModelSources.euroMed();\r
+               Source source = berlinModelSource;\r
                if (source == null){\r
                        logger.error("Connection to BerlinModel could not be established");\r
                        System.out.println("End import from BerlinModel ...");\r
@@ -92,7 +91,7 @@ public class BerlinModelImportActivator {
                        BerlinModelImport bmImport = new BerlinModelImport();\r
                        bmImport.doImport(source, cdmApp);\r
                }\r
-               System.out.println("End import from BerlinModel ...");\r
+               System.out.println("End import from BerlinModel ("+ berlinModelSource.getDatabase() + ")...");\r
        }\r
        \r
        \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
index 60669f2a7daab963b63be4b56f64ce7bd7fa5875..a31d55712c2d8a3b05792b0f4b3b13bd96326f53 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
@@ -81,7 +81,8 @@ public class BerlinModelReferenceIO {
                     " FROM Reference AS InInReference " +\r
                        " RIGHT OUTER JOIN Reference AS InReference ON InInReference.RefId = InReference.InRefFk " + \r
                        " RIGHT OUTER JOIN Reference ON InReference.RefId = dbo.Reference.InRefFk " + \r
-                                       " WHERE (1=1) AND Reference.refId = 7000000 " ;\r
+                                       " WHERE (1=1) "; \r
+                       //strQueryBase += " AND Reference.refId = 7000000 " ;\r
                        String strQueryNoInRef = strQueryBase + \r
                                " AND (Reference.InRefFk is NULL) ";\r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
index 2745f2ab21d1526b1f4125f241c14ac7c4668698..b396178a3b50ac2d9dc2c7b69e6a2d0a5920b849 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
@@ -52,7 +52,7 @@ public class BerlinModelTaxonNameIO {
                        \r
                        //get data from database\r
                        String strQuery = \r
-                                       "SELECT TOP 20002 Name.* , RefDetail.RefDetailId, RefDetail.RefFk, " +\r
+                                       "SELECT Name.* , RefDetail.RefDetailId, RefDetail.RefFk, " +\r
                                " RefDetail.FullRefCache, RefDetail.FullNomRefCache, RefDetail.PreliminaryFlag AS RefDetailPrelim, RefDetail.Details, " + \r
                                " RefDetail.SecondarySources, RefDetail.IdInSource " +\r
                     " FROM Name LEFT OUTER JOIN RefDetail ON Name.NomRefDetailFk = RefDetail.RefDetailId AND Name.NomRefDetailFk = RefDetail.RefDetailId AND " +\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/test/BerlinModelSources.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/test/BerlinModelSources.java
index cdc18c394d6898c71f675a22670bbe2207d20bac..117ef1ac5c698d32c4b126ad4d56c2d216cb44f2 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/test/BerlinModelSources.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/test/BerlinModelSources.java
@@ -19,7 +19,7 @@ public class BerlinModelSources {
        }\r
        \r
        public static Source editWP6(){\r
-               //      BerlinModel - Euro+Med\r
+               //      BerlinModel - EditWp6\r
                String dbms = "SQLServer";\r
                String strServer = "BGBM111";\r
                String strDB = "EditWP6";\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java
index ddc624e3d76e3ba4577086694ab4ad229cb73f91..dd9c79e02bd3aaeafc48d42bacab7f8a270e1a08 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java
@@ -327,5 +327,13 @@ public class Source {
                return this;\r
        }\r
     \r
+    public String getDatabase(){\r
+       return mDb;\r
+    }\r
+    \r
+    public String getServer(){\r
+       return mServer;\r
+    }\r
+    \r
 \r
 }
\ No newline at end of file