Changeset 2221

Timestamp:

09/13/12 15:41:58 (12 years ago)

Author:

olhsha

Message:

comparator for abstract description is implemented. Visually it works ok (on Rss of components and Profiles). ToDOs: refactoring -- single out the common part for rss-ing of profiles and components. Write testing for rss-sing of profiles and components.

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• RssCreator.java (modified) (1 diff)
• model/AbstractDescription.java (modified) (3 diffs)
• model/ComponentDescription.java (modified) (3 diffs)
• rest/ComponentRegistryRestService.java (modified) (4 diffs)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreator.java

@@ -55 +55 @@
      * @param descrs 
      */
+    /* public void setDescriptions(List<AbstractDescription> descrs){
+        
+        this.descrs = new ArrayList<AbstractDescription>();
+        
+        for (AbstractDescription currentdesc : descrs)
+        {this.descrs.add(currentdesc);};
+    }/**
+     * 
+     * @param descrs 
+     */
     public void setComponentDescriptions(List<ComponentDescription> descrs){
         

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Comparator;
@@ -166 +167 @@
         return result;
     }
+    
     public static final Comparator<? super AbstractDescription> COMPARE_ON_NAME = new Comparator<AbstractDescription>() {
 
@@ -179 +181 @@
         }
     };
+    
+    public static final Comparator<? super AbstractDescription> COMPARE_ON_DATE = new Comparator<AbstractDescription>() {
+        
+        //compare two components by the date of registration
+        // the dates, which are strings accrording to  ISO 8601, compared lexicographically 
+        
+        public int compare(AbstractDescription o1, AbstractDescription o2) {
+            
+            int result = 0;
+             
+            DateFormat df = DateFormat.getDateTimeInstance();
+            
+            try{
+            Date d1 = df.parse(o1.getRegistrationDate());
+            Date d2 = df.parse(o2.getRegistrationDate());
+            
+            result = d1.compareTo(d2);
+            
+            } catch (ParseException pe)  {return 0;};
+            
+            
+            
+            return result;
+        }
+    };
+    
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/ComponentDescription.java

@@ -10 +10 @@
 
 @XmlRootElement(name = "componentDescription")
-public class ComponentDescription extends AbstractDescription implements Serializable{
+public class ComponentDescription extends AbstractDescription implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
     public static final Comparator<? super ComponentDescription> COMPARE_ON_GROUP_AND_NAME = new Comparator<ComponentDescription>() {
         public int compare(ComponentDescription o1, ComponentDescription o2) {
             int result = 0;
-            if (o1.getGroupName() != null && o2.getGroupName() != null)
+            if (o1.getGroupName() != null && o2.getGroupName() != null) {
                 result = o1.getGroupName().compareToIgnoreCase(o2.getGroupName());
+            }
             if (result == 0) {
                 if (o1.getName() != null && o2.getName() != null) {
@@ -29 +29 @@
         }
     };
+    
 
     public static ComponentDescription createNewDescription() {
@@ -37 +38 @@
         return desc;
     }
-
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -29 +29 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.Collections;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
@@ -965 +965 @@
     }
     
+    /*
+     * generating rss: commom part for profile and component descriptions
+     * 
+     */
+    
+   /* private Rss getRss(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit,
+            List<AbstractDescription> descs) throws ComponentRegistryException {
+        
+        
+        
+        RssCreator rssCreator = new RssCreator();
+        int limitInt = Integer.parseInt(limit);
+        
+        if (descs.size()<limitInt) {limitInt = descs.size();};
+        
+        List<AbstractDescription> sublist = descs.subList(0, limitInt);
+       
+        Collections.sort(sublist, AbstractDescription.COMPARE_ON_DATE);
+        
+        rssCreator.setComponentDescriptions(sublist);
+        
+        if (userspace)   {rssCreator.setTitle("Workspace components");} 
+        else {rssCreator.setTitle("Public components");}
+        
+         
+        Rss rss =rssCreator.makeRssChannel();
+        
+        LOG.info("Releasing " + limitInt + "most recent registered components into the world sorted by their registration date-and-time");
+        return rss;
+    }*/
     ////////////////////////////////////////////////
     @GET
     @Path("/components/rss")
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Rss getRss(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException {
+    public Rss getRssComponent(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException {
         
-        long start = System.currentTimeMillis();
+        
         List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
         
@@ -982 +1012 @@
         
         List<ComponentDescription> sublist = components.subList(0, limitInt);
-        //Collections.sort(sublist, );
+       
+        Collections.sort(sublist, ComponentDescription.COMPARE_ON_DATE);
         
         rssCreator.setComponentDescriptions(sublist);
@@ -992 +1023 @@
         Rss rss =rssCreator.makeRssChannel();
         
-        LOG.info("Releasing " + limitInt + "most recent registered components into the world sorted by creations day");
+        LOG.info("Releasing " + limitInt + "most recent registered components into the world sorted by their registration date-and-time");
         return rss;
     }
     
+     ////////////////////////////////////////////////
+    @GET
+    @Path("/profiles/rss")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    public Rss getRssProfile(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException {
+        
+        long start = System.currentTimeMillis();
+        List<ProfileDescription> profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+        
+        
+         
+        RssCreator rssCreator = new RssCreator();
+        int limitInt = Integer.parseInt(limit);
+        
+        if (profiles.size()<limitInt) {limitInt = profiles.size();};
+        
+        List<ProfileDescription> sublist = profiles.subList(0, limitInt);
        
-       
-       /* public static final Comparator<? super ComponentDescription> COMPARE_ON_GROUP_AND_NAME = new Comparator<ComponentDescription>() {
-        public int compare(ComponentDescription o1, ComponentDescription o2) {
-            int result = 0;
-            if (o1.getGroupName() != null && o2.getGroupName() != null)
-                result = o1.getGroupName().compareToIgnoreCase(o2.getGroupName());
-            if (result == 0) {
-                if (o1.getName() != null && o2.getName() != null) {
-                    result = o1.getName().compareToIgnoreCase(o2.getName());
-                } else {
-                    result = o1.getId().compareTo(o2.getId());
-                }
-            }
-            return result;
-        }
-    };*/
+        Collections.sort(sublist, ProfileDescription.COMPARE_ON_DATE);
+        
+        rssCreator.setProfileDescriptions(sublist);
+        
+        if (userspace)   {rssCreator.setTitle("Workspace profiles");} 
+        else {rssCreator.setTitle("Public profiles");}
+        
+         
+        Rss rss =rssCreator.makeRssChannel();
+        
+        LOG.info("Releasing " + limitInt + "most recent registered profiles into the world sorted by their registration date-and-time");
+        return rss;
+    }   
+    
 }