Commit 3025be05 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

NodeDAO: replaced column delta with quota and retrieved quota value

parent 67b58940

src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java

+6 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class NodeDAO { 


        String sql = "SELECT (CASE WHEN c.path = n.path THEN ? ELSE (? || ? || c.name) END) AS vos_path, c.node_id, c.name,\n"

                + "c.type, c.async_trans, c.sticky, c.job_id IS NOT NULL AS busy_state, c.creator_id, c.group_read, c.group_write,\n"

                + "c.is_public, c.content_length, c.created_on, c.last_modified, c.accept_views, c.provide_views\n"

                + "c.is_public, c.content_length, c.created_on, c.last_modified, c.accept_views, c.provide_views, c.quota\n"

                + "FROM node n\n"

                + "JOIN node c ON c.path ~ (n.path::varchar || ? || '*{1}')::lquery OR c.path = n.path\n"

                + "WHERE n.node_id = id_from_vos_path(?)\n"
@@ -210,6 +210,9 @@ public class NodeDAO { 
        addProperty(NodeProperties.PUBLIC_READ_URI, String.valueOf(rs.getBoolean("is_public")),

                properties);



        addProperty(NodeProperties.QUOTA_URI, String.valueOf(rs.getString("quota")),

                properties);



        addProperty("urn:async_trans", String.valueOf(rs.getBoolean("async_trans")),

                properties);
@@ -378,7 +381,7 @@ public class NodeDAO { 
                + "(node_id, parent_path, parent_relative_path, "

                + "name, os_name, tstamp_wrapper_dir, type, location_id, format, "

                + "async_trans, job_id, creator_id, group_read, "

                + "group_write, is_public, delta, content_type, content_encoding, "

                + "group_write, is_public, quota, content_type, content_encoding, "

                + "content_length, content_md5, created_on, last_modified, "

                + "accept_views, provide_views, protocols, sticky)\n";
@@ -390,7 +393,7 @@ public class NodeDAO { 
                + "n.node_id, n.parent_path, n.parent_relative_path, "

                + "n.name, n.os_name, n.tstamp_wrapper_dir, n.type, n.location_id, n.format, "

                + "n.async_trans, n.job_id, n.creator_id, n.group_read, "

                + "n.group_write, n.is_public, n.delta, n.content_type, n.content_encoding, "

                + "n.group_write, n.is_public, n.quota, n.content_type, n.content_encoding, "

                + "n.content_length, n.content_md5, n.created_on, n.last_modified, "

                + "n.accept_views, n.provide_views, n.protocols, n.sticky\n";