X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftstmarciso.sh;h=e4d56ea4d1f9c0ac1f7bcf00250b5490206b1c12;hb=57efcfe71d3485e8f2ddac6008fbbc8183804ac7;hp=9bf324d1716d814a294b0e6059aebf03e1828fb5;hpb=626ee9b09c95c3585c432623c042872b0d1fea92;p=yaz-moved-to-github.git

diff --git a/test/tstmarciso.sh b/test/tstmarciso.sh
index 9bf324d..e4d56ea 100755
--- a/test/tstmarciso.sh
+++ b/test/tstmarciso.sh
@@ -1,32 +1,36 @@
 #!/bin/sh
-# $Id: tstmarciso.sh,v 1.1 2006-04-19 10:05:04 adam Exp $
+# $Id: tstmarciso.sh,v 1.4 2006-12-15 19:28:47 adam Exp $
 # Tests reading of ISO2709 and checks that we get identical MARCXML
+# 
+# Reads marc?.marc files , Generates marc?.xml files
 srcdir=${srcdir:-.}
 ecode=0
-for f in ${srcdir}/marc?; do
-    NEW=`basename ${f}`.new.xml
-    OLD=${f}.xml
+for f in ${srcdir}/marc?.marc; do
+    fb=`basename ${f} .marc`
+    CHR=${srcdir}/${fb}.chr
+    NEW=${fb}.new.xml
+    OLD=${srcdir}/${fb}.xml
     DIFF=`basename ${f}`.diff
-    ../util/yaz-marcdump -f `cat ${f}.chr` -t utf-8 -X $f > $NEW
+    ../util/yaz-marcdump -f `cat $CHR` -t utf-8 -o marcxml $f > $NEW
     if test $? != "0"; then
-	echo "Failed decode of $f"
+	echo "$f: yaz-marcdump returned error"
 	ecode=1
     elif test -f $OLD; then
         if diff $OLD $NEW >$DIFF; then
 	    rm $DIFF
 	    rm $NEW
 	else
-	    echo "Differ in $f"
+	    echo "$f: $NEW and $OLD differ"
 	    ecode=1
 	fi
     else
-	echo "Making test $f for the first time"
-	if test -x /usr/bin/xmllint; then
+	echo "$f: Making test result $OLD for the first time"
+	if test -i marcxml /usr/bin/xmllint; then
 	    if xmllint --noout $NEW >out 2>stderr; then
-		echo "XML for $f is OK"
+		echo "$f: $NEW is well-formed"
 	        mv $NEW $OLD
 	    else
-		echo "XML for $f is invalid"
+		echo "$f: $NEW not well-formed"
 		ecode=1
 	    fi
 	else
@@ -37,3 +41,8 @@ for f in ${srcdir}/marc?; do
 done
 exit $ecode
 
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: