X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=parse-xml.c;h=15c4ba2e9bc1c21cb4eb4935304d8c894add1581;hb=refs%2Fheads%2Fspv;hp=3a32ee36e2731b317fe6a083b77b4d0f23373e80;hpb=2fd5ae863380ca80272555ae606ac814dfd2e403;p=pspp

diff --git a/parse-xml.c b/parse-xml.c
index 3a32ee36e2..15c4ba2e9b 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -113,7 +113,11 @@ print_attributes (xmlNode * a_node)
         {
           printf ("%s", node->name);
           for (xmlAttr *attr = node->properties; attr; attr = attr->next)
-            printf (" %s", attr->name);
+            {
+              printf (" %s", attr->name);
+              if (!strcmp ((char *) attr->name, "baseFormat"))
+                printf ("=%s", (char *) xmlGetProp (node, attr->name));
+            }
           putchar ('\n');
         }
 
@@ -159,33 +163,56 @@ print_attribute (xmlNode *node, const char *attr)
     }
 }
 
+static void
+print_xml (xmlDoc *doc, xmlNode *node)
+{
+  xmlBuffer *buf = xmlBufferCreate();
+  xmlNodeDump (buf, doc, node, 0, 0);
+  xmlBufferDump (stdout, buf);
+  xmlBufferFree (buf);
+  putchar ('\n');
+}
+
 static void
 print_element (xmlDoc *doc, xmlNode *node, const char *element)
 {
   for (; node; node = node->next)
     {
-      if (!strcmp(element, (char *) node->name))
+      if (node->name && !strcmp(element, (char *) node->name))
+        print_xml (doc, node);
+
+      print_element (doc, node->children, element);
+    }
+}
+
+static void
+print_id (xmlDoc *doc, xmlNode *node, const char *id)
+{
+  for (; node; node = node->next)
+    {
+      if (node->type == XML_ELEMENT_NODE)
         {
-          xmlBuffer *buf = xmlBufferCreate();
-          xmlNodeDump (buf, doc, node, 0, 1);
-          xmlBufferDump (stdout, buf);
-          xmlBufferFree (buf);
-          putchar ('\n');
+          const char *node_id = (char *) xmlGetProp (node, (xmlChar *) "id");
+          if (node_id && !strcmp (node_id, id))
+            {
+              print_xml (doc, node);
+              break;
+            }
         }
 
-      print_element (doc, node->children, element);
+      print_id (doc, node->children, id);
     }
 }
 
 static __attribute__((unused)) xmlNode *
-find_page_setup (xmlNode *node)
+find_node (xmlNode *node, const char *name)
 {
   for (; node; node = node->next)
     {
-      if (node->name && !strcmp ((char *) node->name, "pageSetup"))
+      if (node->name && !strcmp ((char *) node->name, name))
         return node;
 
-      xmlNode *ps = find_page_setup (node->children);
+      xmlNode *ps = find_node (node->children, name);
       if (ps)
         return ps;
     }
@@ -213,6 +240,21 @@ print_text (xmlNode *node)
     }
 }
 
+static void
+check_version (xmlNode *root, const char *version)
+{
+  const char *s = (char *) xmlGetProp (root, (xmlChar *) "version");
+  if (!s)
+    {
+      fprintf (stderr, "missing version\n");
+      exit (1);
+    }
+  else if (strcmp(version, s))
+    {
+      exit (0);
+    }
+}
+
 static void
 usage (void)
 {
@@ -223,7 +265,7 @@ usage (void)
 int
 main (int argc, char **argv)
 {
-  if (argc != 3)
+  if (argc < 3)
     usage ();
 
   LIBXML_TEST_VERSION;
@@ -237,32 +279,44 @@ main (int argc, char **argv)
 
   xmlNode *root = xmlDocGetRootElement(doc);
 
-#if 0
-  /* Limit what we look at to pageSetup node and below. */
-  root = find_page_setup(root);
-  if (!root)
-    return 0;
-  root->next = NULL;
-#endif
-
-  if (!strcmp(argv[2], "parents"))
-    print_parents (root);
-  else if (!strcmp(argv[2], "containment"))
-    print_containment (root);
-  else if (!strcmp(argv[2], "attributes"))
-    print_attributes (root);
-  else if (!strcmp(argv[2], "cdata"))
-    print_cdata (root);
-  else if (!strcmp(argv[2], "text"))
-    print_text (root);
-  else if (!strncmp(argv[2], "element:", 8))
-    print_element (doc, root, argv[2] + 8);
-  else if (!strncmp(argv[2], "attr:", 5))
-    print_attribute (root, argv[2] + 5);
-  else if (!strcmp(argv[2], "labels"))
-    print_labels (root);
-  else
-    usage ();
+  for (int i = 2; i < argc; i++)
+    {
+      if (!strcmp(argv[i], "parents"))
+        print_parents (root);
+      else if (!strcmp(argv[i], "containment"))
+        print_containment (root);
+      else if (!strcmp(argv[i], "attributes"))
+        print_attributes (root);
+      else if (!strcmp(argv[i], "cdata"))
+        print_cdata (root);
+      else if (!strcmp(argv[i], "text"))
+        print_text (root);
+      else if (!strncmp(argv[i], "element:", 8))
+        print_element (doc, root, argv[i] + 8);
+      else if (!strncmp(argv[i], "attr:", 5))
+        print_attribute (root, argv[i] + 5);
+      else if (!strncmp(argv[i], "id:", 3))
+        print_id (doc, root, argv[i] + 3);
+      else if (!strncmp(argv[i], "root:", 5))
+        {
+          /* Limit content to descendants of the given node. */
+          root = find_node (root, argv[i] + 5);
+          if (!root)
+            return 0;
+          root->next = NULL;
+        }
+      else if (!strncmp(argv[i], "musthave:", 9))
+        {
+          if (!find_node (root, argv[i] + 9))
+            return 0;
+        }
+      else if (!strcmp(argv[i], "labels"))
+        print_labels (root);
+      else if (!strncmp(argv[i], "version=", 8))
+        check_version (root, argv[i] + 8);
+      else
+        usage ();
+    }
 
   xmlFreeDoc(doc);
   xmlCleanupParser();