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

Timestamp:

12/19/13 14:36:04 (10 years ago)

Author:

olhsha

Message:

adding trasnactional, refactoring and fixing bugs in updated annotations, removing try-catch from resource methods (The Greek's advice)

File:

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

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

@@ -26 +26 @@
 import eu.dasish.annotation.schema.AnnotationInfo;
 import eu.dasish.annotation.schema.Permission;
+import java.io.IOException;
 import java.lang.String;
 import java.sql.ResultSet;
@@ -37 +38 @@
 import javax.sql.DataSource;
 import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.parsers.ParserConfigurationException;
 import org.springframework.jdbc.core.RowMapper;
+import org.xml.sax.SAXException;
 
 /**
@@ -115 +118 @@
 
     @Override
-    public List<Number> getAnnotationIDsForUserWithPermission(Number userID, String permissionString) {
-        if (userID == null || permissionString == null) {
-            return null;
-        }
+    public List<Number> getAnnotationIDsForUserWithPermission(Number userID, String[] permissionStrings) {
+        if (userID == null || permissionStrings == null) {
+            return null;
+        }
+
+        String values = stringsToValuesString(permissionStrings);
+
         StringBuilder sql = new StringBuilder("SELECT ");
         sql.append(annotation_id).append(" FROM ").append(permissionsTableName).append(" WHERE ").
                 append(principal_id).append("  = ").append(userID.toString()).append(" AND ").
-                append(permission).append("  = ?");;
-        return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, permissionString);
+                append(permission).append("  IN ").append(values);
+        return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper);
+    }
+
+    private String stringsToValuesString(String[] strings) {
+        if (strings == null) {
+            return null;
+        }
+
+        int length = strings.length;
+        if (length == 0) {
+            return null;
+        }
+        String result = "(";
+        for (int i = 0; i < length - 1; i++) {
+            result = result + "'"+strings[i] + "', ";
+        }
+        result = result + "'"+strings[length - 1] + "')";
+        return result;
     }
 
@@ -312 +335 @@
 
     //////////// UPDATERS /////////////
-    @Override
-    public int updateAnnotationBodyText(Number annotationID, String text) {
-        StringBuilder sql = new StringBuilder("UPDATE ");
-        sql.append(annotationTableName).append(" SET ").
-                append(last_modified).append("=  default,").
-                append(body_text).append("= '").append(text).
-                append("' WHERE ").append(annotation_id).append("= ?");
-        int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), annotationID);
-        return affectedRows;
-    }
-
-    @Override
-    public int updateAnnotationBody(Number annotationID, AnnotationBody annotationBody) {
-        String[] body = retrieveBodyComponents(annotationBody);
+   
+
+    @Override
+    public int updateAnnotationBody(Number annotationID, String text, String mimeType, Boolean isXml) {
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("annotationID", annotation_id);
-        params.put("bodyText", body[0]);
-        params.put("bodyMimeType", body[1]);
-        params.put("isXml", annotationBody.getXmlBody() != null);
+        params.put("annotationID", annotationID);
+        params.put("bodyText", text);
+        params.put("bodyMimeType", mimeType);
+        params.put("isXml", isXml);
 
         StringBuilder sql = new StringBuilder("UPDATE ");
@@ -338 +351 @@
                 append(body_mimetype).append("= :bodyMimeType, ").
                 append(is_xml).append("= :isXml").
-                append("' WHERE ").append(annotation_id).append("= :annotationID");
-        int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), annotationID);
+                append(" WHERE ").append(annotation_id).append("= :annotationID");
+        int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), params);
         return affectedRows;
     }
@@ -374 +387 @@
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("permission", permission.value());
-        params.put("annotationID", annotation_id);
-        params.put("principalID", principal_id);
+        params.put("annotationID", annotationID);
+        params.put("principalID", userID);
 
         StringBuilder sql = new StringBuilder("UPDATE ");
         sql.append(permissionsTableName).append(" SET ").
                 append(this.permission).append("= :permission").
-                append(" WHERE ").append(annotation_id).append("= : annotationID").
+                append(" WHERE ").append(annotation_id).append("= :annotationID").
                 append(" AND ").append(principal_id).append("= :principalID");
         return getSimpleJdbcTemplate().update(sql.toString(), params);
@@ -474 +487 @@
 
     /////////////// helpers //////////////////
-    private String[] retrieveBodyComponents(AnnotationBody annotationBody) {
+    public String[] retrieveBodyComponents(AnnotationBody annotationBody) {
         boolean body_is_xml = annotationBody.getXmlBody() != null;
         String[] result = new String[2];