Changeset 7897

Timestamp:

04/03/11 13:12:06 (9 years ago)

Author:

mnagni

Message:

Removed the Thread class managing the recordset_counter update

File:

• RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/discovery/model/SearchAgent.java (modified) (2 diffs)

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/discovery/model/SearchAgent.java

@@ -128 +128 @@
                 PresentAgent present = new PresentAgent();
                 res = present.doPresent(conn, toFilter, searchType.getRetrieveCriteria());
+
+                int numUpdated = doUpdateVal(conn, toFilter);
+                logHelper.logMessage("Updated " + numUpdated + " resultset_counter", Level.INFO);
+
+                return res;
+        }
+
+        private int doUpdateVal(Connection conn, List<String> documentIDs) {
+                if (documentIDs == null || documentIDs.size() == 0) {
+                        return 0;
+                }
                 
-                //Create an independent thread to let Axis return the results faster
-                new Thread(new UpdateCountVal(toFilter)).start();
-
-                return res;
-        }
-
+                StringBuffer sb = new StringBuffer();
+                sb.append("UPDATE original_document SET resultset_count = resultset_count + 1 WHERE original_document_filename ");                                      
+                sb.append(" IN (");
+
+                Iterator<String> iter = documentIDs.iterator();
+                while (iter.hasNext()) {
+                        sb.append("'");
+                        sb.append(iter.next());
+                        sb.append("'");
+                        if (iter.hasNext())
+                                sb.append(", ");
+                }
+                sb.append(") ");
+                
+                Statement statement;
+                try {
+                        statement = conn.createStatement();
+                        return statement.executeUpdate(sb.toString());
+                } catch (SQLException e) {
+                        logHelper.logMessage("Error on updating resultset_counter", Level.ERROR);
+                }               
+                return 0;
+        }
+        
         @Override
         List<String> loadResultSet(ResultSet rs) throws SQLException {
@@ -415 +444 @@
                 return ret;
         }
-        
-        private class UpdateCountVal implements Runnable{
-                private Logger logger = Logger.getLogger(UpdateCountVal.class.getName());
-                
-                private final List<String> documentIDs;
-
-                public void run() {
-                        try {
-                                updateCountVal();
-                        } catch (NdgSQLException e) {
-                                if (logger.isInfoEnabled())
-                                        logger.info(e.getMessage(), e);
-                        } catch (ResourceNotAvailable e) {
-                                if (logger.isInfoEnabled())
-                                        logger.info(e.getMessage(), e);
-                        }
-                }       
-                
-                public UpdateCountVal(List<String> documentIDs) {
-                        super();
-                        this.documentIDs = documentIDs;
-                }
-
-                private void updateCountVal() throws NdgSQLException, ResourceNotAvailable {
-                        Connection conn = DiscoveryBasic.getInstance().getDiscoveryConnection();
-                        boolean commit = false;
-                        int ret = 0;
-                        try {
-                                conn.setAutoCommit(false);
-                                ret = doUpdateVal(conn);
-                                commit = true;
-                        } catch (SQLException e) {
-                                // NdgMessage msg = new NdgMessage("sql.resultset.parsing.error",
-                                // new Object[] { sqlQuery });
-                                throw new NdgSQLException(e);
-                        } finally {
-                                commitOrRollback(conn, commit);
-                                if (logger.isInfoEnabled())
-                                        logger.info("Updated " + ret + " resultset_counter");
-                        }
-                }
-
-                private int doUpdateVal(Connection conn) throws SQLException {
-                        if (documentIDs == null || documentIDs.size() == 0) {
-                                return 0;
-                        }
-                        
-                        StringBuffer sb = new StringBuffer();
-                        sb.append("UPDATE original_document SET resultset_count = resultset_count + 1 WHERE original_document_filename ");                                      
-                        sb.append(" IN (");
-
-                        Iterator<String> iter = documentIDs.iterator();
-                        while (iter.hasNext()) {
-                                sb.append("'");
-                                sb.append(iter.next());
-                                sb.append("'");
-                                if (iter.hasNext())
-                                        sb.append(", ");
-                        }
-                        sb.append(") ");
-                        
-                        Statement statement = conn.createStatement();
-                        return statement.executeUpdate(sb.toString());
-                }               
-        }
 }