From cf6aa06ba6fa34e119563e0f27ab08a19845a379 Mon Sep 17 00:00:00 2001 From: Gilles Crettenand Date: Mon, 1 Jun 2015 11:03:12 +0200 Subject: [PATCH] rename AddFiles to AddBookData since we plan on adding more data --- mobile.netbiblio.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mobile.netbiblio.php b/mobile.netbiblio.php index e12d2eb..3c96d8f 100644 --- a/mobile.netbiblio.php +++ b/mobile.netbiblio.php @@ -190,19 +190,19 @@ class NetBiblio extends WebService public function GetWishes() { $books = $this->getUser()->getWishes(); - return array_values($this->AddFiles($books)); + return array_values($this->AddBookData($books)); } public function GetCirculations() { $circulations = $this->getUser()->getCirculations(); - return array_values($this->AddFiles($circulations)); + return array_values($this->AddBookData($circulations)); } public function GetOldCirculations() { $circulations = $this->getUser()->getOldCirculations(); - return array_values($this->AddFiles($circulations)); + return array_values($this->AddBookData($circulations)); } public function AddWish($bookNr) @@ -222,7 +222,7 @@ class NetBiblio extends WebService $codes = json_decode($codes, true); $codes = array_map('intval', $codes); $books = AudioBook::findBy('NoticeNr', $codes, true); - return array_values($this->AddFiles($books)); + return array_values($this->AddBookData($books)); } private function GetFiles(array $ids) @@ -247,10 +247,10 @@ class NetBiblio extends WebService return json_decode($json, true); } - private function AddFiles(array $books) + private function AddBookData(array $books) { if(isset($books['code'])) { - $result = $this->AddFiles(array($books)); + $result = $this->AddBookData(array($books)); return reset($result); } @@ -273,7 +273,7 @@ class NetBiblio extends WebService $code = intval($code); $book = AudioBook::findBy('NoticeNr', $code, true); - return $this->AddFiles($book); + return $this->AddBookData($book); } public function GetRandomBooks($number = 100) { @@ -291,7 +291,7 @@ class NetBiblio extends WebService $ids = Connection::execute($sql)->to_array(); $ids = array_map(function($a) { return $a['NoticeId']; }, $ids); $books = AudioBook::findBy('NoticeId', $ids, true); - return array_values($this->AddFiles($books)); + return array_values($this->AddBookData($books)); } public function Search($query, $start, $limit) @@ -386,7 +386,7 @@ class NetBiblio extends WebService if($results['response']['docs']) { $books = array_map(function($o) { return (array) $o; }, $results['response']['docs']); - $books = $this->AddFiles($books); + $books = $this->AddBookData($books); $data = array_merge($data, $books); } @@ -441,7 +441,7 @@ class NetBiblio extends WebService $ids = array_map(function($r) { return $r['id']; }, $results['response']['docs']); $books = AudioBook::findBy('NoticeID', $ids, true); - $books = $this->AddFiles($books); + $books = $this->AddBookData($books); $data = array(); foreach($books as $b) {