cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the library computer for realsies.

Browse Source
This commit is contained in:
D3athrow
2015-03-12 00:39:47 -05:00
parent d64a337774
commit 57a940be1e
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/library/computers/base.dm
View File

@@ -25,11 +25,10 @@
return FALSE return FALSE
/obj/machinery/computer/library/proc/get_page(var/page_num) /obj/machinery/computer/library/proc/get_page(var/page_num)
var/sql = "SELECT id, author, title, category, ckey FROM library" var/sql = "SELECT id, author, title, category, ckey FROM library LIMIT [page_num * LIBRARY_BOOKS_PER_PAGE], [LIBRARY_BOOKS_PER_PAGE]"
//if(query) //if(query)
//sql += " [query.toSQL()]" //sql += " [query.toSQL()]"
// Pagination // Pagination
sql += " LIMIT [LIBRARY_BOOKS_PER_PAGE] OFFSET [page_num * LIBRARY_BOOKS_PER_PAGE]"
var/DBQuery/_query = dbcon_old.NewQuery(sql) var/DBQuery/_query = dbcon_old.NewQuery(sql)
_query.Execute() _query.Execute()
@@ -49,8 +48,8 @@
/obj/machinery/computer/library/proc/get_num_results() /obj/machinery/computer/library/proc/get_num_results()
var/sql = "SELECT COUNT(*) FROM library" var/sql = "SELECT COUNT(*) FROM library"
if(query) //if(query)
sql += query.toSQL() //sql += query.toSQL()
var/DBQuery/_query = dbcon_old.NewQuery(sql) var/DBQuery/_query = dbcon_old.NewQuery(sql)
_query.Execute() _query.Execute()
@@ -63,9 +62,12 @@
var/start = max(0,page_num-3) var/start = max(0,page_num-3)
var/end = min(num_pages, page_num+3) var/end = min(num_pages, page_num+3)
for(var/i = start,i <= end,i++) for(var/i = start,i <= end,i++)
pagelist += "<a href='?src=\ref[src];page=[i]'>[i+1]</a>" var/dat = "<a href='?src=\ref[src];page=[i]'>[i+1]</a>"
if(i != start) if(i == page_num)
pagelist += " " dat = "<font size=3><b>[dat]</b></font>"
if(i != end)
dat += " "
pagelist += dat
pagelist += "</div>" pagelist += "</div>"
return pagelist return pagelist

5
code/modules/library/computers/checkout.dm
View File

@@ -226,6 +226,11 @@
onclose(usr, "library") onclose(usr, "library")
return return
if(href_list["page"])
if(num_pages == 0)
page_num = 0
else
page_num = Clamp(text2num(href_list["page"]), 0, num_pages)
if(href_list["del"]) if(href_list["del"])
if(!usr.check_rights(R_ADMIN)) if(!usr.check_rights(R_ADMIN))
usr << "You aren't an admin, piss off." usr << "You aren't an admin, piss off."