Changeset 2259

Timestamp:

09/27/12 16:38:55 (12 years ago)

Author:

olhsha

Message:

safari still duplicates an item in url (experimenting with removing guid did not help), with the reading from a file everything is ok. The date sorting is fixed in comments. But now there is a problem with the date comparison in Abstract descriptions

Location:

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

Files:

• main/binding/rss/rss-2_0.xsd (modified) (4 diffs)
• main/java/clarin/cmdi/componentregistry/RssCreator.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/model/Comment.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (4 diffs)
• test/java/clarin/cmdi/componentregistry/RssCreatorCommentsTest.java (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/binding/rss/rss-2_0.xsd

@@ -76 +76 @@
                 </xs:annotation>
             </xs:element>
-            <xs:element name="description" type="xs:string" minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>The item synopsis.</xs:documentation>
-                </xs:annotation>
-            </xs:element>
             <xs:element name="link" type="xs:anyURI" minOccurs="0"> 
             </xs:element> 
+            <xs:element name="description" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>The item synopsis.</xs:documentation>
+                </xs:annotation>
+            </xs:element>
             <xs:element name="category" type="Category" minOccurs="0">
                 <xs:annotation>
@@ -123 +123 @@
                 </xs:annotation>
             </xs:element>
+            
             <xs:element name="link" type="xs:anyURI">
                 <xs:annotation>
@@ -128 +129 @@
                 </xs:annotation>
             </xs:element>
+            
             <xs:element name="description" type="xs:string">
                 <xs:annotation>
@@ -133 +135 @@
                 </xs:annotation>
             </xs:element>
+            
             <xs:element name="language" type="xs:language" minOccurs="0">
                 <xs:annotation>

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

@@ -81 +81 @@
     }
 
+    public String getTitle(){
+        return this.title;
+    }
+    
     /**
      * Sets the value of the link property.
@@ -91 +95 @@
     }
 
+    public String getLink(){
+        return this.link;
+    }
+     
     /**
      * Sets the value of the description property.

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

@@ -5 +5 @@
 import java.util.Comparator;
 import java.util.Date;
+import javax.xml.bind.DatatypeConverter;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -186 +187 @@
         //compare two components by the date of registration
         // the dates, which are strings accrording to  ISO 8601, compared lexicographically 
-        
+    @Override    
         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;};
-            
-            
+            
+            Date d1 = DatatypeConverter.parseDateTime(o1.getRegistrationDate()).getTime();
+            Date d2 = DatatypeConverter.parseDateTime(o2.getRegistrationDate()).getTime();
+            
+            result = d2.compareTo(d1);
             
             return result;

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
 
+import java.text.DateFormat;
 import java.text.ParseException;
+import java.util.Comparator;
 import java.util.Date;
+import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -132 +135 @@
         return com;
     }
+    
+    
+    public static final Comparator<Comment> COMPARE_ON_DATE = new Comparator<Comment>() {
+        
+        //compare two commments by the date of registration
+        // the dates, which are strings accrording to  ISO 8601, compared lexicographically 
+    @Override    
+    public int compare(Comment o1, Comment o2) {
+            
+            int result = 0;
+            
+            Date d1 = DatatypeConverter.parseDateTime(o1.getCommentDate()).getTime();
+            Date d2 = DatatypeConverter.parseDateTime(o2.getCommentDate()).getTime();
+            
+            result = d2.compareTo(d1);
+            
+            return result;
+        }
+    };
 }

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

@@ -1043 +1043 @@
         // ?? this is for debugging. But, anyway, how to get all the profiles without the need to type them in?
         // what if a user do not remember his/her id of profile?
-        /* grabbing all registered profile names from the register and outputting them  on the tomcat terminal */
-        List<ProfileDescription> lprfaux = getRegisteredProfiles(userspace, true);
+        // 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) {
@@ -1050 +1050 @@
             LOG.debug(currentProfileId);
         }
-        /* end of grabbing */
-
-
-        // TODO: add sorting !
+        */
+        // end of grabbing */
+
+
 
         final Principal principal = security.getUserPrincipal();
@@ -1059 +1059 @@
 
         String baseUri = getApplicationBaseURI()+"/";
-        LOG.debug("Basis uri "+baseUri);
         
         
@@ -1066 +1065 @@
         if (comments.size()<limitInt) {limitInt = comments.size();};
         List<Comment> sublist = comments.subList(0, limitInt);
-        
-        
+        Collections.sort(sublist, Comment.COMPARE_ON_DATE);
+        
+        for (Comment comm: sublist){
+            LOG.debug(comm.getCommentDate());
+        }
          
         RssCreatorComments instance = new RssCreatorComments(baseUri);
         instance.setFlagIsFromProfile(true);
         instance.setDescription("Update of comments for current profile");
-        instance.setTitle("Comments feed for the profile \""+
+        
+        String hrefPostfix = "&view=comments";
+        String hrefInfix = "?item=";
+        instance.setLink(baseUri+hrefInfix+profileId+hrefPostfix);
+        
+        String title="Comments feed for the profile \""+
                 getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName()+
-                "\" ");
-        instance.setLink(baseUri+"profiles/rss");
+                "\" ";
+        instance.setTitle(title);
+        
         
         Rss result = instance.makeRss(sublist);
-        
-        
         
         // testing stuff

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

@@ -124 +124 @@
             System.out.println(resitems.get(i).getPubDate());
             System.out.println(resitems.get(i).getDescription());
+            System.out.println(resitems.get(i).getLink());
             System.out.println(resitems.get(i).getGuid().getValue());
             System.out.println("  ");