From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 5 Mar 2010 15:07:04 +0000 (+0100)
Subject: Updated to handle libxml2 and tmarcxml as well. Adding new check whether the conversi... 
X-Git-Tag: v4.0.3~33^2~30
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=ec6494bdb7c628db3b19c523db32d11a44225f79

Updated to handle libxml2 and tmarcxml as well. Adding new check whether the conversion is reversible
---

diff --git a/test/tstmarc.sh b/test/tstmarc.sh
index ff0b686..2529698 100755
--- a/test/tstmarc.sh
+++ b/test/tstmarc.sh
@@ -2,7 +2,9 @@
 # Tests reading of ISO2709 and checks that we get identical MARCXML
 # 
 # Reads marc?.marc files , Generates marc*.xml files
-# If Libxml2 is present, the marc*.xml files are parsed again..
+# If Libxml2 is present, also turbomarc*xml. 
+# as well as reverse transformation from *marc*.xml files are parsed again.. 
+# 
 srcdir=${srcdir:-.}
 ecode=0
 
@@ -11,65 +13,89 @@ if test $? = "3"; then
     noxml=1
 fi
 
-for f in ${srcdir}/marc[0-9].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 $CHR` -t utf-8 -o marcxml $f > $NEW
-    if test $? != "0"; then
-	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 "$f: $NEW and $OLD differ"
-	    ecode=1
-	fi
-    else
-	echo "$f: Making test result $OLD for the first time"
-	if test -x /usr/bin/xmllint; then
-	    if xmllint --noout $NEW >out 2>stderr; then
-		echo "$f: $NEW is well-formed"
-	        mv $NEW $OLD
-	    else
-		echo "$f: $NEW not well-formed"
-		ecode=1
-	    fi
-	else
-	    echo "xmllint not found. install libxml2-utils"
-	    ecode=1
-	fi
-    fi
+binmarc_convert() {  
+    OUTPUT_FORMAT="$1"
+    REVERT_FORMAT="$2"
+    PREFIX="$3"
+    for f in ${srcdir}/marc[0-9].marc; do
+        fb=`basename ${f} .marc`
+        CHR=`cat ${srcdir}/${fb}.chr`
+        NEW=${PREFIX}${fb}.new.xml
+        OLD=${srcdir}/${PREFIX}${fb}.xml
+        DIFF=`basename ${f}`.diff
+        ../util/yaz-marcdump -f $CHR -t utf-8 -o ${OUTPUT_FORMAT} $f > $NEW
+        if test $? != "0"; then
+       	    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 "$f: $NEW and $OLD differ"
+    		ecode=1
+    	    fi
+        else
+    	    echo "$f: Making test result $OLD for the first time"
+    	    if test -x /usr/bin/xmllint; then
+    		if xmllint --noout $NEW >out 2>stderr; then
+    		    echo "$f: $NEW is well-formed"
+    		    mv $NEW $OLD
+    		else
+     		    echo "$f: $NEW not well-formed"
+    		    ecode=1
+    		fi
+    	    else
+    		echo "xmllint not found. install libxml2-utils"
+    		ecode=1
+    	    fi
+        fi
+	
+        if test -z "$noxml"; then
+	    ORIGINAL=${f}
+    	    f=$OLD
+	    # compare with original (binary) marc record.
+    	    OLD=${f}.marc
+    	    NEW=`basename ${f}`.new.marc
+    	    DIFF=`basename ${f}`.diff
+    	    ../util/yaz-marcdump -f utf-8 -t utf-8 -i ${REVERT_FORMAT} -o marc $f > $NEW
+    	    if test $? != "0"; then
+    		echo "Failed decode of $f"
+    		ecode=1
+    	    elif test -f $OLD; then
+#    		echo "diff $OLD $NEW " 
+		if diff $OLD $NEW >$DIFF; then
+    		    rm $DIFF
+    		    rm $NEW
+    		else
+    		    echo "$f: $NEW and $OLD Differ"
+    		    ecode=1
+    		fi
+    	    else
+    		echo "$f: Making test result $OLD for the first time"
+    		mv $NEW $OLD
+    	    fi
+	    # check with original
+    	    REVERT=`basename ${f}`.marc.revert
+    	    ../util/yaz-marcdump -f utf-8 -t $CHR  -i ${REVERT_FORMAT} -o marc $f > $REVERT
+	    hexdump -cx $REVERT   > $REVERT.hex  
+	    hexdump -cx $ORIGINAL > $ORIGINAL.hex
+	    diff $REVERT.hex $ORIGINAL.hex > $REVERT.diff
+        fi
+    done
+    return $ecode
+}
+
+binmarc_convert "marcxml"  "marcxml" "" 
+echo "binmarc -> marcxml: $?" 
+
+binmarc_convert "xml,marcxml" "marcxml" "xml2" 
+echo "binmarc -> marcxml(libxml2): $?" 
+
+binmarc_convert "xml,tmarcxml"  "tmarcxml" "t" 
+echo "binmarc -> tmarcxml: $?" 
 
-    if test -z "$noxml"; then
-	f=$OLD
-	OLD=${f}.marc
-	NEW=`basename ${f}`.new.marc
-	DIFF=`basename ${f}`.diff
-	../util/yaz-marcdump -f utf-8 -t utf-8 -i marcxml -o marc $f > $NEW
-	if test $? != "0"; then
-	    echo "Failed decode of $f"
-	    ecode=1
-	elif test -f $OLD; then
-	    if diff $OLD $NEW >$DIFF; then
-		rm $DIFF
-		rm $NEW
-	    else
-		echo "$f: $NEW and $OLD Differ"
-		ecode=1
-	    fi
-	else
-	    echo "$f: Making test result $OLD for the first time"
-	    mv $NEW $OLD
-	fi
-    fi
-    
-done
-exit $ecode
+# exit $ecode
 
 # Local Variables:
 # mode:shell-script