Work on #14.

mjordan · Dec 29, 2018 · 5bdd669 · 5bdd669
1 parent cc2d0f6
commit 5bdd669
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -22,8 +22,8 @@ parameters:
     app.plugins.fetchresourcelist.from.drupal.gemini_endpoint: 'http://localhost:8000/gemini' 
     # Will need to be replaced pending outcome of https://github.com/mjordan/riprap/issues/21.
     app.plugins.fetchresourcelist.from.drupal.gemini_auth_header: 'Bearer islandora'
-    # For now, we store paging data in a local file instead of a db table.
-    app.plugins.fetchresourcelist.from.drupal.page_size: 5
+    # Drupal's JSON:API allows a maximum page size of 50.
+    app.plugins.fetchresourcelist.from.drupal.page_size: 5 
     app.plugins.fetchresourcelist.from.drupal.pager_data: '%kernel.project_dir%/var/fetchresourcelist.from.drupal.pager.txt'
 
     # To not register any fetchdigest plugins, use app.plugins.fetchdigest [].

diff --git a/src/Command/PluginFetchResourceListFromDrupal.php b/src/Command/PluginFetchResourceListFromDrupal.php
@@ -220,20 +220,20 @@ private function setPageOffset($page_offset, $links)
         // We are on the last page, so reset the offset value to start the
         // verification cycle from the beginning.
         else {
-            $first_url = $links['first'];
-            $query_string = parse_url(urldecode($first_url), PHP_URL_QUERY);
-            parse_str($query_string, $query_array);
-            $first_offset = $query_array['page']['offset'];
-            file_put_contents($this->page_data_file, trim($first_offset));
-
+            if (array_key_exists('first', $links)) {
+                $first_url = $links['first'];
+                $query_string = parse_url(urldecode($first_url), PHP_URL_QUERY);
+                parse_str($query_string, $query_array);
+                $first_offset = $query_array['page']['offset'];
+                file_put_contents($this->page_data_file, trim($first_offset));
 
-            // file_put_contents($this->page_data_file, '0');
-            if ($this->logger) {
-                $this->logger->info("PluginFetchResourceListFromDrupal has reset its page offset to 0",
-                    array(
-                        'Last page offset value' => $page_offset
-                    )
-                );
+                if ($this->logger) {
+                    $this->logger->info("PluginFetchResourceListFromDrupal has reset Drupal's JSON:API page offset to the first page.",
+                        array(
+                            'Pager self URL' => $links['self']
+                        )
+                    );
+                }                
             }
         }
     }