Changeset 4207 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.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/DBIntegrityServiceImlp.java (modified) (8 diffs)

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

@@ -40 +40 @@
 import eu.dasish.annotation.schema.User;
 import eu.dasish.annotation.schema.UserWithPermission;
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.Number;
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -48 +50 @@
 import java.util.Map;
 import java.util.UUID;
+import javax.xml.parsers.ParserConfigurationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -94 +98 @@
     }
 
-    ///////////// GETTERS //////////////////////////
+    
     @Override
     public Number getTargetInternalIdentifier(UUID externalID) {
@@ -189 +193 @@
     ////////////////////////////////////////////////////////////////////////
     @Override
-    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String access, String namespace, UUID owner, Timestamp after, Timestamp before) {
-
-        if (access == null) {
-            return null;
-        }
-
-        List<Number> annotationIDs = annotationDao.getAnnotationIDsForUserWithPermission(inloggedUserID, access);
+    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, Timestamp after, Timestamp before) {
+
+        if (accessModes == null) {
+            return null;
+        }
+
+        List<Number> annotationIDs = annotationDao.getAnnotationIDsForUserWithPermission(inloggedUserID, accessModes);
 
         if (link != null) {
@@ -258 +262 @@
 
     @Override
-    public AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String access, String namespace, UUID owner, Timestamp after, Timestamp before) {
-        List<Number> annotationIDs = getFilteredAnnotationIDs(word, text, inloggedUserID, access, namespace, owner, after, before);
+    public AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, Timestamp after, Timestamp before) {
+        List<Number> annotationIDs = getFilteredAnnotationIDs(word, text, inloggedUserID, accessModes, namespace, owner, after, before);
         if (annotationIDs != null) {
             AnnotationInfoList result = new AnnotationInfoList();
@@ -388 +392 @@
     @Override
     public int updateAnnotationBody(Number internalID, AnnotationBody annotationBody) {
-        return annotationDao.updateAnnotationBody(internalID, annotationBody);
+        String[] body = annotationDao.retrieveBodyComponents(annotationBody);
+        return annotationDao.updateAnnotationBody(internalID, body[0], body[1], annotationBody.getXmlBody()!=null);
     }
     
@@ -518 +523 @@
         String bodyText;
         String newBodyText;
+        String mimeType;
         if (annotationBody.getXmlBody() != null) {
             bodyText = Helpers.elementToString(annotation.getBody().getXmlBody().getAny());
+            mimeType = annotationBody.getXmlBody().getMimeType();
         } else {
             if (annotation.getBody().getTextBody() != null) {
                 bodyText = annotation.getBody().getTextBody().getValue();
-
+                mimeType = annotationBody.getTextBody().getMimeType();
             } else {
                 logger.error("The client has sent ill-formed annotation body.");
@@ -530 +537 @@
         }
         newBodyText = Helpers.replace(bodyText, targetIdPairs);
-        return annotationDao.updateAnnotationBodyText(annotationID, newBodyText);
+        return annotationDao.updateAnnotationBody(annotationID, newBodyText, mimeType, annotationBody.getXmlBody() != null);
     }