geonetwork#436 Report module. Updated with suggestions provided in pu…

…ll request (449)
josegar74 · Apr 15, 2014 · d291027 · d291027
1 parent d097c5b
commit d291027
Show file tree

Hide file tree

Showing 43 changed files with 1,246 additions and 1,193 deletions.
diff --git a/.../main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java b/.../main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java
@@ -5,9 +5,11 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.fao.geonet.Util;
+import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.domain.*;
 import org.fao.geonet.repository.*;
 import org.fao.geonet.utils.BinaryFile;
+import org.fao.geonet.utils.Log;
 import org.jdom.Element;
 
 import java.io.*;
@@ -34,14 +36,15 @@ public Element onDownload(ServiceContext context, Element params, int metadataId
             return BinaryFile.encode(200, file.getAbsolutePath());
 
         } catch (Exception ex) {
-            // TODO: Log exception
+            Log.error(Geonet.RESOURCES, "DefaultResourceDownloadHandler (onDownload): " + ex.getMessage());
             ex.printStackTrace();
             throw new ResourceHandlerException(ex);
         }
     }
 
     @Override
-    public Element onDownloadMultiple(ServiceContext context, Element params, int metadataId, List<Element> files) throws ResourceHandlerException {
+    public Element onDownloadMultiple(ServiceContext context, Element params, int metadataId, List<Element> files)
+            throws ResourceHandlerException {
 
         try {
             String requesterName =  Util.getParam(params, "name", "");
@@ -79,7 +82,7 @@ public Element onDownloadMultiple(ServiceContext context, Element params, int me
             return null;
 
         } catch (Exception ex) {
-            // TODO: Log exception
+            Log.error(Geonet.RESOURCES, "DefaultResourceDownloadHandler (onDownloadMultiple): " + ex.getMessage());
             ex.printStackTrace();
             throw new ResourceHandlerException(ex);
         }
@@ -97,17 +100,26 @@ public Element onDownloadMultiple(ServiceContext context, Element params, int me
      * @param requesterOrg
      * @param requesterComments
      * @param downloadDate
-     * @throws ResourceHandlerException
      */
     private void storeFileDownloadRequest(ServiceContext context, int metadataId, String fname,
                                           String requesterName, String requesterMail,
                                           String requesterOrg, String requesterComments,
-                                          String downloadDate) throws ResourceHandlerException {
+                                          String downloadDate) {
+        MetadataFileUpload metadataFileUpload;
+
+        // Each download is related to a file upload record
         try {
-            // Each download is related to a file upload record
-            MetadataFileUpload metadataFileUpload = context.getBean(MetadataFileUploadRepository.class).
+            metadataFileUpload = context.getBean(MetadataFileUploadRepository.class).
                     findByMetadataIdAndFileNameNotDeleted(metadataId, fname);
 
+        } catch (org.springframework.dao.EmptyResultDataAccessException ex) {
+            Log.warning(Geonet.RESOURCES, "Store file download request: No upload request for (metadataid, file): (" + metadataId + "," + fname + ")");
+
+            // No related upload is found
+            metadataFileUpload = null;
+        }
+
+        if (metadataFileUpload != null) {
             MetadataFileDownloadRepository repo = context.getBean(MetadataFileDownloadRepository.class);
 
             MetadataFileDownload metadataFileDownload = new MetadataFileDownload();
@@ -124,11 +136,6 @@ private void storeFileDownloadRequest(ServiceContext context, int metadataId, St
             metadataFileDownload.setFileUploadId(metadataFileUpload.getId());
 
             repo.save(metadataFileDownload);
-
-        } catch (Exception ex) {
-            // TODO: Log exception
-            ex.printStackTrace();
-            throw new ResourceHandlerException(ex);
         }
     }
 }
diff --git a/...rc/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java b/...rc/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java
@@ -24,11 +24,13 @@
 package org.fao.geonet.services.resources.handlers;
 
 import jeeves.server.context.ServiceContext;
+import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.domain.ISODate;
 import org.fao.geonet.domain.MetadataFileUpload;
 import org.fao.geonet.exceptions.OperationAbortedEx;
 import org.fao.geonet.lib.Lib;
 import org.fao.geonet.repository.MetadataFileUploadRepository;
+import org.fao.geonet.utils.Log;
 import org.jdom.Element;
 
 import java.io.File;
@@ -58,7 +60,7 @@ public void onDelete(ServiceContext context, Element params, int metadataId,
             storeFileUploadDeleteRequest(context, metadataId, fileName);
 
         } catch (Exception ex) {
-            // TODO: Log exception
+            Log.error(Geonet.RESOURCES, "DefaultResourceRemoveHandler (onDelete): " + ex.getMessage());
             ex.printStackTrace();
             throw new ResourceHandlerException(ex);
         }
@@ -70,16 +72,18 @@ public void onDelete(ServiceContext context, Element params, int metadataId,
      * @param context
      * @param metadataId
      * @param fileName
-     * @throws java.sql.SQLException
      */
     private void storeFileUploadDeleteRequest(ServiceContext context, int metadataId, String fileName) {
         MetadataFileUploadRepository repo = context.getBean(MetadataFileUploadRepository.class);
-        MetadataFileUpload metadataFileUpload = repo.findByMetadataIdAndFileNameNotDeleted(metadataId, fileName);
 
-       if (metadataFileUpload != null) {
-           metadataFileUpload.setDeletedDate(new ISODate().toString());
+        try {
+            MetadataFileUpload metadataFileUpload = repo.findByMetadataIdAndFileNameNotDeleted(metadataId, fileName);
+            metadataFileUpload.setDeletedDate(new ISODate().toString());
+
+            repo.save(metadataFileUpload);
 
-           repo.save(metadataFileUpload);
-       }
+        } catch (org.springframework.dao.EmptyResultDataAccessException ex) {
+            Log.warning(Geonet.RESOURCES, "Delete file upload request: No upload request for (metadataid, file): (" + metadataId + "," + fileName + ")");
+        }
     }
 }
diff --git a/...rc/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java b/...rc/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java
@@ -26,11 +26,13 @@
 import jeeves.server.context.ServiceContext;
 import org.apache.commons.io.FileUtils;
 import org.fao.geonet.Util;
+import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.constants.Params;
 import org.fao.geonet.domain.*;
 import org.fao.geonet.lib.Lib;
 import org.fao.geonet.repository.MetadataFileUploadRepository;
 import org.fao.geonet.utils.IO;
+import org.fao.geonet.utils.Log;
 import org.jdom.Element;
 
 import java.io.File;
@@ -59,7 +61,7 @@ public void onUpload(ServiceContext context, Element params,
             storeFileUploadRequest(context, metadataId, fileName, fileSize);
 
         } catch (Exception ex) {
-            // TODO: Log exception
+            Log.error(Geonet.RESOURCES, "DefaultResourceUploadHandler (onUpload): " + ex.getMessage());
             ex.printStackTrace();
             throw new ResourceHandlerException(ex);
         }
@@ -71,7 +73,6 @@ public void onUpload(ServiceContext context, Element params,
      * @param context
      * @param metadataId
      * @param fileName
-     * @throws java.sql.SQLException
      */
     private void storeFileUploadRequest(ServiceContext context, int metadataId, String fileName, double fileSize) {
         MetadataFileUploadRepository repo = context.getBean(MetadataFileUploadRepository.class);

diff --git a/web-ui/src/main/resources/catalog/js/admin/AdminController.js b/web-ui/src/main/resources/catalog/js/admin/AdminController.js
@@ -3,22 +3,33 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
   goog.require('gn_adminmetadata_controller');
   goog.require('gn_admintools_controller');
   goog.require('gn_cat_controller');
   goog.require('gn_classification_controller');
   goog.require('gn_dashboard_controller');
   goog.require('gn_harvest_controller');
+  goog.require('gn_report_controller');
   goog.require('gn_settings_controller');
   goog.require('gn_standards_controller');
   goog.require('gn_usergroup_controller');
-  goog.require('gn_report_controller');
 
   var module = angular.module('gn_admin_controller',
       ['gn_dashboard_controller', 'gn_usergroup_controller',
        'gn_admintools_controller', 'gn_settings_controller',
        'gn_adminmetadata_controller', 'gn_classification_controller',
-       'gn_harvest_controller', 'gn_standards_controller', 'gn_report_controller']);
+       'gn_harvest_controller', 'gn_standards_controller',
+       'gn_report_controller']);
 
 
   var tplFolder = '../../catalog/templates/admin/';
@@ -83,8 +94,8 @@
           templateUrl: tplFolder + 'page-layout.html',
           controller: 'GnStandardsController'}).
         when('/reports', {
-            templateUrl: tplFolder + 'page-layout.html',
-            controller: 'GnReportController'}).
+          templateUrl: tplFolder + 'page-layout.html',
+          controller: 'GnReportController'}).
         when('/reports/:tab', {
           templateUrl: tplFolder + 'page-layout.html',
           controller: 'GnReportController'}).
