From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 29 Aug 2007 14:49:12 +0000 (+0000)
Subject: some more dbs fixes ported to rel_1_2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=933f2ce71cb22e0b7d88f72ff4b546c656fb20cb;p=Evergreen.git

some more dbs fixes ported to rel_1_2

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@7732 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/external/dtd2js.pl b/Open-ILS/xul/staff_client/external/dtd2js.pl
index 8f98925661..d7ee4e477b 100755
--- a/Open-ILS/xul/staff_client/external/dtd2js.pl
+++ b/Open-ILS/xul/staff_client/external/dtd2js.pl
@@ -5,11 +5,12 @@
 #<!ENTITY common.series "Series">
 #<!ENTITY common.keyword "Keyword">
 #<!ENTITY common.type "Type">
+#<!ENTITY tricksy.entity 'Some text with "quoted" content'>
 
 print "var entities = {};";
 while( $line = <> ) {
 
-	if ($line =~ /<!ENTITY\s+(\S+)\s+(["'].*["'])\s*>/) {
+	if ($line =~ /<!ENTITY\s+(\S+)\s+((["']).*\3)\s*>\s*$/) {
 		print "entities['$1'] = $2;\n";	
 	} else {
 		chomp $line;
diff --git a/Open-ILS/xul/staff_client/external/dtd2js.sh b/Open-ILS/xul/staff_client/external/dtd2js.sh
index 29459891fe..12d8a5c4f0 100755
--- a/Open-ILS/xul/staff_client/external/dtd2js.sh
+++ b/Open-ILS/xul/staff_client/external/dtd2js.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-./dtd2js.pl ~/ILS/Open-ILS/web/opac/locale/en-US/lang.dtd > ../chrome/content/main/lang.js
+./dtd2js.pl ../../../web/opac/locale/en-US/lang.dtd > ../chrome/content/main/lang.js