[open-ils-commits] r7732 - branches/rel_1_2/Open-ILS/xul/staff_client/external

[svn at svn.open-ils.org]

Author: phasefx
Date: 2007-08-29 10:49:12 -0400 (Wed, 29 Aug 2007)
New Revision: 7732

Modified:
   branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.pl
   branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.sh
Log:
some more dbs fixes ported to rel_1_2

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.pl
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.pl	2007-08-29 14:48:20 UTC (rev 7731)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.pl	2007-08-29 14:49:12 UTC (rev 7732)
@@ -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;

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.sh
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.sh	2007-08-29 14:48:20 UTC (rev 7731)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/external/dtd2js.sh	2007-08-29 14:49:12 UTC (rev 7732)
@@ -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