remove 3.3 version files and update code to modify url creation and a…

…dd json encoding for Issue #26 (#27) Co-authored-by: Peter West <[email protected]>
ub-unibe-ch · Jan 7, 2025 · 81e46ab · 81e46ab
1 parent c2c6ff6
commit 81e46ab
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 249 deletions.
diff --git a/IiifViewerPlugin.inc.php b/IiifViewerPlugin.inc.php
diff --git a/IiifViewerPlugin.php b/IiifViewerPlugin.php
@@ -44,13 +44,21 @@ public function register($category, $path, $mainContextId = null) {
 			if ($this->getEnabled($mainContextId)) {
 		    	$request = Application::get()->getRequest();
 			   	$url = $request->getBaseUrl() . '/' . $this->getPluginPath() . '/styles/iiifviewer.css';
-			    $templateMgr = TemplateManager::getManager($request);
+
+                $templateMgr = TemplateManager::getManager($request);
 		    	$templateMgr->addStyleSheet('iiifViewerStyles', $url);
-                if (str_starts_with($context, 'ojs')) {
-				    Hook::add('ArticleHandler::view::galley', [$this, 'articleCallback']);
-				    Hook::add('IssueHandler::view::galley', [$this, 'issueCallback']);
-                } elseif (str_starts_with($context, 'omp')) {
-			    	Hook::add('CatalogBookHandler::view', [$this, 'ompViewCallback'], HOOK::SEQUENCE_NORMAL);
+
+                switch (Application::getName()) {
+                    case 'ojs2':
+                        Hook::add('ArticleHandler::view::galley', [$this, 'articleCallback']);
+                        Hook::add('IssueHandler::view::galley', [$this, 'issueCallback']);
+                        break;
+                    case 'omp':
+			    	    Hook::add('CatalogBookHandler::view', [$this, 'ompViewCallback'], HOOK::SEQUENCE_NORMAL);
+                        break;
+                    case 'ops':
+                        break;
+                    default: throw new \Exception('Unsupported application!');
                 }
 			}
 			return true;
@@ -149,19 +157,21 @@ public function articleCallback($hookName, $args) {
 			$bestId = $submission->getBestId();
 			$galleyBestId = $galley->getBestGalleyId();
 			$galleyFile = $galley->getFile();
-            $apiUrl = null;
+            $apiParams['inline'] = 'true';
+            $apiPath = [];
             if ($isLatestPublication) {
-		        $apiUrl = $request->getIndexUrl().'/'.$contextPath.'/article/download/'.$bestId.'/'.$galleyBestId.'/'.$galleyFile->getId().'?inline=1';
+                $apiPath = [$bestId, $galleyBestId, $galleyFile->getId()];
             } else {
-		        $apiUrl = $request->getIndexUrl().'/'.$contextPath.'/article/download/'.$bestId.'/version/'.$galleyPublication->getId().'/'.$galleyBestId.'/'.$galleyFile->getId().'?inline=1';
+                $apiPath = [$bestId, 'version', $galleyPublication->getId(), $galleyBestId, $galleyFile->getId()];
             }
 
+            $apiUrl = $request->url( null, 'article', 'download', $apiPath, $apiParams );
+
 		    $templateMgr = TemplateManager::getManager($request);
 			$templateMgr->assign([
 			    'apiUrl' => $apiUrl,
 			    'pluginUrl' => $request->getBaseUrl() . '/' . $this->getPluginPath(),
 			    'isLatestPublication' => $isLatestPublication,
-
 			]);
 
 			$templateMgr->display($this->getTemplateResource($galleyTemplate));
@@ -200,7 +210,9 @@ function issueCallback($hookName, $args) {
 			$galleyBestId = $galley->getBestGalleyId();
 			$galleyFile = $galley->getFile();
 
-		    $apiUrl = $request->getIndexUrl().'/'.$contextPath.'/issue/download/'.$issueBestId.'/'.$galleyBestId.'/'.$galleyFile->getId().'?inline=1';
+            $apiPath = [$issueBestId, $galleyBestId, $galleyFile->getId()];
+            $apiParams['inline'] = 'true';
+            $apiUrl = $request->url(null, 'issue', 'download', $apiPath, $apiParams );
 
 		    $templateMgr = TemplateManager::getManager($request);
 			$templateMgr->assign([
@@ -246,7 +258,9 @@ private function viewImageFile($publicationFormat, $submission, $submissionFile,
 		$router = $request->getRouter();
 		$contextPath = $router->getRequestedContextPath($request, 1);
 
-		$apiUrl = $request->getIndexUrl().'/'.$contextPath.'/catalog/download/'.$submissionId.'/'.$format.'/'.$fileId.'?inline=1';
+        $apiPath = [$submissionId, $format, $fileId];
+        $apiParams['inline'] = 'true';
+        $apiUrl = $request->url(null, 'catalog', 'download', $apiPath, $apiParams );
 
 		$templateMgr = TemplateManager::getManager($request);
 		$templateMgr->assign(array(

diff --git a/index.php b/index.php
diff --git a/locale/de_DE/locale.po b/locale/de_DE/locale.po
diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po
diff --git a/templates/article_image.tpl b/templates/article_image.tpl
@@ -29,7 +29,7 @@
     		sequenceMode:       true,
     		tileSources:   [{
 			"type": "image",
-			"url": "{$apiUrl}"
+			"url": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES}
 		}]
 	    });
 	</script>

diff --git a/templates/article_manifest.tpl b/templates/article_manifest.tpl
@@ -22,13 +22,13 @@
 	  var mirador = Mirador.viewer({
 	    "id": "my-mirador",
 	    "manifests": {
-		"{$apiUrl}" :{
+		{$apiUrl|json_encode:JSON_UNESCAPED_SLASHES} :{
 		  //"provider": "Basel University"
 	      }
 	    },
 	    "windows": [
 	      {
-	        "loadedManifest": "{$apiUrl}",
+	        "loadedManifest": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES},
 	        "canvasIndex": 2,
 	        "thumbnailNavigationPosition": 'far-bottom'
 	      }

diff --git a/templates/display.tpl b/templates/display.tpl
@@ -46,7 +46,7 @@
     		sequenceMode:       true,
     		tileSources:   [{
 			"type": "image",
-			"url": "{$apiUrl}"
+			"url": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES}
 		}]
 	    });
 	</script>

diff --git a/templates/display_manifest.tpl b/templates/display_manifest.tpl
@@ -22,13 +22,13 @@
 	  var mirador = Mirador.viewer({
 	    "id": "my-mirador",
 	    "manifests": {
-		"{$apiUrl}" :{
+		{$apiUrl|json_encode:JSON_UNESCAPED_SLASHES} :{
 		  //"provider": "Basel University"
 	      }
 	    },
 	    "windows": [
 	      {
-	        "loadedManifest": "{$apiUrl}",
+	        "loadedManifest": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES},
 	        "canvasIndex": 2,
 	        "thumbnailNavigationPosition": 'far-bottom'
 	      }

diff --git a/templates/issue_image.tpl b/templates/issue_image.tpl
@@ -29,7 +29,7 @@
     		sequenceMode:       true,
     		tileSources:   [{
 			"type": "image",
-			"url": "{$apiUrl}"
+			"url": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES}
 		}]
 	    });
 	</script>

diff --git a/templates/issue_manifest.tpl b/templates/issue_manifest.tpl
@@ -22,13 +22,13 @@
 	  var mirador = Mirador.viewer({
 	    "id": "my-mirador",
 	    "manifests": {
-		"{$apiUrl}" :{
+		{$apiUrl|json_encode:JSON_UNESCAPED_SLASHES} :{
 		  //"provider": "Basel University"
 	      }
 	    },
 	    "windows": [
 	      {
-	        "loadedManifest": "{$apiUrl}",
+	        "loadedManifest": {$apiUrl|json_encode:JSON_UNESCAPED_SLASHES},
 	        "canvasIndex": 2,
 	        "thumbnailNavigationPosition": 'far-bottom'
 	      }