Changeset 7660

Timestamp:

26/10/10 16:00:00 (9 years ago)

Author:

mnagni

Message:

added a service to retrieve provider statistics

Location:

RevitalizationWS/ws/DPWS/trunk/src/main

Files:

• java/ndg/services/revitalization/ejb/DPWS.java (modified) (3 diffs)
• java/ndg/services/revitalization/ejb/ModelManager.java (modified) (7 diffs)
• java/ndg/services/revitalization/ejb/interfaces/ModelManagerLocal.java (modified) (2 diffs)
• java/ndg/services/revitalization/ejb/interfaces/ModelManagerRemote.java (modified) (2 diffs)
• java/ndg/services/revitalization/executor/ExecuteDeleteProvider.java (modified) (1 diff)
• java/ndg/services/revitalization/executor/ExecuteGetProviderStatistic.java (added)
• java/ndg/services/revitalization/jpa/CswProvider.java (modified) (1 diff)
• java/ndg/services/revitalization/jpa/ProviderStatistic.java (added)
• resources/META-INF/persistence.xml (modified) (1 diff)

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/DPWS.java

@@ -50 +50 @@
 import ndg.services.revitalization.executor.ExecuteGetProcessStatusRequest;
 import ndg.services.revitalization.executor.ExecuteGetProviderDetails;
+import ndg.services.revitalization.executor.ExecuteGetProviderStatistic;
 import ndg.services.revitalization.executor.ExecuteHarvest;
 import ndg.services.revitalization.executor.ServiceExecutor;
@@ -74 +75 @@
 import ndg.services.schemas.revitalization.GetProviderDetailsRequest;
 import ndg.services.schemas.revitalization.GetProviderDetailsResponse;
+import ndg.services.schemas.revitalization.GetProviderStatisticRequest;
+import ndg.services.schemas.revitalization.GetProviderStatisticResponse;
 
 import org.jboss.wsf.spi.annotation.WebContext;
@@ -170 +173 @@
                 return executor.doService(request);
         }
+        
+        @WebMethod(operationName = "getProviderStatistic")
+        public GetProviderStatisticResponse getProviderStatistic(@WebParam(name = "request") GetProviderStatisticRequest request) {
+                ServiceExecutor<GetProviderStatisticRequest, GetProviderStatisticResponse> executor = new ExecuteGetProviderStatistic();
+                return executor.doService(request);
+        }       
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/ModelManager.java

@@ -32 +32 @@
 package ndg.services.revitalization.ejb;
 
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -46 +47 @@
 import javax.persistence.Query;
 
-import ndg.common.NdgMessage;
 import ndg.common.ejb.exception.TimerCreationException;
 import ndg.common.exception.NdgExecutionException;
@@ -61 +61 @@
 import ndg.services.revitalization.jpa.ProviderCommon;
 import ndg.services.revitalization.jpa.ProviderEmail;
+import ndg.services.revitalization.jpa.ProviderStatistic;
 import ndg.services.revitalization.jpa.ServiceConfig;
 import ndg.services.revitalization.jpa.ServiceParameterValue;
@@ -87 +88 @@
         private final static String GET_INGEST_LOG_BY_PROVIDER = "select l, p.providerId from IngestSearchLogging l, HiProcess p  where l.reqId=p.id and p.providerId=:providerID and l.startIngest >= :start and l.stopIngest <= :end";
         private final static String GET_INGEST_LOG_ALL_PROVIDER = "select l, p.providerId from IngestSearchLogging l, HiProcess p  where l.reqId=p.id and l.startIngest >= :start and l.stopIngest <= :end";
+        private final static String GET_PROVIDER_STATISTIC = "select count(datacentre_name) from original_document where datacentre_name IN (:providerIDs) group by datacentre_name";
+        private final static String GET_ALL_PROVIDER_STATISTIC = "select count(datacentre_name), datacentre_name from original_document group by datacentre_name";
         
 
@@ -92 +95 @@
         private EntityManager em;
 
