Changeset 9394

Timestamp:

Feb 27, 2011, 3:44:30 PM (13 years ago)

Author:

mlg

Message:

Major bug fix :
The ImageService allowed the chunk size to be 0 which led to fill the temporary folder.
Now an exception is thrown if the value is 0

Location:

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo

Files:

• dao/ImageDao.java (modified) (5 diffs)
• service/ImageService.java (modified) (1 diff)
• transverse/exception (added)
• transverse/exception/WrongChunkSizeException.java (added)
• transverse/session/SessionManager.java (modified) (1 diff)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/ImageDao.java

@@ -9 +9 @@
 import org.jdom.Document;
 import org.jdom.Element;
-import org.jdom.output.XMLOutputter;
 
 import sun.misc.BASE64Encoder;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.Tools;
@@ -74 +74 @@
     private SessionManager sessionManager;
 
+    private ArrayList<File> filesToSend;
+
     /**
      * Private singleton, to use a singleton
@@ -157 +159 @@
         //begin feature:0001827
         int chunk = chunkSize.intValue();
-        ArrayList<File> fichiersAEnvoyer = Tools.splitFile(image.getOriginale(), chunk);
+        if (chunk == 0) {
+            throw new WrongChunkSizeException("Error : the chunk size cannot be 0");
+        }
+        filesToSend = Tools.splitFile(image.getOriginale(), chunk);
         boolean echec = false;
-        for (int i = 0; i < fichiersAEnvoyer.size(); i++) {
-            File fichierAEnvoyer = fichiersAEnvoyer.get(i);
+        for (int i = 0; i < filesToSend.size(); i++) {
+            File fichierAEnvoyer = filesToSend.get(i);
             String originaleBase64 = base64.encode(Tools.getBytesFromFile(fichierAEnvoyer));
             Document reponseOriginale = (sessionManager.executeReturnDocument("pwg.images.addChunk", "data",
@@ -228 +233 @@
             myImage.setIdentifier(Integer.valueOf(im.getAttributeValue("id")));
             myImage.setName(im.getChildText("name"));
-            System.out.println(new XMLOutputter().outputString(im));
             //      myImage.setIdCategory(Integer.valueOf(im.getChild("categories").getChild("category")
             //              .getAttributeValue("id")));
@@ -258 +262 @@
         file = new File(System.getProperty("java.io.tmpdir") + "/thumb.jpg");
         file.delete();
+        for (File tempCut : filesToSend) {
+            tempCut.delete();
+        }
 
     }

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -130 +130 @@
         image.setPrivacyLevel(String.valueOf(privacyLevel));
         //now we call the dao to send the image to the webservice
-        return ImageDao.getInstance(sessionManager).create(image, chunckSize);
+        return ImageDao.getInstance(sessionManager).create(image, chunckSize * 1000000);
     }
 

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java

@@ -167 +167 @@
         method.addParameter("method", methode);
         for (int i = 0; i < parametres.length; i += 2) {
-            System.out.println(parametres[i] + " -> " + parametres[i + 1]);
+            //      System.out.println(parametres[i] + " -> " + parametres[i + 1]);
             method.addParameter(parametres[i], parametres[i + 1]);