Better OpenSearch scoping.

Munge the JS pointers twice (argh)

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@390 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 1739c68..471d2f0 100644 (file)
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -84,6 +84,7 @@ copy_opac_skins()
                for munge_file in 'page_rdetail.xml' 'page_mresult.xml' 'page_rresult.xml'
                do
                        sed -i -e "s/skin\/default\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
+                       sed -i -e "s/skin\/default_test\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
                done
                sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\_test\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml
 

diff --git a/web/opac/skin/lul/xml/common/css_common.xml b/web/opac/skin/lul/xml/common/css_common.xml
index 168bdb6..64d611b 100644 (file)
--- a/web/opac/skin/lul/xml/common/css_common.xml
+++ b/web/opac/skin/lul/xml/common/css_common.xml
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->
 <link type="application/opensearchdescription+xml"
        rel='search' title="Laurentian Library Catalogue"
-       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
+       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OSUL/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">

diff --git a/web/opac/skin/nosm/xml/common/css_common.xml b/web/opac/skin/nosm/xml/common/css_common.xml
index 49ba3b2..1e5e544 100644 (file)
--- a/web/opac/skin/nosm/xml/common/css_common.xml
+++ b/web/opac/skin/nosm/xml/common/css_common.xml
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->
 <link type="application/opensearchdescription+xml"
        rel='search' title="NOSM Library Catalogue"
-       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
+       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OSM/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">

diff --git a/web/opac/skin/uwin/xml/common/css_common.xml b/web/opac/skin/uwin/xml/common/css_common.xml
index febebfe..fe99fe3 100644 (file)
--- a/web/opac/skin/uwin/xml/common/css_common.xml
+++ b/web/opac/skin/uwin/xml/common/css_common.xml
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->\r
 <link type="application/opensearchdescription+xml"\r
        rel='search' title="UWindsor Library Catalogue"\r
-       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />\r
+       href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OWA/osd.xml" />\r
 \r
 <!-- enable Dojo date picker -->\r
 <style type="text/css">\r