Changeset 2257

Timestamp:

09/27/12 10:06:46 (12 years ago)

Author:

olhsha

Message:

safari still duplicates an item

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (5 diffs)
• test/java/clarin/cmdi/componentregistry/RssMarshallingTest.java (modified) (1 diff)

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

@@ -1009 +1009 @@
     public Rss getRssComponent(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
     
-        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
+       List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
       Rss rss = getRss(userspace, limit, components, "components");
         
@@ -1045 +1045 @@
         /* grabbing all registered profile names from the register and outputting them  on the tomcat terminal */
         List<ProfileDescription> lprfaux = getRegisteredProfiles(userspace, true);
-
-
+       
         for (ProfileDescription currentProfile : lprfaux) {
-
-            String currentProfileId = currentProfile.getId();
+            String currentProfileId = currentProfile.getId();
             LOG.debug(currentProfileId);
-
         }
         /* end of grabbing */
@@ -1062 +1059 @@
 
         String baseUri = getApplicationBaseURI()+"/";
-        
         LOG.debug("Basis uri "+baseUri);
         
@@ -1076 +1072 @@
         instance.setFlagIsFromProfile(true);
         instance.setDescription("Update of comments for current profile");
-        instance.setTitle("Comments feed for the profile "+profileId);
+        instance.setTitle("Comments feed for the profile \""+
+                getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName()+
+                "\" ");
+        instance.setLink(baseUri+"profiles/rss");
         
         Rss result = instance.makeRss(sublist);
@@ -1086 +1085 @@
         String os = MDMarshaller.marshalToString(result);
         writeStringToFile(os, path + "testRssResl.xml");
-        
-        
-       
+        //end of testing stuff
+        
+        // debugging stuff
         LOG.debug("The amount of items: "+Integer.toString(result.getChannel().getItem().size()));
         LOG.debug("The amount of comments: "+Integer.toString(comments.size()));
-        // end of testing stuff
+        // end of debugging stuff
         
 

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/RssMarshallingTest.java

@@ -41 +41 @@
         MDMarshaller.marshal(rss, os);
         String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
-                + "<rss version=\"2.0\" xmlns:ns2=\"http://purl.org/dc/elements/1.1/\""
+                + "<rss version=\"2.0\""
                 + ">\n"
                 + "    <channel>\n"