[open-ils-commits] r10571 - in trunk: Open-ILS/examples/apache Open-ILS/src build/i18n

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-09-09 23:09:02 -0400 (Tue, 09 Sep 2008)
New Revision: 10571

Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
   trunk/Open-ILS/src/Makefile.am
   trunk/build/i18n/Makefile.in
Log:
build/i18n/Makefile.in:
  * Install the entityized version of fm_IDL.xml in /reports/ if any locale
    is installed
  * Install the DTD set of entities for fm_IDL.xml for each localization
Open-ILS/src/Makefile.am:
  * Copy, don't link, fm_IDL.xml into /reports/ - this avoids the /conf/
    version from getting replaced by the entityized version (which messes
    up cstore but good)
Open-ILS/examples/apache/eg_vhost.conf:
  * Add rudimentary locale settings for the reports interface, based on
    the contents of the Accept-Language header (assuming that we will
    only support one language in the header at a time in the staff client;
    otherwise, the last match in eg_vhost.conf wins despite the order of
    entries in the header)


Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-09-10 02:58:12 UTC (rev 10570)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-09-10 03:09:02 UTC (rev 10571)
@@ -60,6 +60,7 @@
     # add languages as necessary
     SetEnvIf Request_URI "/en-US/" locale=en-US
     SetEnvIf Request_URI "/fr-CA/" locale=fr-CA
+    SetEnvIf Request_URI "/hy-AM/" locale=hy-AM
     SetEnvIf Request_URI ".*" OILS_OPAC_BASE=/opac/
     
     # This gives you the option to configure a different host to serve OPAC images from
@@ -259,7 +260,11 @@
 # ----------------------------------------------------------------------------------
 <LocationMatch /reports/>
     Options +Includes
+	SetEnvIfNoCase Accept-Language "en" locale=en-US
+	SetEnvIfNoCase Accept-Language "fr-CA" locale=fr-CA
+	SetEnvIfNoCase Accept-Language "hy-AM" locale=hy-AM
     AddOutputFilter INCLUDES .xhtml
+    AddOutputFilter INCLUDES;XMLENT .xml
 </LocationMatch>
 
 # ----------------------------------------------------------------------------------

Modified: trunk/Open-ILS/src/Makefile.am
===================================================================
--- trunk/Open-ILS/src/Makefile.am	2008-09-10 02:58:12 UTC (rev 10570)
+++ trunk/Open-ILS/src/Makefile.am	2008-09-10 03:09:02 UTC (rev 10571)
@@ -240,7 +240,7 @@
 	ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/advanced.xml
 	ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/myopac.xml
 	ln -sf $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/index.xml $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/cnbrowse.xml
-	ln -sf $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/
+	cp $(DESTDIR)@sysconfdir@/fm_IDL.xml $(DESTDIR)$(WEBDIR)/reports/
 
 
 offline-install:

Modified: trunk/build/i18n/Makefile.in
===================================================================
--- trunk/build/i18n/Makefile.in	2008-09-10 02:58:12 UTC (rev 10570)
+++ trunk/build/i18n/Makefile.in	2008-09-10 03:09:02 UTC (rev 10571)
@@ -9,12 +9,13 @@
 FMIDLSRC=../../Open-ILS/examples/fm_IDL.xml
 FMIDLOUT=fm_IDL.pot
 FMIDLENT=fm_IDL.xml
-FMIDLENTITY=fm_IDL.xml.ent
+FMIDLENTITY=fm_IDL.dtd
 FMIDLPO=fm_IDL.po
 EVTSRC=../../Open-ILS/src/extras/ils_events.xml
 EVTOUT=ils_events.xml.pot
 EVTPO=ils_events.xml.po
 EVTXML=ils_events.xml
+REPORTDIR=../../Open-ILS/web/reports/
 SQLSRCDIR=../../Open-ILS/src/sql/Pg/
 SQLSRCFILE=950.data.seed-values.sql
 SQLPOT=db.seed.pot
@@ -113,7 +114,7 @@
 	@scripts/fieldmapper.py --entity $(POINDIR)/$(LOCALE)/$(FMIDLPO) --output $(PROJECT)/$(LOCALE)/$(FMIDLENTITY)
 
 # Install updated project files to their corresponding location in the source tree
-install: updatepo project 
+install: updatepo project fmidl2fmidlent
 	mkdir -p $(CHROME_PROPSDIR)/$(LOCALE)
 	cp $(PROJECT)/$(LOCALE)/auth.properties $(CHROME_PROPSDIR)/$(LOCALE)/.
 	cp $(PROJECT)/$(LOCALE)/offline.properties $(CHROME_PROPSDIR)/$(LOCALE)/.
@@ -128,5 +129,7 @@
 	cp $(PROJECT)/$(LOCALE)/lang.dtd $(CHROME_PROPSDIR)/$(LOCALE)/
 	cp $(PROJECT)/$(LOCALE)/lang.dtd $(DTDDIR)/$(LOCALE)/
 	cp $(PROJECT)/$(LOCALE)/opac.dtd $(DTDDIR)/$(LOCALE)/
+	cp $(PROJECT)/$(LOCALE)/$(FMIDLENTITY) $(DTDDIR)/$(LOCALE)/
 	@scripts/merge_ils_events.py --master $(EVTSRC) --localization $(PROJECT)/$(LOCALE)/$(EVTXML) --output $(EVTSRC)
 	cp $(PROJECT)/$(LOCALE)/$(SQLOUT).sql $(SQLSRCDIR)/$(SQLOUT)-$(LOCALE).sql
+	cp $(POOUTDIR)/$(FMIDLENT) $(REPORTDIR)/$(FMIDLENT)