From 01394769937f108ee0f3a8077b34bb5fc9bffe24 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Thu, 24 Nov 2011 10:55:09 -0800 Subject: make number of pictures/page a config option; replace "offset" with "page" --- config.ini_template | 1 + getjson.php | 24 ++++++++++-------------- index.php | 23 ++++++++++++----------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/config.ini_template b/config.ini_template index bdbf94d..387428d 100644 --- a/config.ini_template +++ b/config.ini_template @@ -15,3 +15,4 @@ removemeta=0 webbase="http://localhost/f-spot-gallery" admin="Some One " title="Some One's Gallery" +pics_per_page=30 \ No newline at end of file diff --git a/getjson.php b/getjson.php index cbb9fee..24a913f 100644 --- a/getjson.php +++ b/getjson.php @@ -1,27 +1,25 @@ query("SELECT * FROM photos LIMIT $O $N"); +$result = $DB->query("SELECT * FROM photos LIMIT $OFFSET $N"); $row = array(); @@ -37,13 +35,11 @@ if(!$usePDO) $result=$tmp; } -foreach ($result as $res){ - +foreach ($result as $res) +{ $row[$i] = $res; - $i++; - - } +} echo json_encode($row); diff --git a/index.php b/index.php index 3014924..d3d569f 100644 --- a/index.php +++ b/index.php @@ -5,6 +5,7 @@ $webbase=$iniarray["webbase"]; $dbprefix=$iniarray["dbprefix"]; $admin=$iniarray["admin"]; $title=$iniarray["title"]; +$N=$iniarray["pics_per_page"]; /* end parse ini-file */ ?> @@ -34,12 +35,12 @@ $title=$iniarray["title"]; var pics = d3.select(".pics").append("ul"); -var offset=0; -var N=30; +var page=0; +var N=; var count=0; -function myreload(a,b) { - d3.json("/getjson.php?O="+a+"&N="+b, function(json) { +function myreload(a) { + d3.json("/getjson.php?P="+a, function(json) { count=0; pics.selectAll("li").remove(); pics.selectAll("li").data(json) @@ -60,22 +61,22 @@ function myreload(a,b) { checkbutton(); }); - d3.select(".debug").text("O, N= "+a+" "+b+" "+count); + d3.select(".debug").text("P, count= "+a+" "+count); } function left() { - if (offset>=N) offset=offset-N; - myreload(offset,N); + if (page>=1) page=page-1; + myreload(page); } function right() { - offset=offset+N; - myreload(offset,N); + page=page+1; + myreload(page); } function checkbutton() { - if (offset==0) + if (page==0) { d3.select("button.prev").attr("disabled","disabled");} else { d3.select("button.prev").attr("disabled", null);}; @@ -86,7 +87,7 @@ function checkbutton() { { d3.select("button.next").attr("disabled",null);} } -myreload(offset,N); +myreload(page); -- cgit v1.2.3-18-g5258