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 8f98925..d7ee4e4 100755 (executable)
--- 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 2945989..12d8a5c 100755 (executable)
--- 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