Merge pull request #12 from FACT-Finder/release

Release 2.5.6
FACT-Finder · Mar 24, 2015 · 91f8a27 · 91f8a27
2 parents 84a92b7 + a859f8f
commit 91f8a27
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@
 /.idea/codeStyleSettings.xml
 /demo-json/ff.log
 /.idea
+build/
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+Version 2.5.6
+    FIX: products per page options may be null at json response although result exists
+
 Version 2.5.5
     CHG: SCIC adapters now exist for all versions (and both interfaces), because the action changes in FF 6.8.
     ADD: Legacy Tracking Adapter which can be used for FF6.8 and 6.9

diff --git a/build.xml b/build.xml
@@ -2,7 +2,7 @@
 
 <project name="FACT-Finder PHP Framework" default="build">
 
-	<property name="version"  value="2.5.5" override="true" />
+	<property name="version"  value="2.5.6" override="true" />
     <property name="buildBaseDir" value="./build" override="true" />
 	<property name="packageName" value="FACTFinderPHPFramework" override="true" />
     <property name="srcdir"   value="${project.basedir}" override="true" />

diff --git a/lib/FACTFinder/Json66/SearchAdapter.php b/lib/FACTFinder/Json66/SearchAdapter.php
@@ -168,7 +168,11 @@ protected function getResultFromRawResult($jsonData) {
             $encodingHandler = $this->getEncodingHandler();
 
             $paging = $this->getPaging();
-            $positionOffset = ($paging->getCurrentPageNumber() - 1) * $this->getProductsPerPageOptions()->getSelectedOption()->getValue();
+            if ($paging != null && $this->getProductsPerPageOptions() != null && $this->getProductsPerPageOptions()->getSelectedOption() != null) {
+                $positionOffset = ($paging->getCurrentPageNumber() - 1) * $this->getProductsPerPageOptions()->getSelectedOption()->getValue();
+            } else {
+                $positionOffset = 0;
+            }
 
             //load result
             $positionCounter = 1;

diff --git a/tests/resources/config.xml b/tests/resources/config.xml
@@ -15,7 +15,7 @@
 				<advancedPrefix>FACT-FINDER</advancedPrefix>
 				<advancedPostfix>FACT-FINDER</advancedPostfix>
 			</auth>
-			<context>FACT-Finder</context>
+			<context>FACT-Finder6.9</context>
 			<channel>de</channel>
 			<language>de</language>
 			<!-- all timeouts given in seconds -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ @@
     /.idea/codeStyleSettings.xml
     /demo-json/ff.log
     /.idea
+    build/