@@ -111,10 +122,11 @@
           classes: 'btn-primary', icon: 'fa-cloud-download'},
         {name: 'statisticsAndStatus', route: '#dashboard',
           classes: 'btn-success', icon: 'fa-dashboard'},
-        {name: 'usersAndGroups', route: '#organization',
-          classes: 'btn-default', icon: 'fa-group'},
         {name: 'reports', route: '#reports',
-              classes: 'btn-success', icon: 'fa-file-text-o'}
+          classes: 'btn-success', icon: 'fa-file-text-o'},
+        {name: 'usersAndGroups', route: '#organization',
+          classes: 'btn-default', icon: 'fa-group'}
+
       ];
       $scope.menu = {
         UserAdmin: userAdminMenu,
@@ -131,6 +143,8 @@
             classes: 'btn-primary', icon: 'fa-cloud-download'},
           {name: 'statisticsAndStatus', route: '#dashboard',
             classes: 'btn-success', icon: 'fa-dashboard'},
+          {name: 'reports', route: '#reports',
+            classes: 'btn-success', icon: 'fa-file-text-o'},
           {name: 'classificationSystems', route: '#classification',
             classes: 'btn-info', icon: 'fa-tags'},
           {name: 'standards', route: '#standards',
@@ -140,9 +154,7 @@
           {name: 'settings', route: '#settings',
             classes: 'btn-warning', icon: 'fa-gear'},
           {name: 'tools', route: '#tools',
-            classes: 'btn-warning', icon: 'fa-medkit'},
-          {name: 'reports', route: '#reports',
-                classes: 'btn-success', icon: 'fa-file-text-o'}]
+            classes: 'btn-warning', icon: 'fa-medkit'}]
         // TODO : add other role menu
       };