Merge pull request #52 from pastakhov/DisplayParameters

Use default dispaly parameters when it is not provided by user
SemanticMediaWiki · May 3, 2024 · 0d6b625 · 0d6b625
2 parents bdfccf5 + 2b762bc
commit 0d6b625
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/includes/Parameters/DisplayParameters.php b/includes/Parameters/DisplayParameters.php
@@ -23,7 +23,7 @@ class DisplayParameters implements IteratorAggregate {
 	/**
 	 * @param string $displayParameters String of the form "x1=y1;...;xn=yn"
 	 */
-	public function __construct( string $displayParameters ) {
+	public function __construct( string $displayParameters = '' ) {
 		$displayParameters = array_map( 'trim', explode( self::SEP, $displayParameters ) );
 
 		foreach ( $displayParameters as $dp ) {

diff --git a/includes/Parameters/DisplayParametersList.php b/includes/Parameters/DisplayParametersList.php
@@ -48,4 +48,8 @@ public function strings(): Generator {
 		}
 	}
 
+	public function count(): int {
+		return count( $this->list );
+	}
+
 }
diff --git a/includes/Specials/BrowseData/QueryPage.php b/includes/Specials/BrowseData/QueryPage.php
@@ -6,6 +6,7 @@
 use PageProps;
 use RequestContext;
 use SD\DbService;
+use SD\Parameters\DisplayParameters;
 use SD\Parameters\Parameters;
 use SD\Sql\PropertyTypeDbInfo;
 use SD\Sql\SqlProvider;
@@ -65,8 +66,9 @@ public function __construct(
 
 		$this->headerPage = $parameters->header();
 		$this->footerPage = $parameters->footer();
-		if ( $parameters->displayParametersList() ) {
-			foreach ( $parameters->displayParametersList() as $dps ) {
+		$displayParametersList = $parameters->displayParametersList();
+		if ( $displayParametersList && $displayParametersList->count() ) {
+			foreach ( $displayParametersList as $dps ) {
 				$format = $dps->format();
 				if ( !array_key_exists( $format, $resultFormatTypes ) ) {
 					$this->displayParametersWithUnknownFormat[] = $dps;
@@ -78,6 +80,8 @@ public function __construct(
 					$this->displayParametersWithUnsupportedFormat[] = $dps;
 				}
 			}
+		} else {
+			$this->pagedDisplayParametersList[] = new DisplayParameters();
 		}
 
 		$this->processTemplate = new ProcessTemplate;
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,8 @@ public function strings(): Generator { @@
     		}
     	}
+    	public function count(): int {
+    		return count( $this->list );
+    	}
     }