Fixes for lookup table class

diff --git a/application/hub/config.php b/application/hub/config.php
index c7fec7a33b54efe42a9342aaa6db110d1851cbed..f86fdd3a3c9dd3e36c564030c3d344ae6a7f2431 100644 (file)
--- 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 1352626b30210cd0739986bcd5be764e5c25f3aa..a6634d1ff6b8c915b5d0a26eb63660577e618f26 100644 (file)
--- 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 35095adb1ba2d633968cef7cc3669a53f94ae485..db1481f84a5b85310f0b50a8b4cab4495680370d 100644 (file)
--- 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]