From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Sun, 26 Apr 2009 15:02:42 +0000 (+0000)
Subject: Better OpenSearch scoping.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c6927b883cd6f4c4804e4320ea5f7a3511460585;p=contrib%2FConifer.git

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 1739c68409..471d2f09a7 100644
--- 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 168bdb6499..64d611ba8b 100644
--- 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 49ba3b2040..1e5e54476f 100644
--- 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 febebfe07b..fe99fe39a6 100644
--- 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 -->
 <link type="application/opensearchdescription+xml"
 	rel='search' title="UWindsor 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/OWA/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">