From b33f4bc918228cccc79f19f31c766747a5f9b680 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 16 Jul 2025 12:16:40 +0200
Subject: [PATCH] Adding non-rimo clusters to cluster list in adb import broker

---
 .../adb-rimo-import/adb-rimo-import-broker.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/adb-rimo-import/adb-rimo-import-broker.php b/scripts/adb-rimo-import/adb-rimo-import-broker.php
index 89396eee0..8154d0bdf 100755
--- a/scripts/adb-rimo-import/adb-rimo-import-broker.php
+++ b/scripts/adb-rimo-import/adb-rimo-import-broker.php
@@ -9,7 +9,7 @@ posix_setrlimit(POSIX_RLIMIT_FSIZE, 1024*1024*1024*5, 1024*1024*1024*5); // Limi
 
 if(pidislocked()) {
     _debug_log("ADB Rimo Import Broker läuft bereits (pidfile vorhanden)");
-    die("ADB Rimo Import Broker läuft bereits (pidfile vorhanden)");
+    die("ADB Rimo Import Broker läuft bereits (pidfile vorhanden)\n");
 }
 if(!lockpid()) {
     die("Error creating lock file!\n");
@@ -18,7 +18,7 @@ if(!lockpid()) {
 require("../../config/config.php");
 
 $debug_log = false;
-
+$valid_adb_sources = ["rimo-rest-api", "citycom-oan-api"];
 /*
  * Redirecting output so rlimit for filesize works
  */
@@ -243,6 +243,7 @@ while(1) {
 unlockpid();
 
 function loadClusters() {
+    global $valid_adb_sources;
     $clusters = [];
 
     $netowners = ["estmk", "rml", "sbidi"];
@@ -293,10 +294,21 @@ function loadClusters() {
 
         foreach ($clustersResponse->item as $cluster) {
             $cluster_data = ["apiOwner" => $apiOwner, "apiKey" => $apiToken, "apiUrl" => $apiUrl, "cluster" => $cluster];
-            $clusters[] = $cluster_data;
+            $clusters[$cluster->id] = $cluster_data;
         }
     }
 
+    foreach(ADBNetzgebietModel::getAll() as $netzgebiet) {
+        if(!in_array($netzgebiet->source, $valid_adb_sources)) continue;
+
+        if(!array_key_exists($netzgebiet->source_id, $clusters)) {
+            $netzgebiet->id = $netzgebiet->source_id;
+            $clusters[$netzgebiet->source_id] = ["apiOwner" => $apiOwner, "apiKey" => $apiToken, "apiUrl" => $apiUrl, "cluster" => $netzgebiet];
+        }
+    }
+
+
+
     return $clusters;
 }