[Refdb-cvs] CVS: refdb/scripts refdbnd.in,1.7,1.8

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14670/scripts

Modified Files:
	refdbnd.in 
Log Message:
check for existence of document before attempting to extract values

Index: refdbnd.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbnd.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -U2 -r1.7 -r1.8
--- refdbnd.in	30 Dec 2003 23:58:15 -0000	1.7
+++ refdbnd.in	8 Feb 2004 00:36:39 -0000	1.8
@@ -35,30 +35,32 @@
 
 check_existing_doc() {
-# guess values from existing file
-    xfile=$basename
-
-    if grep "^<!DOCTYPE.*DTD DocBook V3.1//EN" $basename; then
-	doctype="db31"
-	pubtype=`grep "DTD DocBook V3.1//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
-    else 
-	if grep "^<!DOCTYPE.*DTD DocBook V4.0//EN" $basename; then
-	    doctype="db40"
-	    pubtype=`grep "DTD DocBook V4.0//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
-	else
-	    if grep "^<!DOCTYPE.*DTD DocBook V4.1//EN" $basename; then
-		doctype="db41"
-		pubtype=`grep "DTD DocBook V4.1//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+    if [ -e $basename ]; then
+        # guess values from existing file
+	xfile=$basename
+
+	if grep "^<!DOCTYPE.*DTD DocBook V3.1//EN" $basename; then
+	    doctype="db31"
+	    pubtype=`grep "DTD DocBook V3.1//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+	else 
+	    if grep "^<!DOCTYPE.*DTD DocBook V4.0//EN" $basename; then
+		doctype="db40"
+		pubtype=`grep "DTD DocBook V4.0//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
 	    else
-		if grep "^<!DOCTYPE.*DTD DocBook XML V4.1.2//EN" $basename; then
-		    doctype="db41x"
-		    pubtype=`grep "DTD DocBook XML V4.1.2//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+		if grep "^<!DOCTYPE.*DTD DocBook V4.1//EN" $basename; then
+		    doctype="db41"
+		    pubtype=`grep "DTD DocBook V4.1//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
 		else
-		    if grep "^<!DOCTYPE.*DTD DocBook XML V4.2//EN" $basename; then
-			doctype="db42x"
-			pubtype=`grep "DTD DocBook XML V4.2//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+		    if grep "^<!DOCTYPE.*DTD DocBook XML V4.1.2//EN" $basename; then
+			doctype="db41x"
+			pubtype=`grep "DTD DocBook XML V4.1.2//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
 		    else
-			if grep "^<!DOCTYPE.*TEI P4//DTD Main DTD Driver File//EN" $basename; then
-			    doctype="teix"
-			    pubtype=`grep "TEI P4//DTD Main DTD Driver File//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+			if grep "^<!DOCTYPE.*DTD DocBook XML V4.2//EN" $basename; then
+			    doctype="db42x"
+			    pubtype=`grep "DTD DocBook XML V4.2//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+			else
+			    if grep "^<!DOCTYPE.*TEI P4//DTD Main DTD Driver File//EN" $basename; then
+				doctype="teix"
+				pubtype=`grep "TEI P4//DTD Main DTD Driver File//EN" $basename | sed 's/^<!DOCTYPE \(.*\) PUBLIC.*/\1/'`
+			    fi
 			fi
 		    fi
@@ -66,6 +68,6 @@
 	    fi
 	fi
+	basename=${xfile%%.*}
     fi
-    basename=${xfile%%.*}
 }
 
@@ -91,7 +93,6 @@
     read basename
 
-    if [ ! "$basename" = "db31" ] && [ ! "$basename" = "db40" ] && [ ! "$basename" = "db41" ]  && [ ! "$basename" = "db41x" ]  && [ ! "$basename" = "db42x" ]  && [ ! "$basename" = "teix" ]; then
-	check_existing_doc
-    fi
+
+    check_existing_doc
 
     if [ -z $doctype ]; then
@@ -148,10 +149,7 @@
     # all arguments were specified on the command line
     basename=$1
-    if [ ! "$basename" = "db31" ] && [ ! "$basename" = "db40" ] && [ ! "$basename" = "db41" ]  && [ ! "$basename" = "db41x" ]  && [ ! "$basename" = "db42x" ]  && [ ! "$basename" = "teix" ]; then
-	check_existing_doc
-    else
-	doctype=$2
-	pubtype=$3
-    fi
+    doctype=$2
+    pubtype=$3
+    check_existing_doc
     database=$4
     style=$5