more progress

[pspp] / parse-all-xml

diff --git a/parse-all-xml b/parse-all-xml
index c4146fc0194b17b7c82cb3c038f104e068d6d686..09ec646bef8f95bb57418be32bfe4742f7e9c8d4 100755 (executable)
--- a/parse-all-xml
+++ b/parse-all-xml
@@ -1,14 +1,9 @@
 #! /bin/sh
 
-# Parse the structure members that do not represent models or graphs
-# and that are not page setups (which are always the first structure member).
-# Also skip those with borderProperties, which indicate the non-"light"
-# format.
-lightTables=`ls -1 unzipped/*/*.xml |grep -vE 'notes|table|warning|chart|model' \
-          | xargs grep -EL '<([a-z]*:)?(model|graph)'`
-
+# Parse the structure members.
+structure_members=`find unzipped* -name 'outputViewer*.xml'`
 if test -n "$1"; then
-    for d in $lightTables; do
-       ./parse-xml $d $1
-    done | sort | uniq -c | sort -rn
+    for d in $structure_members; do
+       ./parse-xml $d "$@"
+    done | sort | uniq -c
 fi