From c144b4404e824f856517dbebc73f22eb86a909c8 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 4 Jun 2021 14:59:38 +0200
Subject: [PATCH] Improved file info query

---
 .../java/it/inaf/ia2/transfer/persistence/FileDAO.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java b/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
index 587c270..4ec5f6f 100644
--- a/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
+++ b/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
@@ -40,12 +40,11 @@ public class FileDAO {
                 + "content_type, content_encoding, content_length, content_md5,\n"
                 + "accept_views, provide_views, l.location_type, n.path <> n.relative_path AS virtual_parent,\n"
                 + "(SELECT user_name FROM users WHERE user_id = creator_id) AS username,\n"
-                + "base_path, os_path\n"
-                + "FROM node_path p\n"
-                + "JOIN node n ON p.node_id = n.node_id\n"
+                + "base_path, get_os_path(n.node_id) AS os_path\n"
+                + "FROM node n\n"
                 + "JOIN location l ON (n.location_id IS NOT NULL AND n.location_id = l.location_id) OR (n.location_id IS NULL AND l.location_id = ?)\n"
                 + "LEFT JOIN storage s ON s.storage_id = l.storage_dest_id\n"
-                + "WHERE p.vos_path = ?";
+                + "WHERE n.node_id = id_from_vos_path(?)";
 
         FileInfo fileInfo = jdbcTemplate.query(conn -> {
             PreparedStatement ps = conn.prepareStatement(sql);
-- 
GitLab