Merge pull request #57 from joewiz/fix-sorting

When listing versions, sort numerically

Author: line-o

modules/app.xqm

@@ -76,7 +76,7 @@ declare function app:package-version($node as node(), $model as map(*)) {
  : Load the package version
  :)
 declare function app:package-requires($node as node(), $model as map(*)) {
-    let $requires := $model?package/requires[@processor eq "http://exist-db.org"]
+    let $requires := $model?package/requires[@processor eq $config:exist-processor-name]
     return
         ($requires/@* except $requires/@processor) ! (./name() || ": " || ./string())
 };
@@ -332,11 +332,11 @@ declare function app:package-group-to-list-item($package-group as element(packag
                                     <td>
                                         <ul>{
                                             (: show links to older versions of the package that are compatible with the requested version of eXist :)
-                                            for $package in reverse($older-packages)
+                                            for $package in $older-packages
                                             let $download-version-url := concat($repoURL, "public/", $package/@path)
                                             return
                                                 <li>
-                                                    <a href="{$download-version-url}">{$package/version/string()}</a>
+                                                    <a href="{$download-version-url}">{$package/@path/string()}</a>
                                                 </li>,
 
                                             (: show links to any other version of the package that is compatible with the requested version of eXist, 
@@ -383,7 +383,7 @@ declare function app:package-group-to-list-item($package-group as element(packag
                                 for $change in $newest-package/changelog/change
                                 let $version := $change/@version/string()
                                 let $comment := $change/node()
-                                order by $version descending
+                                order by $version descending collation "http://www.w3.org/2013/collation/UCA?numeric=yes"
                                 return
                                     <tr>
                                         <td>{$version}</td>

modules/scan.xqm

@@ -223,7 +223,7 @@ declare function scanrepo:rebuild-raw-packages() as xs:string {
     let $raw-packages := 
         element raw-packages { 
             for $package-xar in xmldb:get-child-resources($config:packages-col)[ends-with(., ".xar")]
-            order by $package-xar
+            order by $package-xar collation "http://www.w3.org/2013/collation/UCA?numeric=yes"
             return
                 scanrepo:extract-raw-package($package-xar)
         }

modules/upgrade-to-v2-storage.xq

@@ -43,6 +43,7 @@ declare function local:upgrade-to-public-repo-2-storage() as element()+ {
         (
             element packages {
                 for $package in xmldb:get-child-resources("/db/apps/public-repo/public")[ends-with(., ".xar")]
+                order by $package collation "http://www.w3.org/2013/collation/UCA?numeric=yes"
                 return
                     xmldb:copy-resource("/db/apps/public-repo/public", $package, "/db/apps/public-repo-data/packages", $package, true()) !
                     (
@@ -52,6 +53,7 @@ declare function local:upgrade-to-public-repo-2-storage() as element()+ {
             },
             element icons {
                 for $icon in xmldb:get-child-resources("/db/apps/public-repo/public")[not(matches(., "\.(xar|xml)$"))]
+                order by $icon collation "http://www.w3.org/2013/collation/UCA?numeric=yes"
                 return
                     xmldb:copy-resource("/db/apps/public-repo/public", $icon, "/db/apps/public-repo-data/icons", $icon, true())
                     !