search view vcr beta

acdh-oeaw · Sep 27, 2021 · 5454c38 · 5454c38
1 parent 8a04040
commit 5454c38
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/acdh_repo_gui.routing.yml b/acdh_repo_gui.routing.yml
@@ -269,7 +269,7 @@ repo_search_v2:
     _access: 'TRUE'      
 
 repo_search_vcr:    
-  path: '/search_vcr/{metavalue}'
+  path: '/api/search_vcr/{metavalue}'
   defaults:
     _controller: '\Drupal\acdh_repo_gui\Controller\SearchViewController::search_vcr'
     metavalue: ""

diff --git a/js/acdh_repo_gui.js b/js/acdh_repo_gui.js
@@ -11,7 +11,7 @@ jQuery(function ($) {
         setInterval(blink_text('vcr-data-loading'), 10000);
 
         let metavalue = vcrMeta();
-        let url = "/browser/search_vcr/" + metavalue;
+        let url = "/browser/api/search_vcr/" + metavalue;
         $.get(url).success(function (data) {
             buildAndSubmitVcrForm($('#search-clarinurl').val(), data);
             $('#vcr-data-loading').hide();
@@ -30,7 +30,7 @@ jQuery(function ($) {
 
     /**
      * Get the search string values for the vcr data
-     * @returns {unresolved}
+     * @returns string
      */
     function vcrMeta() {
         let test = window.location.href;
@@ -40,9 +40,10 @@ jQuery(function ($) {
 
 
     function buildAndSubmitVcrForm(clarinUrl, data) {
-        $('<form action="' + clarinUrl + '" method="POST" target="_blank">\n\
-        <input type="hidden" name="name" value="ArcheCollection"/>\n\
-        <input type="hidden" name="resourceUri" value=' + data + ' /></form>').appendTo('#vcr-search-form');//.submit();
+        $('<form action="' + clarinUrl + '" method="POST" target="_blank" id="dynamicVcr">\n\
+        <input type="hidden" name="name" value="ArcheCollection"/>\n\<input type="hidden" id="vcrResourceUri" name="resourceUri"/></form>').appendTo('#vcr-search-form');//.submit();
+        $('#vcrResourceUri').val(data);
+        $('#dynamicVcr').submit();
     }
 
 

diff --git a/src/Controller/SearchViewController.php b/src/Controller/SearchViewController.php
@@ -89,13 +89,13 @@ public function generateView(string $metavalue = "root", string $limit = "10", s
      * @param string $metavalue
      * @return Response
      */
-    public function search_vcr(string $metavalue = "root"): \Symfony\Component\HttpFoundation\JsonResponse
+    public function search_vcr(string $metavalue = "root"): \Symfony\Component\HttpFoundation\Response
     {
         $this->modelData = $this->model->getVcr($this->helper->createMetaObj($metavalue));
 
         if (count($this->modelData) > 0 && isset($this->modelData[0]->json_agg)) {
-            return new \Symfony\Component\HttpFoundation\JsonResponse($this->modelData[0]->json_agg, 200, ['Content-Type' => 'application/json']);
+            return new \Symfony\Component\HttpFoundation\Response(\json_encode($this->modelData[0]->json_agg), 200, ['Content-Type' => 'application/json']);
         }
-        return new JsonResponse(array("There is no data"), 404, ['Content-Type' => 'application/json']);
+        return new Response(\json_encode(array("There is no data")), 404, ['Content-Type' => 'application/json']);
     }
 }