X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=parse-xml.c;h=70a7a89928617c8a854253f55d39586a6cf8ed16;hb=d756f0a8abc31ab634f9aff532021e3eb88374ab;hp=0c00abd908a57678cfae6f47db31b45df5cd1f66;hpb=adc35059e3ae7e8968bc6c7a835abc412920e9b5;p=pspp

diff --git a/parse-xml.c b/parse-xml.c
index 0c00abd908..70a7a89928 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -36,26 +36,15 @@ print_containment (xmlNode *node)
     {
       if (node->type == XML_ELEMENT_NODE)
         {
-          const char *child_names[5000];
-          int child_name_cnt[5000];
+          const char *child_names[512];
+          int child_name_cnt[512];
           int n_names = 0;
           for (xmlNode *child = node->children; child; child = child->next)
             {
               const char *name;
 
               if (child->type == XML_ELEMENT_NODE)
-                {
-                  name = (char *) child->name;
-                  if (!strcmp((char *) node->name, "derivedVariable")
-                      && !strcmp((char *) name, "extension"))
-                    {
-                      char *p;
-                      asprintf(&p, "%s/%s", 
-                               (char *) xmlGetProp (child, (xmlChar *) "from"),
-                               (char *) xmlGetProp (child, (xmlChar *) "helpId"));
-                      name = p;
-                    }
-                }
+                name = (char *) child->name;
               else if (child->type == XML_TEXT_NODE)
                 name = "<text>";
               else if (child->type == XML_CDATA_SECTION_NODE)
@@ -69,19 +58,17 @@ print_containment (xmlNode *node)
               else
                 name = "<other>";
 
-#if 0
               for (int i = 0; i < n_names; i++)
                 if (!strcmp(name, child_names[i]))
                   {
                     child_name_cnt[i]++;
                     goto next;
                   }
-#endif
               child_names[n_names] = name;
               child_name_cnt[n_names] = 1;
               n_names++;
 
-              //next:;
+            next:;
             }
 
           printf ("%s", node->name);
@@ -117,14 +104,6 @@ print_labels (xmlNode *node)
     }
 }
 
-static int
-compare_strings(const void *a_, const void *b_)
-{
-  const void *const *ap = a_;
-  const void *const *bp = b_;
-  return strcmp (*ap, *bp);
-}
-
 static void
 print_attributes (xmlNode * a_node)
 {
@@ -132,19 +111,9 @@ print_attributes (xmlNode * a_node)
     {
       if (node->type == XML_ELEMENT_NODE)
         {
-          printf ("%s<-%s", node->name, node->parent->name);
-
-          char *attrs[500];
-          int n_attrs = 0;
+          printf ("%s", node->name);
           for (xmlAttr *attr = node->properties; attr; attr = attr->next)
-            if (!strcmp((char *) attr->name, "baseFormat"))
-              printf(" baseFormat=%s", attr->children->content);
-            else
-              attrs[n_attrs++] = (char *) attr->name;
-          qsort(attrs, n_attrs, sizeof *attrs, compare_strings);
-
-          for (int i = 0; i < n_attrs; i++)
-            printf (" %s", attrs[i]);
+            printf (" %s", attr->name);
           putchar ('\n');
         }
 
@@ -190,21 +159,44 @@ print_attribute (xmlNode *node, const char *attr)
     }
 }
 
+static void
+print_xml (xmlDoc *doc, xmlNode *node)
+{
+  xmlBuffer *buf = xmlBufferCreate();
+  xmlNodeDump (buf, doc, node, 0, 1);
+  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);
     }
 }
 
@@ -290,6 +282,8 @@ main (int argc, char **argv)
     print_element (doc, root, argv[2] + 8);
   else if (!strncmp(argv[2], "attr:", 5))
     print_attribute (root, argv[2] + 5);
+  else if (!strncmp(argv[2], "id:", 3))
+    print_id (doc, root, argv[2] + 3);
   else if (!strcmp(argv[2], "labels"))
     print_labels (root);
   else