+        @PersistenceContext(unitName = "discoveryDB")
+        private EntityManager emDiscovery;
+        
         @EJB
         private HiProcessModelLocal processModel;
@@ -343 +349 @@
         }
         
+        public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException {
+                
+                //to delete and substitute with the commented code
+                String sqlString = GET_ALL_PROVIDER_STATISTIC;          
+                /*
+                String sqlString = GET_PROVIDER_STATISTIC;
+                if (providerID == null || providerID.size() == 0)
+                        sqlString = GET_ALL_PROVIDER_STATISTIC;
+                */
+                
+                Query query = emDiscovery.createNativeQuery(sqlString);
+                if (sqlString.equals(GET_PROVIDER_STATISTIC))
+                        query.setParameter("providerIDs", providerID);
+                List<Object[]> origDocs = query.getResultList();
+                
+                List<ProviderStatistic> ret = new ArrayList<ProviderStatistic>();
+                ProviderStatistic ps = null;
+                for(Object[] stat : origDocs) {
+                        ps = new ProviderStatistic();
+                        ps.setProviderID(-1);
+                        if (stat[1] != null && stat[1].getClass().isAssignableFrom(Integer.class))
+                                ps.setProviderID((Integer)stat[1]);
+                        ps.setIngestedRecord(((BigInteger)stat[0]).intValue());
+                        ret.add(ps);
+                }
+                return ret;
+        }       
+        
         @SuppressWarnings("unchecked")
         private <T extends ProviderCommon> T getProvider(int id, String queryText) {
@@ -353 +387 @@
                         return values.get(0);
         }
-
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerLocal.java

@@ -44 +44 @@
 import ndg.services.revitalization.jpa.IngestSearchLogging;
 import ndg.services.revitalization.jpa.ProviderCommon;
+import ndg.services.revitalization.jpa.ProviderStatistic;
 import ndg.services.revitalization.jpa.TimerInfo;
 import ndg.services.revitalization.jpa.TimerInfoLog;
@@ -107 +108 @@
         
         public void deleteProvider(List<Integer> providerID) throws NdgExecutionException;
+        
+        public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException;
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerRemote.java

@@ -46 +46 @@
 import ndg.services.revitalization.jpa.IngestSearchLogging;
 import ndg.services.revitalization.jpa.ProviderCommon;
+import ndg.services.revitalization.jpa.ProviderStatistic;
 import ndg.services.revitalization.jpa.TimerInfo;
 import ndg.services.revitalization.jpa.TimerInfoLog;
@@ -178 +179 @@
         
         public void deleteProvider(List<Integer> providerID) throws NdgExecutionException;
+        
+        public List<ProviderStatistic> getProviderStatistic(List<Integer> providerID) throws NdgExecutionException;
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDeleteProvider.java

@@ -34 +34 @@
 import ndg.common.exception.NdgExecutionException;
 import ndg.services.revitalization.EJBBeanFactory;
-import ndg.services.revitalization.jpa.TimerInfo;
-import ndg.services.revitalization.jpa.TimerInfoLog;
 import ndg.services.schemas.revitalization.DeleteProviderRequest;
 import ndg.services.schemas.revitalization.DeleteProviderResponse;
-import ndg.services.schemas.revitalization.DeleteTimerRequest;
-import ndg.services.schemas.revitalization.DeleteTimerResponse;
 
 /**  

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/jpa/CswProvider.java

@@ -17 +17 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.PersistenceContext;
 import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;

RevitalizationWS/ws/DPWS/trunk/src/main/resources/META-INF/persistence.xml

@@ -10 +10 @@
                 </properties>           
         </persistence-unit>
+        
+        <persistence-unit name="discoveryDB" transaction-type="JTA">
+                <jta-data-source>jdbc/discoveryDB</jta-data-source>
+                <exclude-unlisted-classes>true</exclude-unlisted-classes>
+                <properties>
+                        <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
+                        <property name="hibernate.hbm2ddl.auto" value="validate" />
+                </properties>           
+        </persistence-unit>     
 </persistence>