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

-:e03737cea6e2
+:8787cb5ebab3
 // propfind with depth = 0
 // params: $1: resource_id
 static const char *sql_propfind_allprop_depth0 = "\
 select\n\
-NULL as ppath,\n\
+$2::text as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 // propfind with depth = 0 for specific properties
 // params: $1: resource_id
 static const char *sql_propfind_depth0 = "\
 select\n\
-NULL as ppath,\n\
+$2::text as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 p.xmlns,\n\
 p.pname,\n\
 p.pvalue\n\
 from Resource r\n\
 left join Property p on r.resource_id = p.resource_id\n\
-inner join (select unnest($2::text[]) as xmlns, unnest($3::text[]) as pname) n\n\
+inner join (select unnest($3::text[]) as xmlns, unnest($4::text[]) as pname) n\n\
 on ( p.xmlns = n.xmlns and p.pname = n.pname ) or p.property_id is null\n\
 where r.resource_id = $1;";
 // propfind with depth = 1
 // params: $1: resource_id
 static const char *sql_propfind_allprop_depth1 = "\
 select\n\
-NULL ass ppath,\n\
+case when r.resource_id = $1 then $2\n\
+else $2 || '/' || r.nodename\n\
+end as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 // propfind with depth = 1 for specific properties
 // params: $1: resource_id
 static const char *sql_propfind_depth1 = "\
 select\n\
-NULL as ppath,\n\
+case when r.resource_id = $1 then $2\n\
+else $2 || '/' || r.nodename\n\
+end as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 p.xmlns,\n\
 p.pname,\n\
 p.pvalue\n\
 from Resource r\n\
 left join Property p on r.resource_id = p.resource_id\n\
-inner join (select unnest($2::text[]) as xmlns, unnest($3::text[]) as pname) n\n\
+inner join (select unnest($3::text[]) as xmlns, unnest($4::text[]) as pname) n\n\
 on ( p.xmlns = n.xmlns and p.pname = n.pname ) or p.property_id is null\n\
 where r.resource_id = $1 or r.parent_id = $1\n\
 order by order by case when resource_id = $1 then 0 else 1 end, nodename, resource_id;";
 // recursive propfind
 r.*\n\
 from Resource r\n\
 inner join resolvepath p on r.parent_id = p.resource_id\n\
 )\n\
 select\n\
-r.ppath,\n\
+case when r.resource_id = $1 then $2\n\
+else $2 || r.ppath\n\
+end as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 r.*\n\
 from Resource r\n\
 inner join resolvepath p on r.parent_id = p.resource_id\n\
 )\n\
 select\n\
-r.ppath,\n\
+case when r.resource_id = $1 then $2\n\
+else $2 || '/' || r.ppath\n\
+end as ppath,\n\
 r.resource_id,\n\
 r.parent_id,\n\
 r.nodename,\n\
 r.iscollection,\n\
 r.lastmodified,\n\
 int pg_dav_propfind_init(
 WebdavPropfindRequest *rq,
 const char *path,
+const char *href,
 WebdavPList **outplist)
 {
 PgWebdavBackend *pgdav = rq->dav->instance;
 // check if the resource exists
 // get all resources and properties
 char resource_id_str[32];
 snprintf(resource_id_str, 32, "%" PRId64, resource_id);
-const char* params[1] = { resource_id_str };
+size_t href_len = strlen(href);
+char *href_param = pool_malloc(rq->sn->pool, href_len + 1);
+memcpy(href_param, href, href_len);
+if(href_param[href_len-1] == '/') {
+href_len--;
+}
+href_param[href_len] = '\0';
+const char* params[2] = { resource_id_str, href_param };
 PGresult *result = PQexecParams(
 pgdav->connection,
 sql_propfind_allprop_recursive,
-1,     // number of parameters
+2,     // number of parameters
 NULL,
 params, // parameter value
 NULL,
 NULL,
 0);    // 0: result in text format
 int nrows = PQntuples(result);
+pool_free(rq->sn->pool, href_param);
 if(nrows < 1) {
 PQclear(result);
 return 1;
 }
 //  9: property name
 // 10: property value
 char *path = PQgetvalue(result, r, 0);
 char *res_id = PQgetvalue(result, r, 1);
+char *iscollection_str = PQgetvalue(result, r, 4);
+WSBool iscollection = iscollection_str && iscollection_str[0] == 't';
 int64_t resource_id;
 if(!util_strtoint(res_id, &resource_id)) {
 log_ereport(LOG_FAILURE, "pg_dav_propfind_do: cannot convert resource_id '%s' to int", res_id);
 return 1;
 }
 char *nodename = PQgetvalue(result, r, 3);
 if(resource_id != current_resource_id) {
+// create a href string for the new resource
+// if the resource is a collection, it should have a trailing '/'
+size_t pathlen = strlen(path);
+if(pathlen == 0) {
+log_ereport(LOG_FAILURE, "pg_dav_propfind_do: query returned invalid path");
+return 1;
+}
+char *newres_href = pool_malloc(pool, pathlen+2);
+memcpy(newres_href, path, pathlen);
+if(iscollection && path[pathlen-1] != '/') {
+newres_href[pathlen++] = '/';
+}
+newres_href[pathlen] = '\0';
 // new resource
-resource = response->addresource(response, nodename);
+resource = response->addresource(response, newres_href);
 vfsprops_set = FALSE;
 current_resource_id = resource_id;
 }
 // standard webdav properties
 if(!vfsprops_set) {
 if(vfsprops.getresourcetype) {
-char *iscollection = PQgetvalue(result, r, 4);
+if(iscollection) {
-if(iscollection && iscollection[0] == 't') {
 resource->addproperty(resource, webdav_resourcetype_collection(), 200);
 } else {
 resource->addproperty(resource, webdav_resourcetype_empty(), 200);
 }
 }
 property->lang = NULL;
 property->name = pool_strdup(pool, pname);
 xmlNs *namespace = pool_malloc(pool, sizeof(xmlNs));
 memset(namespace, 0, sizeof(struct _xmlNs));
-namespace->href = pool_strdup(pool, xmlns);
+namespace->href = (xmlChar*)pool_strdup(pool, xmlns);
-namespace->prefix = "zx1";
+namespace->prefix = (xmlChar*)"zx1"; // TODO
 property->namespace = namespace;
 property->vtype = WS_VALUE_TEXT;
 property->value.text.str = pool_strdup(pool, pvalue);
 property->value.text.length = strlen(pvalue);

Mercurial > hg > webserver / file comparison

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

src/server/plugins/postgresql/webdav.c