Changeset 4546 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java

Timestamp:

02/21/14 18:24:38 (10 years ago)

Author:

olhsha

Message:

refactored.Redundar row mappers are some other methods are thrown away

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified) (4 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java

@@ -98 +98 @@
     };
 
-    /////////////////////////////////////////
-    @Override
-    public List<Number> getCachedRepresentations(Number targetID) {
-
-        if (targetID == null) {
-            loggerTargetDao.debug("targetID: " + nullArgument);
-            return null;
-        }
-
-        String sql = "SELECT " + cached_representation_id + " FROM " + targetsCachedRepresentationsTableName + " WHERE " + target_id + " = ?";
-        return getSimpleJdbcTemplate().query(sql, cachedIDRowMapper, targetID);
-    }
-
+ 
     @Override
     public Map<Number, String> getCachedRepresentationFragmentPairs(Number targetID) {
@@ -187 +175 @@
     }
 
-    /////////////////////////////////////////////////
-    @Override
-    public boolean targetIsInUse(Number targetID) {
-        if (targetID == null) {
-            loggerTargetDao.debug("targetID: " + nullArgument);
+  
+    
+    
+     //////////////////////////////////////
+    @Override
+    public boolean cachedIsInUse(Number cachedID) {
+        
+        if (cachedID == null) {
+            logger.debug("Cached's Id is null");
             return false;
         }
-
-
-        StringBuilder sqlAnnotations = new StringBuilder("SELECT ");
-        sqlAnnotations.append(annotation_id).append(" FROM ").append(annotationsTargetsTableName).append(" WHERE ").append(target_id).append(" = ? LIMIT 1");
-        List<Number> resultAnnotations = getSimpleJdbcTemplate().query(sqlAnnotations.toString(), annotationIDRowMapper, targetID);
-        if (resultAnnotations == null) {
+        
+        StringBuilder sql = new StringBuilder("SELECT ");
+        sql.append(target_id).append(" FROM ").append(targetsCachedRepresentationsTableName).append(" WHERE ").append(cached_representation_id).append("= ? LIMIT 1");
+        List<Number> result = getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, cachedID);
+        if (result != null) {
+            return (!result.isEmpty());
+        } else {
             return false;
         }
-        return (resultAnnotations.size() > 0);
+    }
+    
+    
+    @Override
+    public List<Number> retrieveTargetIDs(Number annotationID) {
+        if (annotationID != null) {
+            StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
+            sql.append(target_id).append(" FROM ").append(annotationsTargetsTableName).append(" WHERE ").append(annotation_id).append("= ?");
+            return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, annotationID);
+        } else {
+            loggerTargetDao.debug(nullArgument);
+            return null;
+        }
     }
 
@@ -249 +254 @@
     }
 
-   
-
-////////////////////// DELETERS ////////////////////////
-    @Override
+  ///////////////////////////////////
+   @Override
     public int deleteTarget(Number internalID) {
         if (internalID == null) {
-            loggerTargetDao.debug("internalID: " + nullArgument);
-            return 0;
-        }
-        
-        if (targetIsInUse(internalID)) {
-            loggerTargetDao.debug("The target is in use, and cannot be deleted.");
-            return 0;
-        }
+            logger.debug("internalID of the target is null.");
+            return 0;
+        }
+        
+      
         StringBuilder sqlTargetsVersions = new StringBuilder("DELETE FROM ");
         sqlTargetsVersions.append(targetTableName).append(" WHERE ").append(target_id).append(" = ? ");
@@ -268 +268 @@
 
     }
+
 
     ///////////////////////////////////////////////////////////////////