AT: committing latest changes to the remote project

diff --git a/cdmlib-persistence/src/main/resources/log4j.properties b/cdmlib-persistence/src/main/resources/log4j.properties
index 18e50e5d1d73f0d5c11877394ed4a333f429e08c..88ff0c2604e7a5554f88a82ead77afb04005edce 100644 (file)
--- a/cdmlib-persistence/src/main/resources/log4j.properties
+++ b/cdmlib-persistence/src/main/resources/log4j.properties
@@ -40,6 +40,8 @@ log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport = error
 log4j.logger.eu.etaxonomy.cdm=debug
 log4j.logger.org.hibernate.engine.LoadContexts = error
 
+
+
 ### No warnings as thrown by SQLServer
 log4j.logger.org.hibernate.cfg = warn
 
@@ -50,7 +52,7 @@ log4j.logger.org.hibernate.util.JDBCExceptionReporter = error
 #log4j.logger.org.hibernate.hql.ast.AST=debug
 
 ### log just the SQL
-log4j.logger.org.hibernate.SQL=warn
+log4j.logger.org.hibernate.SQL=trace
 
 ### log JDBC bind parameters ###
 log4j.logger.org.hibernate.type=warn

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 68b0569d8834df58cc90ea6716ac6028c6bda012..16137f5801cf46276bb88879618e981aa8c18e09 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -53,6 +53,7 @@ import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TaxonServiceConfiguratorImpl;\r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.database.UpdatableRoutingDataSource;\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
@@ -687,7 +688,8 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
             logger.info("doGetDescriptions()" + request.getServletPath());\r
         }\r
         Set<MarkerType> markerTypes = new HashSet<MarkerType>(markerTypeService.listByTermClass(MarkerType.class, null, null, null, null));\r
-        MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f059"));\r
+        //MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f059"));\r
+        MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039"));\r
         \r
         markerTypes.remove(useMarkerType);\r
         Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
@@ -700,27 +702,20 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
                TaxonDescription taxonDesc = (TaxonDescription) itr.next();\r
                Pager<Marker> pMarkers = descriptionService.getMarkers(taxonDesc, null, null, null, null, null);\r
                Pager<Marker> useMarkers = markerService.page(useMarkerType, null, null, null, null);\r
+               List<DefinedTermBase> useMarkers2 = markerTypeService.list(MarkerType.class, null, null, null, null);\r
                if(pMarkers.getCount() != 0) {\r
                        List<Marker> testMarkers = pMarkers.getRecords();\r
                        List<Marker> testUseMarkers = useMarkers.getRecords();\r
                        for (Marker marker: testMarkers) {\r
                                for (Marker useMaker: testUseMarkers){\r
-                                       //if (marker.getMarkerType().equals(useMarkerType)) {#\r
                                        if(marker.equals(useMaker)) {\r
                                                itr.remove();\r
                                        }\r
                                }\r
                        }\r
                }\r
-               \r
-               \r
-               \r
-               /*if(taxonDesc.hasMarker(useMarkerType, true) ) {\r
-                       descriptions.remove(taxonDesc);\r
-               }*/\r
         }\r
-        //}\r
-        return p.getRecords();\r
+      return p.getRecords();\r
     }\r
     \r
     @RequestMapping(value = "useDescriptions", method = RequestMethod.GET)\r
@@ -733,7 +728,9 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
         //ModelAndView mv = new ModelAndView();\r
         Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
         \r
-       MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f059")); \r
+       //MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f059"));\r
+        MarkerType useMarkerType = (MarkerType) markerTypeService.find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039"));\r
+       \r
        //find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f059")); \r
        Set<MarkerType> markerTypes =  new HashSet<MarkerType>();\r
        markerTypes.add(useMarkerType);\r