Merge pull request #152 from multnomah-county-it/dev

Revised remove_url function
multnomah-county-it · Nov 5, 2024 · aeec165 · aeec165
2 parents 5bf0904 + 2ccb141
commit aeec165
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 36 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Libilsws.php b/src/Libilsws.php
@@ -1202,14 +1202,23 @@ public function get_hold ($token = null, $hold_key = null)
      * Removes URLs from the trailing end of a string
      *
      * @param  string $string String to be modifed
-     * @return string $string Modifed string
+     * @return string $string Modified string
      */ 
 
     private function remove_url ($string)
     {
-        $string = preg_replace('#^(.*)(http)(s*)(:\/\/)(.*)$#', '$1', $string);
+        $string = trim($string);
+
+        $words = preg_split("/[\s]+/", $string);
+        $new = [];
+
+        foreach ($words as $word) {
+            if ( !preg_match("#^(http)(s{0,1})(:\/\/)(.*)$#", $word) ) {
+                array_push($new, $word);
+            }
+        }
 
-        return trim($string);
+        return implode(' ', $new);
     }
 
     /**

diff --git a/test/register_patron.php b/test/register_patron.php
@@ -25,13 +25,13 @@
     'language' => 'SOMALI',
     'middleName' => 'T',
     'notice_type' => 'PHONE',
-    'pin' => 'Waffles125',
+    'pin' => 'Waffles126',
     'postal_code' => '97209',
     'profile' => 'ONLINE',
-    'street' => '925 NW Hoyt St Apt 406',
-    'telephone' => '215-534-6821',
+    'street' => '925 NW Hoyt St Apt 408',
+    'telephone' => '215-534-6820',
     'sms_phone' => [
-        'number' => '215-534-6821',
+        'number' => '215-534-6820',
         'countryCode' => 'US',
         'bills'       => true,
         'general'     => true,

diff --git a/test/register_staff.php b/test/register_staff.php
@@ -17,7 +17,7 @@
     'city_state' => 'Portland, OR',
     'county' => '0_MULT',
     'profile' => '0_MULT',
-    'patron_id' => '99999999999919',
+    'patron_id' => '99999999999922',
     'email' => 'johnchouser@gmail.com',
     'firstName' => 'Bogus',
     'friends_notices' => 'YES',

diff --git a/test/update_patron.php b/test/update_patron.php
@@ -20,24 +20,24 @@
  * which fields are required.
  */
 $patron = [
-    'patron_id' => 'HOUSJOALAM12346',
+    'patron_id' => '21168045918653',
     'birthDate' => '1962-03-07',
-    'city_state' => 'Portland, OR',
+    'city_state' => 'Astoria, OR',
     'county' => '0_MULT',
     'email' => 'johnchouser@gmail.com',
-    'firstName' => 'Bogus',
+    'firstName' => 'John',
     'friends_notices' => 'YES',
     'home_library' => 'CEN',
-    'language' => 'SPANISH',
-    'lastName' => 'Bogart',
+    'language' => 'ENGLISH',
+    'lastName' => 'Houser',
     'library_news' => 'YES',
-    'middleName' => 'T',
-    'notice_type' => 'PHONE',
+    'middleName' => 'C',
+    'notice_type' => 'EMAIL',
     'postal_code' => '97209',
-    'street' => '925 NW Hoyt St Apt 401',
-    'telephone' => '215-534-6821',
+    'street' => '225 Alameda Ave Apt 2',
+    'telephone' => 'a123',
     'sms_phone' => [
-        'number' => '215-534-6821',
+        'number' => 'abc',
         'countryCode' => 'US',
         'bills'       => true,
         'general'     => true,
@@ -49,6 +49,10 @@
 
 $addr_num = 1;
 
+$options = [];
+$options['role'] = 'PATRON';
+$options['client_id'] = 'SymWSTestClient';
+
 $response = $ilsws->update_patron($patron, $token, $patron_key, $addr_num);
 print_r($response);