Prepare deeplinks for Tsugi

- Move get_meta_data from oai to template_library
thexerteproject · Nov 26, 2023 · 5abc664 · 5abc664
1 parent e672d47
commit 5abc664
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 279 deletions.
diff --git a/oai-pmh/oai.php b/oai-pmh/oai.php
@@ -25,9 +25,7 @@
     die("oai-pmh is not available");
 }
 require_once('oai_config.php');
-require_once('xerteobjects.php');
-
-//require $xerte_toolkits_site->php_library_path  . "template_library.php";
+require_once($xerte_toolkits_site->php_library_path  . "template_library.php");
 
 /**
  * Identifier settings. It needs to have proper values to reflect the settings of the data provider.

diff --git a/oai-pmh/xerteobjects.php b/oai-pmh/xerteobjects.php
diff --git a/oai-pmh/Html2Text.php → website_code/php/Html2Text.php b/oai-pmh/Html2Text.php → website_code/php/Html2Text.php
@@ -530,7 +530,7 @@ protected function convertBlockquotes(&$text)
                         // Re-set text width
                         $this->options['width'] = $pWidth;
                         // Replace content
-                        $text = mb_substr($text, 0, $start - $diff)
+                        $text = Html2Text . phpmb_substr($text, 0, $start - $diff)
                             . $body
                             . mb_substr($text, $end + mb_strlen($m[0]) - $diff);
 
@@ -650,7 +650,7 @@ protected function tostrike($str)
         $rtn = '';
         for ($i = 0; $i < mb_strlen($str); $i++) {
             $chr = mb_substr($str, $i, 1);
-            $combiningChr = chr(0xC0 | 0x336 >> 6). chr(0x80 | 0x336 & 0x3F);
+            $combiningChr = Html2Text . phpchr(0xC0 | 0x336 >> 6) . chr(0x80 | 0x336 & 0x3F);
             $rtn .= $chr . $combiningChr;
         }
         return $rtn;