/*
 * OrderFormatDate.java
 *
 * Version: $Revision$
 *
 * Date: $Date$
 *
 * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
 * Institute of Technology.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 * - Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *
 * - Redistributions in binary form must reproduce the above copyright
 * notice, this list of conditions and the following disclaimer in the
 * documentation and/or other materials provided with the distribution.
 *
 * - Neither the name of the Hewlett-Packard Company nor the name of the
 * Massachusetts Institute of Technology nor the names of their
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 * DAMAGE.
 */

package org.dspace.sort;

/**
 * Standard date ordering delegate implementation. The only "special" need is
 * for treat with date with only "small" year < 4 digit
 * 
 * @author Andrea Bollini
 */
public class OrderFormatDate implements OrderFormatDelegate
{
    public String makeSortString(String value, String language)
    {
        int endYearIdx = value.indexOf("-");
        int length = value.length();
        if (length < 4 || (endYearIdx >= 0 && endYearIdx < 4))
        {
            // padding the value from left with 0 so that 87 -> 0087, 687-11-24
            // -> 0687-11-24
            return String.format("%1$0"
                    + (length > 4 ? 4 - endYearIdx : 4 - length) + "d", 0)
                    + value;
        }
        else
        {
            return value;
        }
    }
}

@@ -2097,24 +2097,49 @@
 uage)%0A    %7B%0A
+        int padding = 0;%0A
         int 
@@ -2171,16 +2171,17 @@
 f(%22-%22);%0A
+%0A
         
@@ -2185,20 +2185,121 @@
    i
-nt length = 
+f (endYearIdx %3E= 0 && endYearIdx %3C 4)%0A        %7B%0A            padding = 4 - endYearIdx;%0A        %7D%0A        else if (
 valu
@@ -2308,17 +2308,21 @@
 length()
-;
+ %3C 4)
 %0A       
@@ -2326,61 +2326,86 @@
     
-if (length %3C 4 %7C%7C (endYearIdx %3E= 0 && endYearIdx %3C 4)
+%7B%0A            padding = 4 - value.length();%0A        %7D%0A%0A        if (padding %3E 0
 )%0A  
@@ -2564,73 +2564,18 @@
 1$0%22
-%0A                    + (length %3E 4 ? 4 - endYearIdx : 4 - length)
+ + padding
  + %22

Fix rare condition where if you had a 4 character value that contains a '-', it would use the length of the string to determine the padding, which would result in an attempt to use a 0 width specification.