Changeset 1604

Timestamp:

10/31/11 12:55:36 (13 years ago)

Author:

twagoo

Message:

Added parameter 'mdEditor' to REST call /registry/profiles which causes only selected profiles are shown. Implemented programmatic filtering on this, could be done on database which would be more efficient.

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• ComponentRegistry.java (modified) (1 diff)
• impl/ComponentRegistryImplBase.java (modified) (2 diffs)
• impl/database/ComponentRegistryDbImpl.java (modified) (1 diff)
• impl/database/ProfileDescriptionDao.java (modified) (1 diff)
• rest/ComponentRegistryRestService.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistry.java

@@ -31 +31 @@
      */
     List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException;
+
+    /**
+     * 
+     * @return List of profile descriptions ordered by name ascending, only the ones marked for showing in metadata editor
+     * @throws ComponentRegistryException
+     */
+    List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException;
 
     ProfileDescription getProfileDescription(String id) throws ComponentRegistryException;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java

@@ -54 +54 @@
         }
         return result;
+    }
+
+    /**
+     * 
+     * @return List of profile descriptions ordered by name ascending, only the ones marked for showing in metadata editor
+     * @throws ComponentRegistryException
+     */
+    @Override
+    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException {
+        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDao, should have better performance
+
+        // Get all profile descriptions
+        List<ProfileDescription> descriptionsCollection = getProfileDescriptions();
+        // Filter out ones that do should not be shown for metadata editor
+        ArrayList<ProfileDescription> descriptions = new ArrayList<ProfileDescription>(descriptionsCollection.size());
+        for (ProfileDescription profile : descriptionsCollection) {
+            if (((ProfileDescription) profile).isShowInEditor()) {
+                descriptions.add((ProfileDescription) profile);
+            }
+        }
+        // Return filtered list
+        return descriptions;
     }
 
@@ -122 +144 @@
         return result.toString();
     }
-
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -91 +91 @@
         }
     }
-
+    
     @Override
     public ProfileDescription getProfileDescription(String id) throws ComponentRegistryException {

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ProfileDescriptionDao.java

@@ -5 +5 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -64 +64 @@
     public static final String DOMAIN_FORM_FIELD = "domainName";
     public static final String USERSPACE_PARAM = "userspace";
+    public static final String METADATA_EDITOR_PARAM = "mdEditor";
     @Inject(value = "componentRegistryFactory")
     private ComponentRegistryFactory componentRegistryFactory;
@@ -107 +108 @@
     @Path("/profiles")
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public List<ProfileDescription> getRegisteredProfiles(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+    public List<ProfileDescription> getRegisteredProfiles(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace,
+            @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
         long start = System.currentTimeMillis();
-        List<ProfileDescription> profiles = getRegistry(userspace).getProfileDescriptions();
+        
+        List<ProfileDescription> profiles;
+        if (metadataEditor) {
+            profiles = getRegistry(userspace).getProfileDescriptionsForMetadaEditor();
+        } else {
+            profiles = getRegistry(userspace).getProfileDescriptions();
+        }
+        
         LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
                 + " millisecs)");
@@ -211 +220 @@
             List<ComponentDescription> components = registry.getUsageInComponents(componentId);
             List<ProfileDescription> profiles = registry.getUsageInProfiles(componentId);
-            
+
             LOG.info("Found " + components.size() + " components and " + profiles.size() + " profiles that use component " + componentId
                     + " (" + (System.currentTimeMillis() - start) + " millisecs)");
-            
+
             List<AbstractDescription> usages = new ArrayList<AbstractDescription>(components.size() + profiles.size());
             usages.addAll(components);
@@ -225 +234 @@
         }
     }
-    
+
     /**
      *