dav: comparison dav/main.c

-:d7bda914d120
+:c7f3fe4abdb2
 "put [-pcRA] [-k <key>] [-L <lock>] <url> <file>",
 "mkdir [-pc] [-k <key>] [-L <lock>] <url>",
 "remove [-pc] [-L <lock>] <url>",
 "copy [-pcO] [-L <lock>] <url> <url>",
 "move [-pcO] [-L <lock>] <url> <url>",
-"get-property [-pc] [-n <uri>] <url> <property>",
+"get-property [-pcx] [-n <uri>] <url> <property>",
-"set-property [-pc] [-L <lock>] [-n <uri>] <url> <property> [value]",
+"set-property [-pcx] [-L <lock>] [-n <uri>] <url> <property> [value]",
 "remove-property [-pc] [-n <uri>] <url> <property>",
 "lock [-pc] [-T timeout] <url>",
 "unlock [-pc] [-L <lock>] <url>",
 "info [-pc] <url>",
 "date [url]",
 fprintf(stderr, "        -O         override resources\n");
 fprintf(stderr, "        -A         tar import/export\n");
 fprintf(stderr, "        -L <lock>  specificy lock token\n");
 fprintf(stderr, "        -T <sec>   timeout in seconds\n");
 fprintf(stderr, "        -n <uri>   specify namespace uri\n");
+fprintf(stderr, "        -x         xml property content\n");
 fprintf(stderr, "        -N         disable authentication prompt (all commands)\n");
 fprintf(stderr, "        -i         disable cert verification (all commands)\n");
 fprintf(stderr, "        -v         verbose output (all commands)\n");
 fprintf(stderr, "\n");
 fprintf(stderr, "Config commands:\n");
 print_resource_error(sn, res->path);
 return -1;
 }
 break;
 }
+free(path);
-// TODO: show xml
-//DavXmlNode *x = dav_get_property_ns(res, propname.ns, propname.name);
+DavXmlNode *x = dav_get_property_ns(res, propname.ns, propname.name);
-char *value = dav_get_string_property_ns(res, propname.ns, propname.name);
+if(!x) {
-if(!value) {
 fprintf(stderr, "Error: no property value.\n");
 return -1;
 }
-int ret = 0;
+if(cmd_getoption(a, "xml")) {
-if(value) {
+// print a real xml document on stdout
-printf("%s\n", value);
+printxmldoc(stdout, propname.name, propname.ns, x);
 } else {
-// TODO: correct error message
+// in this mode a simple string is printed on stdout
-fprintf(stderr, "Error: property not found.\n");
+// or simplified and nicely formatted xml is printed on stderr
-ret = -1;
+if(dav_xml_isstring(x)) {
-}
+printf("%s\n", dav_xml_getstring(x));
+} else {
-free(path);
+char *str = xml2str(x);
-return ret;
+fprintf(stderr, "%s", str);
+free(str);
+}
+}
+return 0;
 }
 int cmd_set_property(CmdArgs *a) {
 if(a->argc < 2) {
 fprintf(stderr, "Too few arguments\n");
 DavPropName p = properties[i];
 if(!last_ns || strcmp(last_ns, p.ns)) {
 printf("\nnamespace: %s\n", p.ns);
 last_ns = p.ns;
 }
-sstr_t value = sstr(dav_get_string_property_ns(res, p.ns, p.name));
+DavXmlNode *xval = dav_get_property_ns(res, p.ns, p.name);
-value = sstrtrim(value);
+if(dav_xml_isstring(xval)) {
-printf("  %s: %.*s\n", p.name, (int)value.length, value.ptr);
+sstr_t value = sstr(dav_xml_getstring(xval));
+printf("  %s: %.*s\n", p.name, (int)value.length, value.ptr);
+} else {
+printf("  %s: $xml\n", p.name);
+}
 }
 dav_session_free(sn, properties);
 return 0;
 } else {
 free(buf);
 return str;
 }
 }
+static void xml2str_i(DavXmlNode *node, UcxBuffer *buf, int indent) {
+while(node) {
+if(node->type == DAV_XML_ELEMENT) {
+if(node->children) {
+if(dav_xml_isstring(node->children)) {
+sstr_t s = sstrtrim(sstr(dav_xml_getstring(node->children)));
+ucx_bprintf(
+buf,
+"%*s<%s>%.*s</%s>\n",
+indent,
+"",
+node->name,
+(int)s.length,
+s.ptr,
+node->name);
+} else {
+ucx_bprintf(buf, "%*s<%s>\n", indent, "", node->name);
+xml2str_i(node->children, buf, indent+2);
+ucx_bprintf(buf, "%*s</%s>\n", indent, "", node->name);
+}
+} else {
+ucx_bprintf(buf, "%*s<%s />", indent, "", node->name);
+ucx_buffer_putc(buf, '\n');
+}
+} else if(node->type == DAV_XML_TEXT) {
+sstr_t val = sstrtrim(sstrn(node->content, node->contentlength));
+if(val.length > 0) {
+ucx_bprintf(buf, "%*.*s", indent, (int)val.length, val.ptr);
+}
+}
+node = node->next;
+}
+}
+char* xml2str(DavXmlNode *node) {
+char *str = malloc(256);
+UcxBuffer *buf = ucx_buffer_new(str, 256, UCX_BUFFER_AUTOEXTEND);
+xml2str_i(node, buf, 0);
+char *space = buf->space;
+ucx_buffer_free(buf);
+return space;
+}
+static void printnode(FILE *out, UcxMap *nsmap, DavXmlNode *node) {
+while(node) {
+if(node->type == DAV_XML_ELEMENT) {
+char *prefix = ucx_map_cstr_get(nsmap, node->namespace);
+char *freethis = NULL;
+char *tagend = node->children ? ">" : " />";
+if(!prefix) {
+sstr_t newpre = ucx_sprintf("x%d", (int)nsmap->count);
+ucx_map_cstr_put(nsmap, node->namespace, newpre.ptr);
+freethis = newpre.ptr;
+prefix = newpre.ptr;
+fprintf(
+out,
+"<%s:%s xmlns:%s=\"%s\"%s",
+prefix,
+node->name,
+prefix,
+node->namespace,
+tagend);
+} else {
+fprintf(out, "<%s:%s%s", prefix, node->name, tagend);
+}
+if(node->children) {
+printnode(out, nsmap, node->children);
+fprintf(out, "</%s:%s>", prefix, node->name);
+}
+if(freethis) {
+free(freethis);
+}
+} else if(node->type == DAV_XML_TEXT) {
+fwrite(node->content, 1, node->contentlength, out);
+}
+node = node->next;
+}
+}
+void printxmldoc(FILE *out, char *root, char *rootns, DavXmlNode *content) {
+UcxMap *nsmap = ucx_map_new(16);
+ucx_map_cstr_put(nsmap, rootns, "x0");
+fprintf(out, "%s", "<?xml version=\"1.0\"?>\n");
+fprintf(out, "<x0:%s xmlns:x0=\"%s\">", root, rootns);
+printnode(out, nsmap, content);
+fprintf(out, "</x0:%s>\n", root);
+}
 /* ---------- config commands ---------- */
 int cmd_add_repository(CmdArgs *args) {
 printf("Each repository must have an unique name.\n");

Mercurial > hg > dav / file comparison

comparison: dav/main.c

dav/main.c