*/
public static function get_indicators(): array {
+ if ( class_exists( 'ODW_Fields' ) ) {
+ $defs = ODW_Fields::load_field_definitions();
+ if ( ! empty( $defs ) ) {
+ return $defs;
+ }
+ }
+
+ // Fallback when ODW_Fields is not available (e.g. unit tests).
return array(
- // Pflichtfelder (DCAT-AP 3.0 mandatory) — 55 Punkte.
array(
'key' => 'title',
'label' => __( 'Titel (dct:title)', 'open-data-wizard' ),
@@ -86,8 +98,6 @@ public static function get_indicators(): array {
'points' => 15,
'required' => true,
),
-
- // Empfohlene Felder (DCAT-AP 3.0 recommended) — 40 Punkte.
array(
'key' => 'language',
'label' => __( 'Sprache (dct:language)', 'open-data-wizard' ),
@@ -112,8 +122,6 @@ public static function get_indicators(): array {
'points' => 10,
'required' => false,
),
-
- // Optionale Angaben — 5 Punkte.
array(
'key' => 'dist_format',
'label' => __( 'Format der Distribution (dct:format)', 'open-data-wizard' ),
@@ -121,7 +129,6 @@ public static function get_indicators(): array {
'required' => false,
),
);
- // Summe: 55 + 40 + 5 = 100.
}
// -------------------------------------------------------------------------
@@ -185,7 +192,21 @@ private static function check_indicator( string $key, \WP_Post $post ): bool {
return '' !== trim( (string) carbon_get_post_meta( $post->ID, 'odw_publisher' ) );
case 'license':
- return '' !== trim( (string) carbon_get_post_meta( $post->ID, 'odw_license' ) );
+ // License is now per-distribution (Änderung 7).
+ $dists = carbon_get_post_meta( $post->ID, 'odw_distributions' );
+ if ( ! is_array( $dists ) ) {
+ return false;
+ }
+ foreach ( $dists as $dist ) {
+ $lic = (string) ( $dist['license'] ?? '' );
+ if ( '' !== $lic && 'sonstige' !== $lic ) {
+ return true;
+ }
+ if ( 'sonstige' === $lic && ! empty( $dist['license_custom'] ) ) {
+ return true;
+ }
+ }
+ return false;
case 'distribution':
$dists = carbon_get_post_meta( $post->ID, 'odw_distributions' );
@@ -230,17 +251,25 @@ private static function check_indicator( string $key, \WP_Post $post ): bool {
}
/**
- * Ermittelt das Ampel-Level aus dem Score.
+ * Ermittelt das Qualitätslevel aus dem Score.
+ *
+ * 100 → Perfekt (alle Felder ausgefüllt)
+ * 56–99 → Gut (alle Pflichtfelder + einige optionale)
+ * REQUIRED_ONLY → Ausreichend (genau alle Pflichtfelder, keine optionalen)
+ * < REQUIRED → Verbesserungsbedarf (Pflichtfelder fehlen)
*
* @param int $score Numeric score 0–100.
- * @return string One of LEVEL_HIGH, LEVEL_MEDIUM, LEVEL_LOW.
+ * @return string One of LEVEL_PERFECT, LEVEL_HIGH, LEVEL_SUFFICIENT, LEVEL_LOW.
*/
public static function get_level( int $score ): string {
- if ( $score >= 80 ) {
+ if ( 100 === $score ) {
+ return self::LEVEL_PERFECT;
+ }
+ if ( $score > self::REQUIRED_ONLY_SCORE ) {
return self::LEVEL_HIGH;
}
- if ( $score >= 50 ) {
- return self::LEVEL_MEDIUM;
+ if ( self::REQUIRED_ONLY_SCORE === $score ) {
+ return self::LEVEL_SUFFICIENT;
}
return self::LEVEL_LOW;
}
@@ -367,7 +396,8 @@ public static function render_meta_box( \WP_Post $post ): void {
$score = $quality['score'];
$level = $quality['level'];
$level_label = self::get_level_label( $level );
- $level_class = 'odw-quality--' . $level;
+ // Map 'perfect' to 'high' CSS class so existing styles apply.
+ $level_class = 'odw-quality--' . ( 'perfect' === $level ? 'high' : $level );
$stored = $quality['indicators'];
?>
@@ -467,9 +497,10 @@ public static function render_meta_box( \WP_Post $post ): void {
*/
public static function get_level_label( string $level ): string {
return array(
- self::LEVEL_HIGH => __( 'Gut', 'open-data-wizard' ),
- self::LEVEL_MEDIUM => __( 'Mittel', 'open-data-wizard' ),
- self::LEVEL_LOW => __( 'Verbesserungsbedarf', 'open-data-wizard' ),
+ self::LEVEL_PERFECT => __( 'Perfekt', 'open-data-wizard' ),
+ self::LEVEL_HIGH => __( 'Gut', 'open-data-wizard' ),
+ self::LEVEL_SUFFICIENT => __( 'Ausreichend', 'open-data-wizard' ),
+ self::LEVEL_LOW => __( 'Verbesserungsbedarf', 'open-data-wizard' ),
)[ $level ] ?? __( 'Unbekannt', 'open-data-wizard' );
}
diff --git a/includes/class-validation.php b/includes/class-validation.php
index c3233b9..9748f08 100644
--- a/includes/class-validation.php
+++ b/includes/class-validation.php
@@ -114,6 +114,11 @@ private static function validate( int $post_id, array $postarr ): array {
$errors[] = __( 'Mindestens eine Distribution mit Zugriffs-URL (dcat:accessURL)', 'open-data-wizard' );
}
+ // --- Lizenz in jeder Distribution (Änderung 7) ---
+ if ( $has_distribution && ! self::all_distributions_have_license( $post_id, $cf_input ) ) {
+ $errors[] = __( 'Jede Distribution benötigt eine Lizenzangabe (dct:license)', 'open-data-wizard' );
+ }
+
return $errors;
}
@@ -166,6 +171,67 @@ private static function has_valid_distribution( int $post_id, array $cf_input ):
return false;
}
+ /**
+ * Check that every distribution with an access_url also has a license.
+ *
+ * @param int $post_id Post ID.
+ * @param array $cf_input Decoded Carbon Fields compact input.
+ */
+ private static function all_distributions_have_license( int $post_id, array $cf_input ): bool {
+ // Collect licenses from CF compact input.
+ $url_keys = array();
+ $license_keys = array();
+
+ foreach ( $cf_input as $key => $value ) {
+ $key = (string) $key;
+ if ( str_contains( $key, '_odw_distributions' ) && str_contains( $key, 'access_url' ) && ! empty( $value ) ) {
+ // Extract group index from key like _odw_distributions[0][access_url].
+ preg_match( '/\[(\d+)\]/', $key, $matches );
+ if ( isset( $matches[1] ) ) {
+ $url_keys[] = $matches[1];
+ }
+ }
+ if ( str_contains( $key, '_odw_distributions' ) && str_contains( $key, '][license]' ) && ! empty( $value ) ) {
+ preg_match( '/\[(\d+)\]/', $key, $matches );
+ if ( isset( $matches[1] ) ) {
+ $license_keys[] = $matches[1];
+ }
+ }
+ }
+
+ // If we found distribution data in CF compact input, check it.
+ if ( ! empty( $url_keys ) ) {
+ foreach ( $url_keys as $idx ) {
+ if ( ! in_array( $idx, $license_keys, true ) ) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ // Fall back to existing meta.
+ $distributions = carbon_get_post_meta( $post_id, 'odw_distributions' );
+
+ if ( ! is_array( $distributions ) ) {
+ return true;
+ }
+
+ foreach ( $distributions as $dist ) {
+ if ( empty( $dist['access_url'] ) ) {
+ continue;
+ }
+ $lic = (string) ( $dist['license'] ?? '' );
+ if ( '' === $lic ) {
+ return false;
+ }
+ if ( 'sonstige' === $lic && empty( $dist['license_custom'] ) ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/**
* Validate that a string is a safe HTTP(S) URL.
* Blocks javascript:, data:, and other non-HTTP schemes.
diff --git a/tests/test-fields-extended.php b/tests/test-fields-extended.php
index 091131c..f44af97 100644
--- a/tests/test-fields-extended.php
+++ b/tests/test-fields-extended.php
@@ -511,9 +511,9 @@ public function test_build_distribution_format_uses_eu_uri(): void {
}
/**
- * Each distribution carries the dataset-level license as dct:license @id.
+ * Distribution carries its own per-distribution license as dct:license @id.
*/
- public function test_build_distribution_inherits_license(): void {
+ public function test_build_distribution_has_own_license(): void {
$this->load_fields();
$license_uri = 'https://creativecommons.org/publicdomain/zero/1.0/';
@@ -521,12 +521,12 @@ public function test_build_distribution_inherits_license(): void {
25,
'odw_dataset',
array(
- 'odw_license' => $license_uri,
'odw_distributions' => array(
array(
'access_url' => 'https://example.com/data.csv',
'format' => 'CSV',
'byte_size' => '',
+ 'license' => $license_uri,
),
),
)
@@ -584,18 +584,33 @@ public function test_build_includes_political_geocoding_level_uri(): void {
}
/**
- * The dct:license at dataset level is emitted as an @id reference.
+ * The dct:license is emitted per distribution (not at dataset level).
+ * A distribution with license 'sonstige' + license_custom uses the custom URI.
*/
- public function test_build_dataset_license_is_id_reference(): void {
+ public function test_build_distribution_sonstige_license_uses_custom_uri(): void {
$this->load_fields();
- $license_uri = 'https://creativecommons.org/licenses/by/4.0/';
- $this->setup_jsonld_mocks( 28, 'odw_dataset', array( 'odw_license' => $license_uri ) );
+ $custom_uri = 'https://example.org/my-custom-license';
+ $this->setup_jsonld_mocks(
+ 28,
+ 'odw_dataset',
+ array(
+ 'odw_distributions' => array(
+ array(
+ 'access_url' => 'https://example.com/data.csv',
+ 'format' => 'CSV',
+ 'byte_size' => '',
+ 'license' => 'sonstige',
+ 'license_custom' => $custom_uri,
+ ),
+ ),
+ )
+ );
$result = odw_build_dataset_jsonld( 28 );
$this->assertIsArray( $result );
- $this->assertArrayHasKey( 'dct:license', $result );
- $this->assertSame( array( '@id' => $license_uri ), $result['dct:license'] );
+ $dist = $result['dcat:distribution'][0];
+ $this->assertSame( array( '@id' => $custom_uri ), $dist['dct:license'] );
}
}
diff --git a/tests/test-fields.php b/tests/test-fields.php
index 67c5bfb..129d5e1 100644
--- a/tests/test-fields.php
+++ b/tests/test-fields.php
@@ -17,7 +17,8 @@
class Test_ODW_Fields extends TestCase {
/**
- * Returns a non-empty array with the three required meta keys.
+ * Returns scalar required meta keys (description + publisher).
+ * License is now per-distribution and not included as a scalar field.
*/
public function test_get_required_fields_returns_expected_keys(): void {
require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
@@ -25,12 +26,12 @@ public function test_get_required_fields_returns_expected_keys(): void {
$fields = ODW_Fields::get_required_fields();
$this->assertIsArray( $fields );
- $this->assertCount( 3, $fields );
$meta_keys = array_column( $fields, 'meta_key' );
$this->assertContains( '_odw_description', $meta_keys );
$this->assertContains( '_odw_publisher', $meta_keys );
- $this->assertContains( '_odw_license', $meta_keys );
+ // License is now per-distribution; no longer a scalar dataset-level field.
+ $this->assertNotContains( '_odw_license', $meta_keys );
}
/**
diff --git a/tests/test-quality.php b/tests/test-quality.php
index 329cf11..47f2864 100644
--- a/tests/test-quality.php
+++ b/tests/test-quality.php
@@ -52,27 +52,35 @@ public function test_get_level_returns_high_at_80(): void {
}
/**
- * Score 100 maps to LEVEL_HIGH.
+ * Score 100 maps to LEVEL_PERFECT.
*/
- public function test_get_level_returns_high_at_100(): void {
+ public function test_get_level_returns_perfect_at_100(): void {
$this->load_class();
- $this->assertSame( ODW_Quality::LEVEL_HIGH, ODW_Quality::get_level( 100 ) );
+ $this->assertSame( ODW_Quality::LEVEL_PERFECT, ODW_Quality::get_level( 100 ) );
}
/**
- * Score 50 maps to LEVEL_MEDIUM.
+ * Score 56 maps to LEVEL_HIGH (some optional fields filled).
*/
- public function test_get_level_returns_medium_at_50(): void {
+ public function test_get_level_returns_high_at_56(): void {
$this->load_class();
- $this->assertSame( ODW_Quality::LEVEL_MEDIUM, ODW_Quality::get_level( 50 ) );
+ $this->assertSame( ODW_Quality::LEVEL_HIGH, ODW_Quality::get_level( 56 ) );
}
/**
- * Score 79 is still LEVEL_MEDIUM (boundary check).
+ * Score 55 maps to LEVEL_SUFFICIENT (exactly required fields only).
*/
- public function test_get_level_returns_medium_at_79(): void {
+ public function test_get_level_returns_sufficient_at_55(): void {
$this->load_class();
- $this->assertSame( ODW_Quality::LEVEL_MEDIUM, ODW_Quality::get_level( 79 ) );
+ $this->assertSame( ODW_Quality::LEVEL_SUFFICIENT, ODW_Quality::get_level( 55 ) );
+ }
+
+ /**
+ * Score 99 maps to LEVEL_HIGH (boundary check below perfect).
+ */
+ public function test_get_level_returns_high_at_99(): void {
+ $this->load_class();
+ $this->assertSame( ODW_Quality::LEVEL_HIGH, ODW_Quality::get_level( 99 ) );
}
/**
@@ -107,14 +115,25 @@ public function test_get_level_label_high(): void {
}
/**
- * LEVEL_MEDIUM maps to label "Mittel".
+ * LEVEL_PERFECT maps to label "Perfekt".
+ */
+ public function test_get_level_label_perfect(): void {
+ $this->load_class();
+
+ \WP_Mock::userFunction( '__' )->andReturnArg( 0 );
+
+ $this->assertSame( 'Perfekt', ODW_Quality::get_level_label( ODW_Quality::LEVEL_PERFECT ) );
+ }
+
+ /**
+ * LEVEL_SUFFICIENT maps to label "Ausreichend".
*/
- public function test_get_level_label_medium(): void {
+ public function test_get_level_label_sufficient(): void {
$this->load_class();
\WP_Mock::userFunction( '__' )->andReturnArg( 0 );
- $this->assertSame( 'Mittel', ODW_Quality::get_level_label( ODW_Quality::LEVEL_MEDIUM ) );
+ $this->assertSame( 'Ausreichend', ODW_Quality::get_level_label( ODW_Quality::LEVEL_SUFFICIENT ) );
}
/**