Skip to content

Issue #19 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gunderjt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue #19 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7336ce
Checks added to ensure the required php functions are loaded
gunderjt Aug 15, 2015
765106e
Created setter for protected variable in Library; use setter in Colle…
gunderjt Aug 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/php/Collections.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function fetchCollections($params = array()){
}

$feed = new Zotero_Feed($response->getRawBody());
$this->owningLibrary->_lastFeed = $feed;
$this->owningLibrary->setLastFeed($feed);
$addedCollections = $this->addCollectionsFromFeed($feed);

if(isset($feed->links['next'])){
Expand Down
18 changes: 18 additions & 0 deletions lib/php/Library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ public function __construct($libraryType = null, $libraryID = null, $libraryUrlI
if (!extension_loaded('curl')) {
throw new Exception("You need cURL");
}
//check if APC is loaded
if (!extension_loaded('apc') && !ini_get('apc.enabled')) {
throw new Exception("PHP extension APC is not loaded/or enabled in php.ini");
}
//check if DOMDocument object is loaded
if (!extension_loaded('xml')) {
throw new Exception("PHP extension XML is not loaded");
}

$this->libraryType = $libraryType;
$this->libraryID = $libraryID;
Expand Down Expand Up @@ -271,6 +279,16 @@ public function getLastFeed(){
return $this->_lastFeed;
}

/**
* Sets the last Zotero_Feed
*
* @param Zotero_feed
*/
public function setLastFeed($feed)
{
$this->_lastFeed = $feed;
}

/**
* Construct a string that uniquely identifies a library
* This is not related to the server GUIDs
Expand Down