From 5f0fc7abfa55cc2b9e09aa47414f2dd0e2d4e776 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 28 May 2010 02:58:03 +0000 Subject: [PATCH] Fixes for lookup table class --- application/hub/config.php | 2 +- .../class_PeerStateLookupDatabaseWrapper.php | 6 +++--- .../peer/class_PeerStateLookupTable.php | 20 ++++++++++++++++--- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/application/hub/config.php b/application/hub/config.php index c7fec7a33..f86fdd3a3 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -52,7 +52,7 @@ $cfg->setConfigEntry('node_info_db_wrapper_class', 'NodeInformationDatabaseWrapp $cfg->setConfigEntry('node_list_db_wrapper_class', 'NodeListDatabaseWrapper'); // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS -$cfg->setConfigEntry('peer_lookup_db_wrapper_class', 'PeerLookupDatabaseWrapper'); +$cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper'); // CFG: WEB-CONTENT-TYPE $cfg->setConfigEntry('web_content_type', ''); diff --git a/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php b/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php index 1352626b3..a6634d1ff 100644 --- a/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php +++ b/application/hub/main/database/wrapper/class_PeerStateLookupDatabaseWrapper.php @@ -43,9 +43,9 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper { * * @return $wrapperInstance An instance of the created wrapper class */ - public final static function createPeerLookupDatabaseWrapper () { + public final static function createPeerStateLookupDatabaseWrapper () { // Get a new instance - $wrapperInstance = new PeerLookupDatabaseWrapper(); + $wrapperInstance = new PeerStateLookupDatabaseWrapper(); // Set (primary!) table name $wrapperInstance->setTableName(self::DB_TABLE_PEER_LOOKUP); @@ -67,7 +67,7 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper { * Checks wether given 'sender' is a new peer * * @param $packageData Raw package data - * @return $isNewPeer Wether 'sender' is a new peer to this node + * @return $isNewPeer Wether 'sender' is a new peer to this node */ public function isSenderNewPeer (array $packageData) { // Get a search criteria instance diff --git a/application/hub/main/lookup/peer/class_PeerStateLookupTable.php b/application/hub/main/lookup/peer/class_PeerStateLookupTable.php index 35095adb1..db1481f84 100644 --- a/application/hub/main/lookup/peer/class_PeerStateLookupTable.php +++ b/application/hub/main/lookup/peer/class_PeerStateLookupTable.php @@ -37,19 +37,33 @@ class PeerStateLookupTable extends BaseLookupTable implements Lookupable { * * @return $tableInstance An instance of a Lookupable class */ - public final static function createPeerLookupTable () { + public final static function createPeerStateLookupTable () { // Get new instance - $tableInstance = new PeerLookupTable(); + $tableInstance = new PeerStateLookupTable(); // Get a database wrapper instance $wrapperInstance = ObjectFactory::createObjectByConfiguredName('peer_state_lookup_db_wrapper_class'); // Set it for later re-use - $tableInstance->setWrapperInstance($wrapperInstance); + $tableInstance->setDatabaseInstance($wrapperInstance); // Return the prepared instance return $tableInstance; } + + /** + * Checks wether given 'sender' is a new peer + * + * @param $packageData Raw package data + * @return $isNewPeer Wether 'sender' is a new peer to this node + */ + public function isSenderNewPeer (array $packageData) { + // Get our wrapper instance and ask for it + $isNewPeer = $this->getDatabaseInstance()->isSenderNewPeer($packageData); + + // Return it + return $isNewPeer; + } } // [EOF] -- 2.39.5