From: Ben Pfaff <blp@cs.stanford.edu> Date: Mon, 22 Feb 2016 01:49:48 +0000 (-0800) Subject: Revert "work on figuring more stuff out--may want to revert this commit" X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f926879f4be2b8eca78860e22f00d1001b91c175;p=pspp Revert "work on figuring more stuff out--may want to revert this commit" This reverts commit adc35059e3ae7e8968bc6c7a835abc412920e9b5. --- diff --git a/dump.c b/dump.c index c57057f025..a52cafddf0 100644 --- a/dump.c +++ b/dump.c @@ -823,7 +823,7 @@ dump_title(void) dump_value(stdout, 0); /* Custom footnote marker string. */ if (match_byte (0x31)) - dump_value(stderr, 0); + dump_value(stdout, 0); else match_byte_assert (0x58); get_u32 (); diff --git a/dump2.c b/dump2.c index 740cbbedaa..15670ecf4b 100644 --- a/dump2.c +++ b/dump2.c @@ -217,8 +217,7 @@ dump_source(int end, int count, int n_series, const char *name) int n_sysmis = 0; for (int i = 0; i < n_series; i++) { - printf (" series %d: \"%s\", %d values:\n ", - i, get_fixed_string(288), count); + printf (" series %d: \"%s\"\n ", i, get_fixed_string(288)); for (int i = 0; i < count; i++) { double d = get_double(); diff --git a/parse-all-heavy b/parse-all-heavy index 20370b1fea..757e46d200 100755 --- a/parse-all-heavy +++ b/parse-all-heavy @@ -1,9 +1,10 @@ #! /bin/sh -heavy=`ls -1 unzipped*/*/*.bin | grep -v light` +heavy=`ls -1 unzipped/*/*.bin | grep -v light` for d in $heavy; do - echo $d - ./dump2 < $d - echo - echo + if ! ./dump2 < $d > /dev/null 2>&1; then + echo $d + ./dump2 < $d + echo + fi done diff --git a/parse-detail-xml b/parse-detail-xml index 6d7858835e..f0b175e7ab 100755 --- a/parse-detail-xml +++ b/parse-detail-xml @@ -2,10 +2,8 @@ # Parse the detail XML members. legacyXML=`ls -1 unzipped/*/*.xml |grep -vE 'outputViewer|stats|chart|model'` -for d in $legacyXML; do echo $d; done | wc -#grep -h -o '<style id="visualizationStyle"[^>]*>' $legacyXML if test -n "$1"; then for d in $legacyXML; do ./parse-xml $d $1 - done + done | sort | uniq fi diff --git a/parse-xml.c b/parse-xml.c index 0c00abd908..3a32ee36e2 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'); }