webserver: comparison src/server/plugins/postgresql/vfs.c

-:d0d5a970292f
+:e9dc53661df4
 static const char *sql_resolve_path =
 "with recursive resolvepath as (\n\
 select\n\
 resource_id,\n\
 parent_id,\n\
+'' as fullpath,\n\
 iscollection,\n\
+lastmodified,\n\
+creationdate,\n\
+contentlength,\n\
 regexp_split_to_array($1, '/') as pathelm,\n\
-'' as fullpath,\n\
 1 as pathdepth\n\
 from Resource\n\
 where parent_id is null\n\
 union\n\
 select\n\
 r.resource_id,\n\
 r.parent_id,\n\
+p.fullpath || '/' || r.nodename,\n\
 r.iscollection,\n\
+r.lastmodified,\n\
+r.creationdate,\n\
+r.contentlength,\n\
 p.pathelm,\n\
-p.fullpath || '/' || r.nodename,\n\
 p.pathdepth + 1\n\
 from Resource r\n\
 inner join resolvepath p on r.parent_id = p.resource_id\n\
 where p.pathelm[p.pathdepth+1] = r.nodename\n\
 )\n\
 select resource_id, parent_id, fullpath, iscollection from resolvepath\n\
 where fullpath = $1 ;";
 // Same as sql_resolve_path, but it returns the root collection
 // params: $1: path string (should be '/')
-static const char *sql_get_root = "select resource_id, parent_id, $1 as fullpath, true as iscollection from Resource where parent_id is null;";
+static const char *sql_get_root = "select resource_id, parent_id, $1 as fullpath, true as iscollection, lastmodified, creationdate, contentlength from Resource where parent_id is null;";
 // Get all children of a specific collection
 // params: $1: parent resource_id
-static const char *sql_get_children = "select resource_id, nodename, iscollection from Resource where parent_id = $1;";
+static const char *sql_get_children = "select resource_id, nodename, iscollection, lastmodified, creationdate, contentlength from Resource where parent_id = $1;";
+// Get resource
+// params: $1: resource_id
+static const char *sql_get_resource = "select resource_id, nodename, iscollection, lastmodified, creationdate, contentlength from Resource where resource_id = $1;";
 VFS* pg_vfs_create(Session *sn, Request *rq, pblock *pb) {
 // resourcepool is required
 char *resource_pool = pblock_findval("resourcepool", pb);
 if(!resource_pool) {
 return vfs;
 }
-int pg_resolve_path(VFSContext *ctx, const char *path, int64_t *parent_id, int64_t *resource_id, const char **resource_name, WSBool *iscollection) {
+int pg_resolve_path(
+VFSContext *ctx,
+const char *path,
+int64_t *parent_id,
+int64_t *resource_id,
+const char **resource_name,
+WSBool *iscollection,
+struct stat *s)
+{
 // basic path validation
 if(!path) return 1;
 size_t pathlen = strlen(path);
 if(pathlen == 0) return 1;
 if(path[0] != '/') {
 return 1;
 }
+char *pathf = NULL;
+if(pathlen > 1 && path[pathlen-1] == '/') {
+pathf = malloc(pathlen);
+memcpy(pathf, path, pathlen);
+pathf[pathlen-1] = 0; // remove trailing '/'
+path = pathf;
+}
 // get last node of path
 *resource_name = util_resource_name(path);
 VFS *vfs = ctx->vfs;
 PgVFS *pg = vfs->instance;
 const char *sql = pathlen == 1 ? sql_get_root : sql_resolve_path;
 PGresult *result = PQexecParams(
 pg->connection,
 sql,
 1,     // number of parameters
 NULL,
 &path, // parameter value
 NULL,
 NULL,
 0);    // 0: result in text format
+if(pathf) {
+free(pathf);
+}
 if(!result) return 1;
 int ret = 1;
-int nfields = PQnfields(result);
+//int nfields = PQnfields(result);
 int nrows = PQntuples(result);
-if(nrows == 1 && nfields == 4) {
+if(nrows == 1) {
 char *resource_id_str = PQgetvalue(result, 0, 0);
 char *parent_id_str = PQgetvalue(result, 0, 1);
 char *iscol = PQgetvalue(result, 0, 3);
+char *lastmodified = PQgetvalue(result, 0, 4);
+char *creationdate = PQgetvalue(result, 0, 5);
+char *contentlength = PQgetvalue(result, 0, 6);
 if(resource_id_str && parent_id_str) {
 if(util_strtoint(resource_id_str, resource_id)) {
 ret = 0; // success
 }
 // optionally get parent_id
 util_strtoint(parent_id_str, parent_id);
 }
-if(iscol) {
+if(iscollection && iscol) {
 *iscollection = iscol[0] == 't' ? TRUE : FALSE;
+}
+if(s) {
+memset(s, 0, sizeof(struct stat));
+s->st_ino = *resource_id;
+if(iscol) {
+s->st_mode |= 0x4000;
+}
+if(lastmodified) {
+// TODO
+}
+if(creationdate) {
+// TODO
+}
+if(contentlength) {
+int64_t len;
+if(util_strtoint(contentlength, &len)) {
+s->st_size = len;
+}
+}
 }
 } else {
 ctx->vfs_errno = ENOENT;
 }
 const char *resname;
 int64_t resource_id, parent_id;
 resource_id = -1;
 parent_id = -1;
 WSBool iscollection;
-if(pg_resolve_path(ctx, path, &parent_id, &resource_id, &resname, &iscollection)) {
+struct stat s;
+if(pg_resolve_path(ctx, path, &parent_id, &resource_id, &resname, &iscollection, &s)) {
 return NULL;
 }
 VFSFile *file = pool_malloc(ctx->pool, sizeof(VFSFile));
 if(!file) {
 }
 pgfile->iscollection = iscollection;
 pgfile->resource_id = resource_id;
 pgfile->parent_id = parent_id;
+pgfile->s = s;
 file->ctx = ctx;
-file->io = iscollection ? NULL : &pg_vfs_io_class;
+file->io = iscollection ? &pg_vfs_io_class : &pg_vfs_io_class;
 file->fd = -1;
 file->data = pgfile;
 return file;
 }
 int pg_vfs_stat(VFSContext *ctx, const char *path, struct stat *buf) {
+int64_t parent_id, resource_id;
+const char *resname;
+WSBool iscollection;
+return pg_resolve_path(ctx, path, &parent_id, &resource_id, &resname, &iscollection, buf);
 }
 int pg_vfs_fstat(VFSContext *ctx, SYS_FILE fd, struct stat *buf) {
+PgFile *pgfile = fd->data;
+memcpy(buf, &pgfile->s, sizeof(struct stat));
+return 0;
 }
 VFS_DIR pg_vfs_opendir(VFSContext *ctx, const char *path) {
 VFSFile *file = pg_vfs_open(ctx, path, O_RDONLY);
 if(!file) return NULL;
 PGresult *result = PQexecParams(
 pgvfs->connection,
 sql_get_children,
 1,                                  // number of parameters
 NULL,
-&param,  // param: parent resource_id
+&param,                             // param: parent resource_id
 NULL,
 NULL,
 0);                                 // 0: result in text format
 if(!result) return 1;

Mercurial > hg > webserver / file comparison

comparison: src/server/plugins/postgresql/vfs.c

src/server/plugins/postgresql/vfs.c