Changeset 10714

Timestamp:

May 1, 2011, 12:19:10 PM (14 years ago)

Author:

mlg

Message:

Adds support for method pwg.categories.delete
(allows to delete a category).

Location:

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

Files:

• dao/CategoryDao.java (modified) (1 diff)
• dao/impl/CategoryDaoImpl.java (modified) (1 diff)
• dao/impl/ImageDaoImpl.java (modified) (5 diffs)
• dao/impl/TagDaoImpl.java (modified) (1 diff)
• service/CategoryService.java (modified) (1 diff)
• service/impl/CategoryServiceImpl.java (modified) (1 diff)
• transverse/enumeration/MethodsEnum.java (modified) (1 diff)
• transverse/session/impl/SessionManagerImpl.java (modified) (1 diff)
• transverse/util/Tools.java (modified) (2 diffs)

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

@@ -28 +28 @@
      */
     public boolean create(Category category) throws JiwigoException;
+
+    /**
+     * Function that deletes a given category
+     * @param category the category to delete
+     * @return true if the category is successfully deleted
+     * @throws JiwigoException
+     */
+    public boolean delete(Category category) throws JiwigoException;
 }

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

@@ -111 +111 @@
     }
 
+    /**
+     * @see fr.mael.jiwigo.dao.CategoryDao#delete(fr.mael.jiwigo.om.Category)
+     */
+    public boolean delete(Category category) throws JiwigoException {
+        //this document will allow to get pwg_token. it is necessary to delete a category
+        Document docStatus = sessionManager.executeReturnDocument(MethodsEnum.SESSION_STATUS.getLabel());
+        String pwgToken = Tools.getStringValueDom(docStatus.getDocumentElement(), "pwg_token");
+        if (pwgToken.equals("")) {
+            throw new JiwigoException("Error getting pwg_token. Returned document was : "
+                    + Tools.documentToString(docStatus));
+        }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Deletes category " + category.getIdentifier() + " with pwg_token = " + pwgToken);
+        }
+
+        Document doc = sessionManager.executeReturnDocument(MethodsEnum.DELETE_CATEGORY.getLabel(), "category_id",
+                String.valueOf(category.getIdentifier()), "pwg_token", pwgToken);
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(Tools.documentToString(doc));
+        }
+        try {
+            return Tools.checkOk(doc);
+        } catch (FileAlreadyExistsException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     public SessionManager getSessionManager() {
         return sessionManager;

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

@@ -146 +146 @@
         String thumbnailBase64 = base64.encode(Tools.getBytesFromFile(image.getThumbnail()));
         //sends the thumbnail and gets the result
-        Document reponseThumb = (sessionManager.executeReturnDocument("pwg.images.addChunk", "data", thumbnailBase64,
-                "type", "thumb", "position", "1", "original_sum",
+        Document reponseThumb = (sessionManager.executeReturnDocument(MethodsEnum.ADD_CHUNK.getLabel(), "data",
+                thumbnailBase64, "type", "thumb", "position", "1", "original_sum",
                 Tools.getMD5Checksum(image.getOriginale().getAbsolutePath())));
 
@@ -160 +160 @@
             File fichierAEnvoyer = filesToSend.get(i);
             String originaleBase64 = base64.encode(Tools.getBytesFromFile(fichierAEnvoyer));
-            Document reponseOriginale = (sessionManager.executeReturnDocument("pwg.images.addChunk", "data",
+            Document reponseOriginale = (sessionManager.executeReturnDocument(MethodsEnum.ADD_CHUNK.getLabel(), "data",
                     originaleBase64, "type", "file", "position", String.valueOf(i), "original_sum",
                     Tools.getMD5Checksum(image.getOriginale().getAbsolutePath())));
@@ -171 +171 @@
 
         //add the image in the database and get the result of the webservice
-        Document reponseAjout = (sessionManager.executeReturnDocument("pwg.images.add", "file_sum",
+        Document reponseAjout = (sessionManager.executeReturnDocument(MethodsEnum.ADD_IMAGE.getLabel(), "file_sum",
                 Tools.getMD5Checksum(image.getOriginale().getAbsolutePath()), "thumbnail_sum",
                 Tools.getMD5Checksum(image.getThumbnail().getCanonicalPath()), "position", "1", "original_sum",
@@ -177 +177 @@
                 String.valueOf(image.getIdCategory()), "name", image.getName(), "author", sessionManager.getLogin(),
                 "level", image.getPrivacyLevel()));
-        LOG.debug("Response add : " + Tools.documentToString(reponseAjout));
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Response add : " + Tools.documentToString(reponseAjout));
+        }
         //      System.out.println(Main.sessionManager.executerReturnString("pwg.images.add", "file_sum", Outil
         //              .getMD5Checksum(image.getOriginale().getAbsolutePath()), "thumbnail_sum", Outil.getMD5Checksum(image
@@ -294 +296 @@
             //                          string.lastIndexOf("}") + 1);
             try {
-                multipartEntity.addPart("method", new StringBody("pwg.images.addSimple"));
+                multipartEntity.addPart("method", new StringBody(MethodsEnum.ADD_SIMPLE.getLabel()));
                 multipartEntity.addPart("category", new StringBody(category.toString()));
                 multipartEntity.addPart("name", new StringBody(title));

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

@@ -55 +55 @@
     public List<Tag> list() throws JiwigoException {
         Document doc = sessionManager.executeReturnDocument(MethodsEnum.TAGS_ADMIN_LIST.getLabel());
-        //      System.out.println(Outil.documentToString(doc));
-        NodeList nodeList = doc.getDocumentElement().getElementsByTagName("tags");
         return getTagsFromDocument((Element) doc.getDocumentElement().getElementsByTagName("tags").item(0));
 

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

@@ -42 +42 @@
      */
     public boolean create(String nom) throws JiwigoException;
+
+    /**
+     * Deletes a category
+     * @param id id of the category
+     * @return
+     * @throws JiwigoException
+     */
+    public boolean delete(Category category) throws JiwigoException;
 }

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

@@ -107 +107 @@
     }
 
+    public boolean delete(Category category) throws JiwigoException {
+        if (category.getIdentifier() == null) {
+            throw new JiwigoException("The identifier of the category cannot be null");
+        } else {
+            return dao.delete(category);
+        }
+    }
+
 }

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java

@@ -26 +26 @@
             "pwg.images.getInfo"), AJOUTER_CATEGORIE("pwg.categories.add"), AJOUTER_COMMENTAIRE("pwg.images.addComment"), LISTER_TAGS(
             "pwg.tags.getList"), TAGS_ADMIN_LIST("pwg.tags.getAdminList"), ADD_TAG("pwg.tags.add"), SET_INFO(
-            "pwg.images.setInfo"), SEARCH("pwg.images.search"), SET_PRIVACY_LEVEL("pwg.images.setPrivacyLevel");
+            "pwg.images.setInfo"), SEARCH("pwg.images.search"), SET_PRIVACY_LEVEL("pwg.images.setPrivacyLevel"), ADD_SIMPLE(
+            "pwg.images.addSimple"), ADD_IMAGE("pwg.images.add"), ADD_CHUNK("pwg.images.addChunk"), DELETE_CATEGORY(
+            "pwg.categories.delete"), SESSION_STATUS("pwg.session.getStatus");
 
     protected String label;

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

@@ -161 +161 @@
         }
         doc = executeReturnDocument(MethodsEnum.LOGIN.getLabel(), "username", login, "password", password);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("XML connection : " + Tools.documentToString(doc));
+        }
         try {
             return (Tools.checkOk(doc) ? 0 : 1);

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

@@ -229 +229 @@
             return true;
         } else {
-            LOG.error("Resultat : " + doc.getDocumentElement().getAttribute("stat") + "\nDocument retourné : \n"
+            LOG.error("Resultat : " + doc.getDocumentElement().getAttribute("stat") + "\nDocument retourne : \n"
                     + Tools.documentToString(doc));
             if (((Element) doc.getDocumentElement().getElementsByTagName("err").item(0)).getAttribute("msg").equals(
@@ -352 +352 @@
         Element el = (Element) element.getElementsByTagName(tagName).item(0);
         if (el != null) {
-                return el.getFirstChild().getNodeValue();
+            return el.getFirstChild().getNodeValue();
         }
         // if not, empty string is safer then null