Fix for breaking change in Alma Analytics API response

scriptotek · Oct 1, 2019 · acae92a · acae92a
1 parent 2ba11a7
commit acae92a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.overcommit.yml b/.overcommit.yml
@@ -18,7 +18,7 @@
 PreCommit:
   TrailingWhitespace:
     enabled: true
-    on_warn: fail
+    problem_on_unmodified_line: warn
   PhpCs:
     enabled: true
     command: 'vendor/bin/phpcs'

diff --git a/spec/Analytics/RowSpec.php b/spec/Analytics/RowSpec.php
@@ -13,7 +13,7 @@ public function let()
         // We need to be able to handle missing data, so let's assume we have
         // a report with three columns, but that we for this row only got data
         // for two of the columns (data missing for Column2).
-        $xml = QuiteSimpleXMLElement::make('<Row xmlns="urn:schemas-microsoft-com:xml-analysis:rowset">
+        $xml = QuiteSimpleXMLElement::make('<Row>
                 <Column0>0</Column0>
                 <Column1>col1 content</Column1>
                 <Column3>col3 content</Column3>

diff --git a/spec/data/analytics_response.xml b/spec/data/analytics_response.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><report><QueryResult>
   <IsFinished>true</IsFinished>
   <ResultXml>
-    <rowset xmlns="urn:schemas-microsoft-com:xml-analysis:rowset">
+    <rowset>
       <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:saw-sql="urn:saw-sql" targetNamespace="urn:schemas-microsoft-com:xml-analysis:rowset">
         <xsd:complexType name="Row">
           <xsd:sequence>

diff --git a/spec/data/analytics_response_part1.xml b/spec/data/analytics_response_part1.xml
@@ -2,7 +2,7 @@
   <ResumptionToken>9672D715A8E2EAAA6F30DD22FC52BE4CCAE35E29D921E0AC8BE8C6734C9E1571B4E48EEFCA4046EFF8CD7D1662C2D0A7677D3AD05EDC3CA7F06182E34E9D7A2F</ResumptionToken>
   <IsFinished>false</IsFinished>
   <ResultXml>
-    <rowset xmlns="urn:schemas-microsoft-com:xml-analysis:rowset">
+    <rowset>
       <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:saw-sql="urn:saw-sql" targetNamespace="urn:schemas-microsoft-com:xml-analysis:rowset">
         <xsd:complexType name="Row">
           <xsd:sequence>

diff --git a/spec/data/analytics_response_part2.xml b/spec/data/analytics_response_part2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><report><QueryResult>
   <IsFinished>false</IsFinished>
   <ResultXml>
-    <rowset xmlns="urn:schemas-microsoft-com:xml-analysis:rowset">
+    <rowset>
       <Row>
         <Column0>0</Column0>
         <Column1>Elkins, James</Column1>

diff --git a/spec/data/analytics_response_part3.xml b/spec/data/analytics_response_part3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><report><QueryResult>
   <IsFinished>true</IsFinished>
   <ResultXml>
-    <rowset xmlns="urn:schemas-microsoft-com:xml-analysis:rowset">
+    <rowset>
       <Row>
         <Column0>0</Column0>
         <Column1>Parham, Peter 1950-</Column1>

diff --git a/src/Analytics/Report.php b/src/Analytics/Report.php
@@ -122,7 +122,7 @@ protected function fetchBatch($attempt = 1, $chunkSize = null)
 
         $this->readColumnHeaders($results);
 
-        $rows = $results->all('//rowset:Row');
+        $rows = $results->all('//Row');
 
         foreach ($rows as $row) {
             $this->resources[] = $this->convertToResource($row);

diff --git a/src/Analytics/Row.php b/src/Analytics/Row.php
@@ -17,7 +17,7 @@ public function __construct(QuiteSimpleXMLElement $data, $headers)
     {
         $this->headers = $headers;
         foreach ($headers as $idx => $header) {
-            $value = $data->text('rowset:Column' . ($idx + 1)) ?: null;
+            $value = $data->text('Column' . ($idx + 1)) ?: null;
             $this->byIndex[$idx] = $value;
             $this->byHeader[$header] = $value;
         }

diff --git a/src/Bibs/Holding.php b/src/Bibs/Holding.php
@@ -53,7 +53,7 @@ protected function isInitialized($data)
     }
 
     /**
-     * Load MARC record onto this Bib object. Chainable method.
+     * Update the MARC record on this holding object. Chainable method.
      *
      * @param string $xml
      *
@@ -87,7 +87,7 @@ protected function urlBase()
     }
 
     /**
-     * Get the MARC record.
+     * Get the MARC record for this holding object.
      */
     public function getRecord()
     {