From d750ba000904fa0e1db681fd5d736c9751534745 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 13 Jun 2008 13:18:30 +0000
Subject: [PATCH] corrected: planet version-comparison repair from Danny

svn: r10246
---
 collects/planet/private/planet-shared.ss | 46 ++++++++++++++++++------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/collects/planet/private/planet-shared.ss b/collects/planet/private/planet-shared.ss
index 74bc610ddb..16cb4fb1b1 100644
--- a/collects/planet/private/planet-shared.ss
+++ b/collects/planet/private/planet-shared.ss
@@ -249,25 +249,49 @@ Various common pieces of code that both the client and server need to access
   
   (define-struct mz-version (major minor))
   
+  
   ;; string->mz-version : string -> mz-version | #f
+  ;; Converts a string into mz-version.  We need to account
+  ;; for the change in numbering style from the 372 era to the 4.0 era.
   (define (string->mz-version str)
+    (define (minor+maint-chunks->minor chunks)
+      (+ (* (string->number (car chunks)) 1000)
+         (if (> (length chunks) 1)
+             (string->number (cadr chunks))
+             0)))
+    
     (cond
-      ;; Old style numbering (with three digits in front)
-      [(regexp-match #rx"^([0-9][0-9][0-9])([.0-9]*)$" str)
+      ;; Old style numbering with three digits in front.  The first digit
+      ;; goes up to three.
+      [(regexp-match #rx"^([0-3][0-9][0-9])\\.?([.0-9]*)$" str)
        =>
        (lambda (ver)
-         (let* ([major&minor (string->number (list-ref ver 1))])
-           (make-mz-version (remainder (quotient major&minor 100) 10)
-                            (remainder (quotient major&minor 10) 10))))]
+         (let ([major (string->number (list-ref ver 1))])
+           (cond
+             [(= (string-length (list-ref ver 2)) 0)
+              (make-mz-version major 0)]
+             [else
+              (let* ([minor+maint (regexp-split #rx"\\." (list-ref ver 2))]
+                     [minor (minor+maint-chunks->minor minor+maint)])
+                (make-mz-version major minor))])))]
       ;; New style numbering
-      [(regexp-match #rx"^([0-9]+)(\\.([0-9]+))?$" str)
+      [(regexp-match #rx"^([0-9]+)(\\.([.0-9]+))?$" str)
        =>
        (lambda (ver)
-         (make-mz-version
-          (string->number (list-ref ver 1))
-          (if (list-ref ver 3)
-              (string->number (list-ref ver 3))
-              0)))]
+         (cond [(list-ref ver 3)
+                (let* ([chunks (regexp-split #rx"\\." (list-ref ver 3))])
+                  (make-mz-version (+ (* (string->number (list-ref ver 1))
+                                         100)
+                                      (if (> (length chunks) 0)
+                                          (string->number (car chunks))
+                                          0))
+                                   (if (> (length (cdr chunks)) 0)
+                                       (minor+maint-chunks->minor (cdr chunks))
+                                       0)))]
+               [else
+                (make-mz-version (* (string->number (list-ref ver 1))
+                                    100)
+                                 0)]))]
       [else #f]))