From f8d198cf558198eadad41db0917dcf8ff001709a Mon Sep 17 00:00:00 2001
From: Tunc Polat <tunc.polat@simplweb.ch>
Date: Mon, 28 Aug 2023 20:27:38 +0200
Subject: [PATCH] Fix bug adding two adapters

---
 .../db/adapter/ethereum/EthereumSchema.java   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumSchema.java b/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumSchema.java
index daca074fd5..df36745f04 100644
--- a/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumSchema.java
+++ b/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumSchema.java
@@ -73,24 +73,32 @@ public Table createBlockchainTable( CatalogTable catalogTable, List<CatalogColum
                 ethereumDataSource,
                 catalogTable.id
         );
-
-        log.warn( catalogTable.name );
-        log.warn( catalogTable.getNamespaceName() );
-        log.warn( catalogTable.getDatabaseName() );
-        log.warn( catalogTable.getOwnerName() );
-        Boolean eventDataRetrieval = false; //ethereumDataSource.getEventDataRetrieval();
+        boolean eventDataRetrieval = ethereumDataSource.isEventDataRetrieval();
         if (eventDataRetrieval) {
+            String originalName = getOriginalName(catalogTable.name); // remove the last digit for key search in eventDataMap
+
             tableBuilder
-                    .contractAddress(ethereumDataSource.getSmartContractAddressFromCatalogTable(catalogTable.name))
+                    .contractAddress(ethereumDataSource.getSmartContractAddressFromCatalogTable(originalName))
                     .fromBlock(ethereumDataSource.getFromBlock())
                     .toBlock(ethereumDataSource.getToBlock())
-                    .event(ethereumDataSource.getEventFromCatalogTable(catalogTable.name));
+                    .event(ethereumDataSource.getEventFromCatalogTable(originalName));
         }
         EthereumTable table = tableBuilder.build();
         tableMap.put( catalogTable.name, table );
         return table;
     }
 
+    public static String getOriginalName(String catalogName) {
+        if (catalogName == null || catalogName.isEmpty()) {
+            return catalogName;
+        }
+        char lastChar = catalogName.charAt(catalogName.length() - 1);
+        if (Character.isDigit(lastChar)) {
+            return catalogName.substring(0, catalogName.length() - 1);
+        }
+        return catalogName;
+    }
+
 
     @Override
     public Map<String, Table> getTableMap() {