add max limits to offset and total-records to 10,000 when html is selected

mehtadev17 · mehtadev17 · commit ae91e395e7de · 2014-07-29T15:45:28.000Z
diff --git a/src/qu/query/validation.clj b/src/qu/query/validation.clj
@@ -142,26 +142,14 @@
                     :default (Integer/parseInt val))]
             query)
           (catch NumberFormatException e;
-           (add-error query clause "Please use an integer."))))))
+           (add-error query clause "Please enter a number."))))))
 
-(defn- validate-intsize
-  [query clause]
-  (let [val (clause query)]
-    (try
-      (if (and (integer? (Integer/parseInt val)) (> 10000 (Integer/parseInt val)))
-        query
-        (if (and (integer? (Integer/parseInt val)) (< 10000 (Integer/parseInt val)))
-          (add-error query clause "Offset must be < 10000.")
-          (try
-          (let [_ (cond
-                   (integer? val) val
-                   (nil? val) 0
-                   :default (Integer/parseInt val))]
-           query)
-            (catch NumberFormatException e;
-              (add-error query clause "Please use an integer.")))))
-      (catch NumberFormatException e;
-        (add-error query clause "Please use an integer.")))))
+(defn- validate-max-offset
+  [query]
+  (let [offset (->int (:offset query) 0)]
+    (if (> offset 10000)
+      (add-error query :offset (str "The maximum offset is 10,000."))
+      query)))
 
 (defn- validate-max-limit
   [query max]
@@ -176,7 +164,7 @@
 
 (defn- validate-offset
   [query]
-  (validate-intsize query :offset))
+  (validate-integer query :offset))
 
 (defn validate
   "Check the query for any errors."
@@ -189,5 +177,6 @@
         validate-where
         validate-order-by
         validate-limit
-        validate-offset)
+        validate-offset
+        validate-max-offset)
     query))
diff --git a/src/qu/views.clj b/src/qu/views.clj
@@ -229,10 +229,11 @@
           current-page (or (get-in resource [:properties :page]) 1)
           href (:href resource)
           limit (get-in resource [:properties :query :limit])
+          limit-total (if (> total 10000) 10000 total)
           total-pages (if (zero? limit)
                         1
-                        (+ (quot total limit)
-                           (if (zero? (rem total limit)) 0 1)))
+                        (+ (quot limit-total limit)
+                           (if (zero? (rem limit-total limit)) 0 1)))
           window (range (max 1 (- current-page window-size))
                         (inc (min total-pages (+ current-page window-size))))
           in-window? (fn [page]
@@ -250,10 +251,7 @@
                  :href (href-for-page resource 1)})
           (concat [{:page "Next"
                     :class (when (>= current-page total-pages) "disabled")
-                    :href (href-for-page resource (inc current-page))}
-                   {:page "Last"
-                    :class (when (in-window? total-pages) "disabled")
-                    :href (href-for-page resource total-pages)}])))
+                    :href (when (< current-page total-pages) (href-for-page resource (inc current-page)))}])))
     []))
 
 (defmulti slice-query (fn [format _ _] format))
