Merge pull request #9 from itk-dev/feature/configuration

Service configuration

Author: stankut

src/Plugin/os2web/DataLookup/ServiceplatformenBase.php

@@ -84,7 +84,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       '#maxlength' => 500,
       '#title' => 'Service WSDL location',
       '#default_value' => $this->configuration['wsdl'],
-      '#description' => $this->t('ex. CVROnline-SF1530/wsdl/token/OnlineService.wsdl, relative path would be automatically converted to absolute path'),
+      '#description' => $this->t('ex. CVROnline-SF1530/wsdl/token/OnlineService.wsdl. A relative path will be resolved relatively to the location of the OS2Web datalookup module.'),
     ];
 
     $form['location'] = [
@@ -236,13 +236,16 @@ private function init() {
    *   WSDL URL.
    */
   protected function getWsdlUrl() {
-    $wsdl = $this->configuration['wsdl'];
-    // If it is relative URL make is absolute.
-    if (substr($wsdl, 0, 4) !== "http") {
-      global $base_url, $base_path;
-      $wsdl = $base_url . $base_path . drupal_get_path('module', 'os2web_datalookup') . '/' . $wsdl;
+    $url = $this->configuration['wsdl'];
+    // Anything that's not an absolute path or url will be resolved relative to
+    // the location of the os2web_datalookup module.
+    if (!preg_match('@^([a-z]+:/)?/@', $url)) {
+      /** @var \Drupal\Core\Extension\ExtensionPathResolver $extensionPathResolver */
+      $extensionPathResolver = \Drupal::service('extension.path.resolver');
+      $path = realpath($extensionPathResolver->getPath('module', 'os2web_datalookup'));
+      $url = 'file://' . $path . '/' . $url;
     }
-    return $wsdl;
+    return $url;
   }
 
   /**
@@ -281,7 +284,7 @@ protected function query($method, array $request) {
     if (!$this->isReady()) {
       return [
         'status' => FALSE,
-        'text' => $this->getStatus(),
+        'error' => $this->getStatus(),
       ];
     }